fix(overlay): stop Hyprland/Sway tracker polls from blocking the main thread (#289 )

fix(overlay): poll cheap playback state in the open subtitle sidebar (#290 )
fix(overlay): keep keyboard mode from swallowing modal and text-field keys (#291 )
2026-11-10 16:46:06 -08:00 · 2026-10-11 01:01:36 -07:00 · 2026-10-11 00:35:27 -07:00 · 2026-10-11 00:33:47 -07:00 · 2026-10-10 17:27:48 -07:00 · 2026-10-05 22:00:58 -07:00
486 changed files with 22954 additions and 61391 deletions
@@ -27,6 +27,7 @@ Do not use hidden wrapper commands. Verification commands are owned by `package.
 - Launcher or mpv plugin: `bun run test:launcher` or `bun run test:env`, based on the behavior changed
 - Runtime compatibility or dist-sensitive wiring: `bun run test:runtime:compat`
 - Stats dashboard: `bun run test:stats`
+- Overlay, renderer, mpv, or mining behavior in the running app: `bun run build`, then `bun run test:e2e`
 - Build/release scripts: `bun run test:scripts`

 For substantial changes, use the full gate documented in `AGENTS.md` and `docs/workflow/verification.md`.
@@ -9,3 +9,79 @@ on:
 jobs:
  build-test-audit:
    uses: ./.github/workflows/quality-gate.yml
+
+  # Boots the built app with a real mpv on each platform. Kept outside the
+  # reusable quality gate so releases do not depend on it while the lane is new.
+  e2e:
+    name: E2E (${{ matrix.os }})
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+    permissions:
+      contents: read
+    defaults:
+      run:
+        shell: bash
+    env:
+      SUBMINER_E2E_KEEP: '1'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          persist-credentials: false
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: 1.3.5
+
+      - name: Point temp files at an uploadable directory
+        run: |
+          # os.tmpdir() follows these, so the kept session logs land under runner.temp.
+          dir="$RUNNER_TEMP/e2e"
+          mkdir -p "$dir"
+          { echo "TMPDIR=$dir"; echo "TEMP=$dir"; echo "TMP=$dir"; } >> "$GITHUB_ENV"
+
+      - name: Install mpv and ffmpeg (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          # Only Ubuntu sources are needed; unrelated runner repositories can be unavailable.
+          apt_sources=(-o Dir::Etc::sourcelist=sources.list.d/ubuntu.sources -o Dir::Etc::sourceparts=-)
+          sudo apt-get "${apt_sources[@]}" update
+          sudo apt-get "${apt_sources[@]}" install -y mpv ffmpeg xvfb
+
+      - name: Install mpv and ffmpeg (macOS)
+        if: runner.os == 'macOS'
+        run: brew install mpv ffmpeg
+
+      - name: Install mpv and ffmpeg (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          choco install mpv ffmpeg -y --no-progress
+          # The mpv package adds no shim, so put its directory on PATH for later steps.
+          mpv_exe="$(find /c/ProgramData/chocolatey/lib /c/ProgramData/chocolatey/bin "/c/Program Files" /c/tools -maxdepth 6 -iname mpv.exe 2>/dev/null | head -n 1)"
+          test -n "$mpv_exe"
+          cygpath -w "$(dirname "$mpv_exe")" >> "$GITHUB_PATH"
+
+      - name: Install dependencies
+        run: |
+          bun install --frozen-lockfile
+          cd stats && bun install --frozen-lockfile
+
+      - name: Build
+        run: bun run build
+
+      - name: End-to-end suite
+        run: bun run test:e2e
+
+      - name: Upload session logs (on failure)
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-logs-${{ matrix.os }}
+          path: ${{ runner.temp }}/e2e/subminer-e2e-*/*.log
+          if-no-files-found: ignore
@@ -8,6 +8,7 @@ Start here, then leave this file.
 - Architecture map: [`docs/architecture/README.md`](./docs/architecture/README.md)
 - Workflow map: [`docs/workflow/README.md`](./docs/workflow/README.md)
 - Verification lanes: [`docs/workflow/verification.md`](./docs/workflow/verification.md)
+- Testing guidelines: [`docs/workflow/testing.md`](./docs/workflow/testing.md)
 - Knowledge-base rules: [`docs/knowledge-base/README.md`](./docs/knowledge-base/README.md)
 - Release guide: [`docs/RELEASING.md`](./docs/RELEASING.md)

@@ -44,10 +45,11 @@ Start here, then leave this file.
 - Launcher/plugin: `bun run test:launcher` or `bun run test:env`
 - Runtime-compat / dist-sensitive: `bun run test:runtime:compat`
 - Stats dashboard UI (`stats/`): `bun run test:stats`
+- Overlay / renderer / mpv / mining behavior in the running app: `bun run build`, then `bun run test:e2e` (headless, sandboxed; `bun run e2e start` for exploratory checks)
 - Build/release scripts (`scripts/**`): `bun run test:scripts`
 - Internal docs, `AGENTS.md`, or repo skills: `bun run test:docs:kb`
 - User-facing `docs-site/`: `bun run docs:test`, then `bun run docs:build`
- macOS mpv window helper: `bun test scripts/get-mpv-window-macos.test.ts`
+- macOS mpv window helper (`scripts/get-mpv-window-macos.swift`): compile it on macOS with `bun run build`
 - Test lanes are directory-discovered via `scripts/test-lanes.ts`; never hand-list test files in `package.json`

 ## Docs Upkeep
@@ -1,5 +1,55 @@
 # Changelog

+## v0.20.1 (2026-10-03)
+
+### Added
+- **YouTube Browser Window**:
+  - Browse YouTube with your login kept across restarts. Open it with `subminer youtube`, `subminer yt`, or tray **Browse YouTube**.
+  - Clicking a video plays it in mpv. Middle-click, Shift/Ctrl-click, or the right-click menu adds it to mpv's playlist.
+  - Queued videos get the same Japanese subtitle setup, and the rest of the queue is kept on Windows.
+  - Closing the window quits a SubMiner started by `subminer youtube`.
+- **Whisper Subtitles for YouTube**:
+  - Set `youtube.subtitleSource` to `whisper` to transcribe YouTube videos with Whisper instead of using YouTube's captions.
+  - The video stays paused while Whisper transcribes, and the subtitle generation modal shows progress.
+  - The subtitle generation modal (`Ctrl+Shift+G`) now works on YouTube videos, including Windows stream playback.
+- **Scroll Wheel and Mouse Bindings**: `keybindings` now accepts scroll wheel keys, and the settings key editor can capture them. Mouse button and wheel bindings from mpv now work while the cursor is over the overlay, including on Hyprland.
+- **Run Commands from Session Help**: During playback, press `Enter` or double-click a row in session help to run that command.
+
+### Changed
+- **Release Assets**: Releases no longer include package-size reports.
+
+### Fixed
+- **Hyprland Overlay**: The overlay stays clickable after mpv goes fullscreen with `mpv.backend: x11`, and it no longer interrupts mpv while mpv enters fullscreen.
+- **mpv Key Bindings**: Bindings from mpv such as `9`/`0` for volume now work while the overlay has focus, even if the overlay loaded before mpv connected.
+- **Jellyfin**:
+  - The Japanese subtitle track is selected as soon as it downloads, without waiting for the other tracks.
+  - Japanese and English tracks are auto-selected on episodes whose embedded subtitles are images.
+  - Timing review previews and mined card audio use the audio track you are playing.
+- **Media Timing Review**: Trim handles are now thin lines on the clip edges, and original subtitle boundaries no longer cover the waveform. The preview cursor no longer stutters on macOS with Bluetooth headphones.
+- **YouTube Subtitles**: Japanese subtitles no longer fail with "HTTP 429" on videos where YouTube also lists a machine-translated Japanese track.
+- **Stats**:
+  - Mined cards are counted once in session and lifetime stats.
+  - Word and kanji dates and the new-words charts stay accurate after deleting sessions. Existing data is repaired in the background.
+  - Overview totals, charts, and the activity calendar refresh after deleting sessions.
+- **Yomitan Data Safety**: Electron is updated to 43.7.7. SubMiner now refuses to load your Yomitan data with an unsupported or downgraded runtime. Automatic character dictionary changes stop if Yomitan suddenly reports no dictionaries.
+- **AppImage in Sandboxes**: The AppImage now opens its window when launched in a sandbox such as `firejail --appimage`.
+- **Ctrl+C Crash**: SubMiner no longer crashes with "write EPIPE" when the terminal command that started it is stopped with Ctrl+C.
+
+### Docs
+- **Docs Site**: The docs site is shorter and easier to scan, with a key and default table for each config block. Outdated pages were corrected, and the MeCab install command for Arch Linux is fixed.
+- **Stats Docs**: The docs now cover the Overview refresh after deleting sessions and how discovery dates are kept after old sessions are pruned.
+
+<details>
+<summary>Internal changes</summary>
+
+### Internal
+- **Release Notes**: Release notes and `CHANGELOG.md` are now generated as short items per feature or area.
+- **Dev Profile**: Development launches use a separate `SubMiner-dev` profile unless production-profile access is requested.
+- **Dependencies**: undici is updated to 7.29.1 to clear the security advisories that were blocking CI.
+- **Package Checks**: CI no longer compares package sizes. Package content checks still run.
+
+</details>
+
 ## v0.20.0 (2026-09-23)

 ### Added
@@ -21,7 +21,7 @@
        "@electron/asar": "3.4.1",
        "@types/node": "^24.10.0",
        "@types/ws": "^8.18.1",
-        "electron": "42.10.0",
+        "electron": "43.7.7",
        "electron-builder": "26.16.1",
        "esbuild": "^0.25.12",
        "eslint": "^10.8.0",
@@ -347,7 +347,7 @@

    "ejs": ["ejs@3.1.10", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="],

-    "electron": ["electron@42.10.0", "", { "dependencies": { "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", "install-electron": "install.js" } }, "sha512-yBWnZO8tKId0ADvGa4+imPmm3+8Kfs8MtkUPhQQJz1AjTnUUDwCTWkQEU0CrArVVL97Jo4Q/0mVcLHciicBDGQ=="],
+    "electron": ["electron@43.7.7", "", { "dependencies": { "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", "install-electron": "install.js" } }, "sha512-y0pg+KhWLAkW2Ts2njkFFNFl3KtB1FmbUp9Te9i+R2Og2v1fcI/I6MADJ7jvnzB5UKdt+U+0EUoCnVL79xMPMA=="],

    "electron-builder": ["electron-builder@26.16.1", "", { "dependencies": { "app-builder-lib": "26.16.1", "builder-util": "26.16.0", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "ci-info": "^4.2.0", "dmg-builder": "26.16.1", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "simple-update-notifier": "2.0.0", "yargs": "^17.6.2" }, "bin": { "electron-builder": "./cli.js", "install-app-deps": "./install-app-deps.js" } }, "sha512-LrLK65QX5PUYYODXqp23FKrV7CILTtVY7mrJckNknO9jLNSMiqFkKbSMiDRw4CjOADMPVDdWLxY4mezOZWswxg=="],

@@ -467,7 +467,7 @@

    "hosted-git-info": ["hosted-git-info@4.1.0", "", { "dependencies": { "lru-cache": "^6.0.0" } }, "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="],

-    "http-cache-semantics": ["http-cache-semantics@4.2.0", "", {}, "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ=="],
+    "http-cache-semantics": ["http-cache-semantics@4.3.0", "", {}, "sha512-M5t5LlJpS1UHMjvwRQVdFHvPISGeLAxNcrWuJkeGh0KxsqCHZ1O3NXZU/8x7cD0BDcGW8kapxMKTvwlqrNkHkA=="],

    "http-proxy-agent": ["http-proxy-agent@7.0.2", "", { "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" } }, "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="],

@@ -42,7 +42,7 @@ How fragments turn into a release:

 - At release time, `bun run changelog:build` (and `bun run changelog:prerelease-notes`) pipes every pending fragment through `claude -p` to merge related items, drop noise, and rewrite into a clean user-facing release body. Write fragments as raw, informative notes — don't worry about polished prose, deduping across PRs, or line-by-line phrasing. The polish step handles all of that.
 - The polish step treats pending fragments as the final release outcome, not prerelease history. If a feature is added and then renamed or fixed before the stable cut, ship the final feature bullet instead of separate prerelease-only breaking/fix entries.
- `CHANGELOG.md`, GitHub release notes, and prerelease notes all use short top-level items with one nested bullet per distinct change, instead of packing a release's worth of detail into a single paragraph bullet. An item with only one thing to say stays inline on the top-level bullet. Release notes and prerelease notes additionally cover user benefit and any useful action note in their nested bullets.
+- `CHANGELOG.md`, GitHub release notes, and prerelease notes all use one item per feature or area, inline by default: `- **Name**: one or two short sentences.` Items with several separate changes may use a few short nested bullets instead of a run-on sentence. Items say what changed and how to reach it; implementation details, edge cases, and step-by-step usage belong in the docs, not the release body.
 - `internal` fragments stay in `CHANGELOG.md` (inside a collapsed `<details>` block) but are dropped from the GitHub release notes entirely.
 - The polished `CHANGELOG.md` and `release/release-notes.md` are committed and reviewed before tagging — edit the Markdown by hand if Claude misses something.

@@ -1,4 +0,0 @@
-type: fixed
-area: linux
-
- Fixed the AppImage exiting without opening a window when launched inside a sandbox that mounts the image itself, such as `firejail --appimage` (used by the AppImage catalog test). The detached background app now runs straight from the sandbox's squashfs mount instead of trying to re-mount the AppImage over FUSE.
@@ -1,4 +0,0 @@
-type: fixed
-area: app
-
- SubMiner no longer crashes with "write EPIPE" when the terminal command that started it is stopped with Ctrl+C.
@@ -1,7 +0,0 @@
-type: docs
-area: docs
-
- Rewrote the docs site to be shorter and easier to scan: pages lead with setup and use, reference material lives in compact tables, and internal detail was cut from user pages.
- The configuration reference now has a short explanation and a key/default table for each config block.
- Fixed docs that no longer matched current behavior.
- Fixed the Arch Linux install command for MeCab, which is only in the AUR (`mecab-git`), and brought the README requirements and quick start in line with the installation guide.
@@ -0,0 +1,4 @@
+type: internal
+area: testing
+
+- Added a headless end-to-end harness (`bun run test:e2e`, `bun run e2e`) that boots the built app with a real mpv, a synthetic clip, a fixture Yomitan dictionary, and a fake AnkiConnect on an offscreen display.
@@ -1,4 +0,0 @@
-type: fixed
-area: overlay
-
- Keep the subtitle overlay mapped during fullscreen transitions on Hyprland, avoiding focus changes from repeated hide/show calls that can cancel mpv fullscreen entry. Preserve the hide/show refresh on Sway.
@@ -1,4 +0,0 @@
-type: fixed
-area: overlay
-
- Fixed the overlay (subtitles and sidebar) becoming unclickable after mpv goes fullscreen on Hyprland with `mpv.backend: x11`. The launcher no longer strips `HYPRLAND_INSTANCE_SIGNATURE` from the X11 environment, so the overlay can lift Hyprland's fullscreen input block again.
@@ -0,0 +1,7 @@
+type: fixed
+area: jellyfin
+
+- Fixed `subminer jellyfin -p` reporting "No Jellyfin libraries found." when SubMiner was already running (for example right after `subminer jellyfin` login). The app now hands library, item, and preview-auth results to the launcher directly instead of through log files, so picker image previews work again and real errors (expired session, unreachable server) are shown instead of an empty list.
+- The rofi "Jellyfin Search (optional)" step after picking a library is now a compact input box with a "Type to search, or press Enter to browse all" hint instead of a blank list.
+- Playing from the terminal (`subminer jellyfin -p`) now reports watch progress to Jellyfin even when cast discovery is off, so Jellyfin remembers where you stopped and marks finished episodes as played. Previously progress was only sent while the cast connection was active.
+- When `subminer jellyfin -p` has to start SubMiner itself, the app now shows its tray icon and quits when you close mpv, the same as playing a local file. Before, it had no tray icon and kept running hidden after playback. A SubMiner that was already running is still reused and left running.
@@ -1,5 +0,0 @@
-type: fixed
-area: jellyfin
-
- Jellyfin playback now selects the Japanese subtitle track, and starts subtitle annotations, as soon as that track downloads instead of waiting for every other subtitle track. Tracks now download in parallel, so a slow embedded track Jellyfin has to extract no longer delays the primary subtitles.
- Jellyfin episodes with image-based embedded subtitles (PGS, DVD, DVB) now auto-select the Japanese and English tracks. SubMiner no longer requests those tracks as text, and a subtitle track that fails to download no longer cancels selection of the others.
@@ -1,4 +0,0 @@
-type: fixed
-area: jellyfin
-
- Timing review previews and mined card audio now use the audio track you are playing on Jellyfin direct-play streams, instead of the track Jellyfin marks as default.
@@ -0,0 +1,4 @@
+type: docs
+area: jellyfin
+
+- Corrected the Jellyfin docs: SubMiner only joins the cast menu at startup when `startupWarmups.jellyfinRemoteSession` is on (off by default) along with `jellyfin.remoteControlAutoConnect`. Otherwise tick **Jellyfin Discovery** in the tray.
@@ -0,0 +1,4 @@
+type: fixed
+area: overlay
+
+- Keyboard-only mode no longer swallows `h`, `l`, and the left/right arrows while a modal is open or a text field has focus, so typing into fields like the Jimaku or TsukiHime title works and no longer seeks mpv. Pressing `Ctrl/Cmd+Shift+Y` (or the controller toggle) inside a modal no longer turns on a hidden keyboard-only mode in the modal window.
@@ -1,4 +0,0 @@
-type: fixed
-area: overlay
-
- Fixed mpv key bindings (input.conf and mpv defaults, e.g. `9`/`0` volume) doing nothing while the overlay had focus when the overlay loaded before SubMiner connected to mpv, common in `mpv.backend: x11` mode. The overlay now reloads mpv's bindings once mpv connects.
@@ -1,5 +0,0 @@
-type: added
-area: overlay
-
- Added scroll wheel keys (`WHEEL_UP`, `WHEEL_DOWN`, `WHEEL_LEFT`, `WHEEL_RIGHT`, with modifiers) to `keybindings`, including capture from the settings key editor.
- Mouse button and scroll wheel bindings from mpv (`input.conf` and mpv defaults, e.g. double-click fullscreen, wheel volume, back/forward for playlist) now work while the cursor is over the overlay. On Hyprland, where the overlay always receives input, they previously did nothing. SubMiner bindings and the right-click pause still take priority.
@@ -1,4 +0,0 @@
-type: fixed
-area: dependencies
-
- Updated Electron to 42.10.0 and undici to 7.29.1 to resolve the security advisories blocking CI.
@@ -1,4 +0,0 @@
-type: changed
-area: release
-
- Removed package-size JSON reports from future releases and their CI size comparisons. Package-content validation remains enabled.
@@ -1,4 +0,0 @@
-type: added
-area: overlay
-
- Session help can run the highlighted command during playback: press `Enter` or double-click a row. Hovering a row with the mouse makes it the `Enter` target. Help opened from the tray with no video loaded stays read-only.
@@ -0,0 +1,4 @@
+type: fixed
+area: setup
+
+- First-run setup now labels a missing command-line launcher "Not set up" instead of "Not installed", so the AppImage catalog test no longer reads the setup window as an error screen.
@@ -0,0 +1,4 @@
+type: fixed
+area: overlay
+
+- The open subtitle sidebar no longer re-fetches the whole subtitle list and re-queries mpv about 12 times a second. It polls only the current time and line, and reloads the list when the subtitle track, file, or parsed cues change (plus a slow ~2 s fallback), cutting idle sidebar IPC and renderer work during playback.
@@ -1,4 +0,0 @@
-type: fixed
-area: overlay
-
- On macOS with Bluetooth headphones such as AirPods, the timing review preview cursor now moves smoothly across the selection instead of stuttering and jumping to the end partway through. This affected Opus audio, including Jellyfin streams.
@@ -1,5 +0,0 @@
-type: fixed
-area: overlay
-
- Media timing review trim handles are now thin lines centered on the clip edge, so it's clear where the clip starts and ends and less of the waveform is covered.
- Original subtitle boundaries use orange bars without text tags, leaving the waveform unobstructed.
@@ -0,0 +1,5 @@
+type: fixed
+area: overlay
+
+- Hyprland and Sway window tracking no longer freezes the app when `hyprctl` or `swaymsg` is slow or hangs: polls now run in the background with a timeout and no longer pile up.
+- The Hyprland/Sway trackers read each mpv process's command line once instead of spawning `ps` on every poll.
@@ -1,7 +0,0 @@
-type: added
-area: youtube
-
- Added a YouTube browser window (`subminer youtube`/`subminer yt`, or tray **Browse YouTube**) that keeps your YouTube login across restarts.
- Clicking a video plays it in mpv instead of the page; middle-click, Shift/Ctrl-click, or the right-click menu queues it in mpv's playlist.
- Queued YouTube videos get the same Japanese subtitle setup when mpv reaches them.
- Closing the YouTube window quits a SubMiner started by `subminer youtube` (after mpv closes, if a video is still playing).
@@ -1,4 +0,0 @@
-type: fixed
-area: youtube
-
- YouTube Japanese subtitles no longer fail with "HTTP 429" on videos where YouTube also lists a machine-translated Japanese track; SubMiner now picks the real track and falls back to yt-dlp if a direct subtitle download is refused.
@@ -1,7 +0,0 @@
-type: added
-area: youtube
-
- Added `youtube.subtitleSource`: set it to `whisper` to transcribe YouTube videos with Whisper instead of downloading YouTube's captions. The default stays `youtube`.
- Whisper mode keeps the video paused while it transcribes, with progress in the subtitle generation modal; close the modal to keep watching, or cancel to continue without subtitles.
- The subtitle generation modal (`Ctrl+Shift+G`) now also works on YouTube videos, whatever `youtube.subtitleSource` is set to.
- Whisper mode downloads a small audio-only stream and deletes it once generation ends, or when you switch videos, close mpv, or quit.
@@ -1,5 +1,55 @@
 # Changelog

+## v0.20.1 (2026-10-03)
+
+**Added**
+- **YouTube Browser Window**:
+  - Browse YouTube with your login kept across restarts. Open it with `subminer youtube`, `subminer yt`, or tray **Browse YouTube**.
+  - Clicking a video plays it in mpv. Middle-click, Shift/Ctrl-click, or the right-click menu adds it to mpv's playlist.
+  - Queued videos get the same Japanese subtitle setup, and the rest of the queue is kept on Windows.
+  - Closing the window quits a SubMiner started by `subminer youtube`.
+- **Whisper Subtitles for YouTube**:
+  - Set `youtube.subtitleSource` to `whisper` to transcribe YouTube videos with Whisper instead of using YouTube's captions.
+  - The video stays paused while Whisper transcribes, and the subtitle generation modal shows progress.
+  - The subtitle generation modal (`Ctrl+Shift+G`) now works on YouTube videos, including Windows stream playback.
+- **Scroll Wheel and Mouse Bindings**: `keybindings` now accepts scroll wheel keys, and the settings key editor can capture them. Mouse button and wheel bindings from mpv now work while the cursor is over the overlay, including on Hyprland.
+- **Run Commands from Session Help**: During playback, press `Enter` or double-click a row in session help to run that command.
+
+**Changed**
+- **Release Assets**: Releases no longer include package-size reports.
+
+**Fixed**
+- **Hyprland Overlay**: The overlay stays clickable after mpv goes fullscreen with `mpv.backend: x11`, and it no longer interrupts mpv while mpv enters fullscreen.
+- **mpv Key Bindings**: Bindings from mpv such as `9`/`0` for volume now work while the overlay has focus, even if the overlay loaded before mpv connected.
+- **Jellyfin**:
+  - The Japanese subtitle track is selected as soon as it downloads, without waiting for the other tracks.
+  - Japanese and English tracks are auto-selected on episodes whose embedded subtitles are images.
+  - Timing review previews and mined card audio use the audio track you are playing.
+- **Media Timing Review**: Trim handles are now thin lines on the clip edges, and original subtitle boundaries no longer cover the waveform. The preview cursor no longer stutters on macOS with Bluetooth headphones.
+- **YouTube Subtitles**: Japanese subtitles no longer fail with "HTTP 429" on videos where YouTube also lists a machine-translated Japanese track.
+- **Stats**:
+  - Mined cards are counted once in session and lifetime stats.
+  - Word and kanji dates and the new-words charts stay accurate after deleting sessions. Existing data is repaired in the background.
+  - Overview totals, charts, and the activity calendar refresh after deleting sessions.
+- **Yomitan Data Safety**: Electron is updated to 43.7.7. SubMiner now refuses to load your Yomitan data with an unsupported or downgraded runtime. Automatic character dictionary changes stop if Yomitan suddenly reports no dictionaries.
+- **AppImage in Sandboxes**: The AppImage now opens its window when launched in a sandbox such as `firejail --appimage`.
+- **Ctrl+C Crash**: SubMiner no longer crashes with "write EPIPE" when the terminal command that started it is stopped with Ctrl+C.
+
+**Docs**
+- **Docs Site**: The docs site is shorter and easier to scan, with a key and default table for each config block. Outdated pages were corrected, and the MeCab install command for Arch Linux is fixed.
+- **Stats Docs**: The docs now cover the Overview refresh after deleting sessions and how discovery dates are kept after old sessions are pruned.
+
+<details>
+<summary>Internal changes</summary>
+
+**Internal**
+- **Release Notes**: Release notes and `CHANGELOG.md` are now generated as short items per feature or area.
+- **Dev Profile**: Development launches use a separate `SubMiner-dev` profile unless production-profile access is requested.
+- **Dependencies**: undici is updated to 7.29.1 to clear the security advisories that were blocking CI.
+- **Package Checks**: CI no longer compares package sizes. Package content checks still run.
+
+</details>
+
 ## v0.20.0 (2026-09-23)

 **Added**
@@ -514,18 +514,18 @@ In external-profile mode, SubMiner only reads the profile. It does not open its

 Log in to a Jellyfin server, browse libraries, and play or cast to SubMiner. Login tokens are stored encrypted, not in this file. See [Jellyfin integration](/jellyfin-integration).

-| Key                                 | Default                          | What it does                                    |
-| ----------------------------------- | -------------------------------- | ----------------------------------------------- |
-| `jellyfin.enabled`                  | `false`                          | Enable Jellyfin                                 |
-| `jellyfin.serverUrl`                | `""`                             | Server URL, for example `http://localhost:8096` |
-| `jellyfin.username`                 | `""`                             | Default username for `subminer jellyfin -l`     |
-| `jellyfin.remoteControlEnabled`     | `true`                           | Let Jellyfin apps cast to SubMiner              |
-| `jellyfin.remoteControlAutoConnect` | `true`                           | Connect the cast session on startup             |
-| `jellyfin.autoAnnounce`             | `false`                          | Announce SubMiner as a cast target on connect   |
-| `jellyfin.pullPictures`             | `false`                          | Fetch posters for launcher pickers              |
-| `jellyfin.iconCacheDir`             | `"/tmp/subminer-jellyfin-icons"` | Poster cache folder                             |
-| `jellyfin.directPlayPreferred`      | `true`                           | Try direct play before transcoding              |
-| `jellyfin.transcodeVideoCodec`      | `"h264"`                         | Codec requested when transcoding                |
+| Key                                 | Default                          | What it does                                                                            |
+| ----------------------------------- | -------------------------------- | --------------------------------------------------------------------------------------- |
+| `jellyfin.enabled`                  | `false`                          | Enable Jellyfin                                                                         |
+| `jellyfin.serverUrl`                | `""`                             | Server URL, for example `http://localhost:8096`                                         |
+| `jellyfin.username`                 | `""`                             | Default username for `subminer jellyfin -l`                                             |
+| `jellyfin.remoteControlEnabled`     | `true`                           | Let Jellyfin apps cast to SubMiner                                                      |
+| `jellyfin.remoteControlAutoConnect` | `true`                           | Connect the cast session on startup (also needs `startupWarmups.jellyfinRemoteSession`) |
+| `jellyfin.autoAnnounce`             | `false`                          | Announce SubMiner as a cast target on connect                                           |
+| `jellyfin.pullPictures`             | `false`                          | Fetch posters for launcher pickers                                                      |
+| `jellyfin.iconCacheDir`             | `"/tmp/subminer-jellyfin-icons"` | Poster cache folder                                                                     |
+| `jellyfin.directPlayPreferred`      | `true`                           | Try direct play before transcoding                                                      |
+| `jellyfin.transcodeVideoCodec`      | `"h264"`                         | Codec requested when transcoding                                                        |

 ### Discord rich presence

@@ -47,6 +47,10 @@ electron . --start --dev --log-level debug   # verbose launch of an existing bui
 electron . --background                      # tray/background mode
 ```

+Development and debug launches use a separate `SubMiner-dev` profile so runtime experiments cannot modify the installed app's configuration or Yomitan dictionaries. To intentionally use the production profile for a development launch, set `SUBMINER_USE_PRODUCTION_PROFILE=1`. Use that override only after backing up the profile.
+
+Launch source builds through `bun run dev` or `bun run electron`. SubMiner refuses to load its profile when the running Electron major differs from the version pinned by the repository.
+
 To test through the mpv plugin without exporting `SUBMINER_BINARY_PATH` each time, point `mpv.subminerBinaryPath` in your config at the dev script. The launcher passes it to the plugin at runtime:

 ```json
@@ -42,6 +42,8 @@ To share stats and watch history between machines, use [`subminer sync <host>`](

 Recent sessions, a streak calendar, watch-time history, and totals for completed episodes and shows.

+Deleting a session or session group refreshes the Overview totals, charts, calendar, and vocabulary summary automatically. If a refresh fails, Overview keeps the previous totals visible and offers **Retry**.
+
 ![Stats Overview](/screenshots/stats-overview.png)

 ### Library
@@ -122,4 +124,6 @@ Leave out `--lookback-days` to scan all history. Word and kanji counts are corre

 By default SubMiner keeps everything. To limit history, set `immersionTracking.retentionPreset` to `minimal`, `balanced`, or `deep-history`, or set the `immersionTracking.retention.*Days` values yourself (`0` keeps all). Lifetime totals and vocabulary counts are stored separately and stay exact when old sessions are pruned.

+Deleting retained sessions preserves earlier word and kanji discovery dates from pruned history. New occurrences record observation time so deletion can update their dates exactly. Older history used write time, so an earlier discovery date is preserved when its origin cannot be determined.
+
 See [Immersion tracking](/configuration#immersion-tracking) and [Stats dashboard](/configuration#stats-dashboard) in the config reference for every option and default.
@@ -14,7 +14,7 @@ SubMiner stores an encrypted session token, not your password, and turns the int

 ## Casting from Jellyfin

-After you sign in, SubMiner connects to Jellyfin at startup and shows up in the cast ("Play on") menu under your computer's hostname. To connect for the current session only, tick **Jellyfin Discovery** in the tray menu.
+After you sign in, tick **Jellyfin Discovery** in the tray menu. SubMiner then shows up in the cast ("Play on") menu under your computer's hostname until it quits. To connect every time SubMiner starts, turn on `startupWarmups.jellyfinRemoteSession` and leave `remoteControlAutoConnect` on.

 1. In the Jellyfin web or mobile app, start playing an episode.
 2. Open the cast menu and pick your computer.
@@ -34,20 +34,20 @@ subminer jellyfin -p       # fzf picker; `jf` is an alias for `jellyfin`
 subminer -R jellyfin -p    # rofi picker
 ```

-Sign in first. See [Launcher script](/launcher-script) for the other `jellyfin` subcommands.
+Sign in first. Playback resumes from Jellyfin's saved position, and watch progress syncs back the same way it does for casting, whether or not discovery is on. If SubMiner is already running, the picker uses it and leaves it running. Otherwise the launcher starts SubMiner and quits it when you close mpv, the same as playing a local file. See [Launcher script](/launcher-script) for the other `jellyfin` subcommands.

 ## Options

 All options are under **Settings > Integrations > Jellyfin**, or `jellyfin` in `config.jsonc`. See [Configuration](/configuration#jellyfin) for the full list and defaults.

-| Key                        | What it does                                                         |
-| -------------------------- | -------------------------------------------------------------------- |
-| `enabled`                  | Turns the integration on. Set for you when you sign in.              |
-| `serverUrl`                | Your Jellyfin server. Filled in when you sign in.                    |
-| `remoteControlEnabled`     | Lets SubMiner act as a cast target.                                  |
-| `remoteControlAutoConnect` | Connects at startup. Turn off to start discovery from the tray.      |
-| `autoAnnounce`             | Re-announces the device on connect. Try it if SubMiner appears late. |
-| `transcodeVideoCodec`      | Video codec requested when Jellyfin transcodes.                      |
+| Key                        | What it does                                                           |
+| -------------------------- | ---------------------------------------------------------------------- |
+| `enabled`                  | Turns the integration on. Set for you when you sign in.                |
+| `serverUrl`                | Your Jellyfin server. Filled in when you sign in.                      |
+| `remoteControlEnabled`     | Lets SubMiner act as a cast target.                                    |
+| `remoteControlAutoConnect` | Connects at startup when `startupWarmups.jellyfinRemoteSession` is on. |
+| `autoAnnounce`             | Re-announces the device on connect. Try it if SubMiner appears late.   |
+| `transcodeVideoCodec`      | Video codec requested when Jellyfin transcodes.                        |

 For headless setups, `SUBMINER_JELLYFIN_ACCESS_TOKEN` and `SUBMINER_JELLYFIN_USER_ID` supply a session without the sign-in window. Treat the token store and `config.jsonc` as secrets.

@@ -67,6 +67,16 @@ If you have not set up dictionaries yet, start with [Yomitan setup](/usage#yomit

 Word boundaries come from Yomitan's parser. Some splits will be wrong, since Japanese has no spaces.

+## "Electron downgrade blocked" or "Unsupported Electron runtime"
+
+SubMiner refuses to load Yomitan storage when the current Electron major does not match the app build, or when the profile was previously opened by a newer Electron major or minor version. Patch downgrades within the same major and minor version are allowed, such as `43.7.3` to `43.7.2`. Downgrades from `43.7.x` to `43.6.x`, or from Electron 43 to 42, are blocked. Launch the packaged app or use the repository's `bun run dev` command. Do not delete the runtime safety record to force an older major or minor version to open the profile.
+
+Older SubMiner builds without this guard cannot enforce the safety record. When testing Electron 43 before returning to an older Electron 42 build, use the separate `SubMiner-dev` profile described in [development](/development#run-locally) so the older build never opens the upgraded profile.
+
+## "Yomitan reported zero dictionaries after previously reporting ..."
+
+SubMiner detected that a previously non-empty Yomitan profile suddenly appears empty. Automatic character-dictionary changes are blocked so they cannot overwrite the suspicious state. Close SubMiner, preserve the profile directory, and restore a known-good backup before importing or deleting dictionaries.
+
 ## "Yomitan extension not found in any search path"

 The bundled Yomitan is missing. Re-download the AppImage, or place an unpacked Yomitan extension in `~/.config/SubMiner/yomitan`. Source builds must run `bun run build` first to produce `build/yomitan`.
@@ -145,6 +145,10 @@ Press `Alt+C` to choose a controller and remap buttons. Click an action's **Lear

 On controllers that report the W3C standard layout, the default quit button lands on `L2` instead of `Select`. Remap it with `Alt+C`. All options are in [Configuration](/configuration#controller-support).

+## Development profiles
+
+`--dev` and `--debug` use a separate `SubMiner-dev` profile. They do not read or modify dictionaries and configuration from the installed app unless `SUBMINER_USE_PRODUCTION_PROFILE=1` is explicitly set. See [Development](/development#run-locally).
+
 ## Changing settings while you watch

 SubMiner watches your config file and applies most changes without a restart, including subtitle style, keybindings, and most Anki settings. If a change needs a restart, SubMiner tells you. If the file has an error, it keeps the last working config and shows a notification. See [Configuration](/configuration).
@@ -63,7 +63,11 @@ the plugin artifact, persistent config, or session help.

 The subtitle sidebar consumes parsed cues through `SubtitleSidebarSnapshot`. Its `sourceKey`
 identifies the media and subtitle source so renderer selections are invalidated on source changes,
-including changes whose cue text and timings are identical. Native selection and clean clipboard
+including changes whose cue text and timings are identical. While open, the sidebar polls the
+cheap `SubtitleSidebarPlaybackState` (cached time, current line, `sourceKey`, `cuesRevision`; no
+mpv round-trips) every 80 ms for active-cue tracking. It fetches the full snapshot, which resolves
+the source over mpv IPC and carries every cue plus config, only on open, config reload, a
+`sourceKey`/`cuesRevision` change, and a ~2 s fallback. Native selection and clean clipboard
 serialization live in `src/renderer/modals/subtitle-sidebar-selection.ts`. Electron lets standard
 Copy input reach the renderer, where sidebar selection takes priority over the live-subtitle binding.
 The preload bridge writes selections through Electron's clipboard API so copying does not depend
@@ -21,6 +21,7 @@ Read when: finding internal docs or checking verification status
 | Planning guide | `docs/workflow/planning.md` | active | 2026-05-23 | lightweight vs execution plans |
 | Agent skills | `docs/workflow/agent-skills.md` | active | 2026-08-23 | repo-local workflow skill ownership |
 | Verification guide | `docs/workflow/verification.md` | active | 2026-08-13 | maintained verification lanes |
+| Testing guidelines | `docs/workflow/testing.md` | active | 2026-10-04 | test style and anti-patterns |
 | Release guide | `docs/RELEASING.md` | active | 2026-05-23 | release checklist |

 ## Update Rules
@@ -13,6 +13,7 @@ This section is the internal workflow map for contributors and agents.

 - [Planning](./planning.md) - when to write a lightweight plan vs a full execution plan
 - [Verification](./verification.md) - maintained test/build lanes and handoff gate
+- [Testing](./testing.md) - what a good test looks like and what not to write
 - [Agent Skills](./agent-skills.md) - repo-local workflow skill ownership
 - [Release Guide](../RELEASING.md) - tagged release workflow

@@ -0,0 +1,49 @@
+<!-- read_when: writing, reviewing, or deleting tests -->
+
+# Testing Guidelines
+
+Status: active  
+Last verified: 2026-10-04  
+Owner: Kyle Yasuda  
+Read when: adding or changing tests
+
+Which lanes to run lives in [Verification](./verification.md). This page covers what a
+good test looks like here.
+
+## Test Behavior, Not Wiring
+
+- Exercise a module through its public interface and assert outcomes: return values,
+  resulting state, files written, rows in sqlite, messages sent to a fake process.
+- Prefer real collaborators that are cheap: tmp dirs, in-memory or tmp sqlite, fake
+  executables, pure parsers. Fake only the edges (Electron, mpv socket, network).
+- Assert call order only when order is the behavior (startup sequencing, ABA races),
+  and then assert relative order, not the whole call log.
+
+## Do Not Write
+
+- Pass-through tests: a builder or handler that only forwards deps (`*-main-deps.ts`,
+  `*-runtime-handlers.ts`) needs no test. TypeScript already checks the shape.
+- Source-text tests: reading `.ts`, `.css`, `.html`, `.lua`, `.swift`, or workflow YAML
+  and asserting with regexes. If the invariant matters, extract the logic and run it
+  (see `src/preload-ipc-listeners.ts`). Policy lints over workflow YAML are the
+  exception and belong in one parsed-YAML check.
+- "Stays deleted" tests for removed modules, flags, or selectors. `tsc` and review
+  catch reintroduction.
+- Tests that restate constants, defaults, labels, or window options.
+- The same rule at several layers. Test a rule once where it lives; keep one
+  end-to-end case (for the tokenizer, the golden corpus) for integration.
+
+## Keep Tests Small
+
+- Shared setup goes in a `makeDeps(overrides)` helper or a `*-test-harness.ts` file, not
+  pasted into every test.
+- Near-identical cases become a table: `for (const c of cases) test(c.name, ...)`.
+- Inject timers, clocks, and loggers instead of patching globals or private members.
+- A bug fix gets a regression test for the behavior that broke, named after the
+  behavior, not the ticket.
+
+## Known Debt
+
+- `src/main/main-wiring.test.ts` and `src/renderer/renderer-init-order.test.ts` still
+  regex `main.ts` / `renderer.ts` to guard startup ordering. Replace each test with a
+  behavioral one as the logic moves out of `main.ts` closures.
@@ -3,7 +3,7 @@
 # Verification

 Status: active  
-Last verified: 2026-08-13
+Last verified: 2026-10-05
 Owner: Kyle Yasuda  
 Read when: selecting the right verification lane for a change

@@ -14,8 +14,9 @@ Read when: selecting the right verification lane for a change
  files in `package.json`.
 - `scripts/run-test-lane.mjs` runs each test file in its own `bun test` process
  (per-file isolation with a wall timeout) so a hanging test or leaked global in
-  one file cannot cascade into the rest of the lane. `--jobs N` parallelizes;
-  `--single-process` restores the shared-process mode for debugging.
+  one file cannot cascade into the rest of the lane. Files run in parallel, one
+  worker per CPU by default; `--jobs 1` runs serially and `--single-process`
+  restores the shared-process mode for debugging.
 - `bun run test:fast` is the full source gate: discovered `src/**`, launcher
  unit, and `scripts/**`.
 - `.github/workflows/quality-gate.yml` is the reusable `workflow_call` gate for
@@ -57,6 +58,8 @@ bun run docs:build
 - Launcher/plugin: `bun run test:launcher` or `bun run test:env`
 - Runtime-compat / compiled behavior after `bun run build`: `bun run test:runtime:compat`
 - Stats dashboard UI: `bun run test:stats`
+- Overlay, renderer, mpv, or mining behavior that unit tests cannot show: `bun run build`,
+  then `bun run test:e2e` (see [Headless End-to-End Harness](#headless-end-to-end-harness))
 - Build/release scripts (`scripts/**`): `bun run test:scripts`
 - Packaging: build the platform package, then run `bun run test:package <resources-directory>`.
  On headless Linux: `xvfb-run -a bun run test:package release/linux-unpacked/resources`.
@@ -70,7 +73,7 @@ bun run docs:build

 - `bun run test:coverage:src` runs the same discovered `bun-src-full` membership as
  `test:src` through a sharded coverage runner: one Bun coverage process per test
-  file, then merged LCOV output.
+  file (parallel, one per CPU unless `--jobs N`), then merged LCOV output.
 - A failing coverage shard stops the runner with a nonzero status. Coverage is a
  source test gate, not a report-only step.
 - Machine-readable output lands at `coverage/test-src/lcov.info`.
@@ -92,6 +95,54 @@ bun run docs:build
 - This is not a full Electron UI startup check. It does not require a display and
  makes no claims about renderer, window, tray, or mpv behavior.

+## Headless End-to-End Harness
+
+`bun run test:e2e` boots the built app against a real mpv and asserts on what the
+overlay renders and what reaches AnkiConnect. Use it instead of a live desktop test
+whenever the behavior does not depend on a specific compositor.
+
+- Needs an existing `bun run build`, plus `mpv` and `ffmpeg` on `PATH` (and `Xvfb` on
+  Linux). It is not part of `test:fast` or the handoff gate. The `e2e` job in
+  `.github/workflows/ci.yml` runs it on Linux, macOS, and Windows for pull requests and
+  `main`, outside the reusable quality gate, and uploads the session logs when it fails.
+- Every run is sandboxed in a temp dir: its own config and Electron profile, mpv IPC
+  socket, and a fake AnkiConnect on a free port. It never touches the user's running
+  SubMiner, Anki, or stats database. It is not offline: the app still asks AniList for
+  cover art matching the clip's title.
+- Media is synthetic: an ffmpeg test-pattern clip, a three-cue Japanese `.srt`, and a
+  tiny Yomitan dictionary covering those cues (`e2e/harness/fixtures.ts`). The harness
+  imports the dictionary on a first boot, then restarts the app for the scenario.
+- Display: Linux runs everything inside a private Xvfb server, so no window reaches the
+  desktop. macOS and Windows have no offscreen display server, so windows open in the
+  current session there; `SUBMINER_E2E_DISPLAY=host` forces the same on Linux. The
+  CI job runs all three. On macOS and Windows the app pre-creates a hidden modal window
+  that loads the same renderer document, so window matching must include the
+  `layer=visible` query (`OVERLAY_PAGE`).
+- The app is driven over the Chrome DevTools Protocol (DOM queries, input events,
+  per-window screenshots), mpv over its JSON IPC socket, and app commands through the
+  normal CLI handoff (`--mine-sentence`, `--toggle-subtitle-sidebar`, ...).
+- Scenarios live in `e2e/*.e2e.test.ts` and share one session per file through
+  `startE2eSession()`. Pass `config` to override settings for a scenario file.
+- On a failed startup the temp dir is kept and its path is in the error. Set
+  `SUBMINER_E2E_KEEP=1` to keep it after any run (`app-stdio.log`, `app.log`, `mpv.log`).
+
+For exploratory checks, keep one session up and poke at it:
+
+```bash
+bun run e2e start &                 # prints the session JSON, stays up until stopped
+bun run e2e mpv seek 2 absolute+exact
+bun run e2e eval overlay 'document.getElementById("subtitleRoot").textContent'
+bun run e2e shot overlay /tmp/overlay.png
+bun run e2e app --mine-sentence
+bun run e2e anki                    # AnkiConnect requests received so far
+bun run e2e stop
+```
+
+Out of scope: compositor-specific behavior (Hyprland placement, stacking, fullscreen,
+click-through), real GPU video output, and global shortcuts. Xvfb runs without a window
+manager or compositor, so the transparent overlay is not composited over the video;
+check overlay visuals with per-window screenshots, and use the live desktop for the rest.
+
 ## Dependency Audit Policy

 - `bun audit --audit-level high` blocks the reusable quality gate.
@@ -0,0 +1,160 @@
+// Keeps one isolated e2e session running so a change can be poked at by hand
+// (or by an agent) without touching the real desktop:
+//
+//   bun run e2e start                      boot and stay up until `stop` or Ctrl-C
+//   bun run e2e eval <page> <expression>   evaluate JS in a window (or "main" for the main process)
+//   bun run e2e shot <page> <file.png>     save a screenshot of a window
+//   bun run e2e mpv <command> [args...]    send an mpv IPC command (args parsed as JSON)
+//   bun run e2e app <args...>              run a SubMiner CLI command against the instance
+//   bun run e2e anki                       print the AnkiConnect requests received so far
+//   bun run e2e stop
+//
+// <page> is a URL fragment: "overlay" is shorthand for the overlay window.
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { connectCdp, connectCdpPage, listCdpTargets } from './harness/cdp';
+import { connectMpv } from './harness/mpv';
+import { OVERLAY_PAGE, runAppCommand, startE2eSession, type AppTarget } from './harness/session';
+import { waitUntil } from './harness/wait';
+
+type SessionState = {
+  pid: number;
+  root: string;
+  display: string;
+  cdpPort: number;
+  inspectorUrl: string;
+  mpvSocketPath: string;
+  ankiUrl: string;
+  target: AppTarget;
+};
+
+const stateFile = path.join(os.tmpdir(), 'subminer-e2e-session.json');
+
+function readState(): SessionState {
+  if (!fs.existsSync(stateFile)) {
+    throw new Error('No e2e session is running. Start one with `bun run e2e start`.');
+  }
+  return JSON.parse(fs.readFileSync(stateFile, 'utf8')) as SessionState;
+}
+
+function isAlive(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function parseJsonOrString(value: string): unknown {
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+}
+
+async function connectNamedPage(state: SessionState, pageName: string) {
+  if (pageName === 'main') return connectCdp(state.inspectorUrl, 'main process');
+  const urlPart = pageName === 'overlay' ? OVERLAY_PAGE : pageName;
+  const targets = await listCdpTargets(state.cdpPort);
+  const target = targets.find((candidate) => candidate.url.includes(urlPart));
+  if (!target) {
+    const open = targets.map((candidate) => `  ${candidate.type} ${candidate.url.slice(0, 100)}`);
+    throw new Error(`No window matches "${pageName}". Open targets:\n${open.join('\n')}`);
+  }
+  return connectCdpPage(target);
+}
+
+async function withPage<T>(
+  state: SessionState,
+  pageName: string,
+  use: (page: Awaited<ReturnType<typeof connectCdpPage>>) => Promise<T>,
+): Promise<T> {
+  const page = await connectNamedPage(state, pageName);
+  try {
+    return await use(page);
+  } finally {
+    page.close();
+  }
+}
+
+async function start(): Promise<void> {
+  if (fs.existsSync(stateFile) && isAlive(readState().pid)) {
+    throw new Error('An e2e session is already running. Stop it with `bun run e2e stop`.');
+  }
+  const session = await startE2eSession();
+  const state: SessionState = {
+    pid: process.pid,
+    root: session.root,
+    display: session.display,
+    cdpPort: session.cdpPort,
+    inspectorUrl: session.inspectorUrl,
+    mpvSocketPath: session.mpvSocketPath,
+    ankiUrl: session.anki.url,
+    target: session.target,
+  };
+  // The state file grants main-process code evaluation via inspectorUrl, so keep it
+  // owner-only. 'wx' creates it exclusively: it fails rather than follow a symlink
+  // planted in the shared temp dir after the stale file is removed.
+  fs.rmSync(stateFile, { force: true });
+  fs.writeFileSync(stateFile, JSON.stringify(state, null, 2), { mode: 0o600, flag: 'wx' });
+  console.log(JSON.stringify(state, null, 2));
+
+  await new Promise<void>((resolve) => {
+    process.once('SIGINT', resolve);
+    process.once('SIGTERM', resolve);
+  });
+  fs.rmSync(stateFile, { force: true });
+  await session.dispose();
+}
+
+async function main(): Promise<void> {
+  const [command, ...args] = process.argv.slice(2);
+  if (command === 'start') return start();
+
+  const state = readState();
+  switch (command) {
+    case 'eval': {
+      const [pageName, expression] = args;
+      if (!pageName || !expression) throw new Error('Usage: eval <page> <expression>');
+      const value = await withPage(state, pageName, (page) => page.evaluate<unknown>(expression));
+      console.log(JSON.stringify(value, null, 2));
+      return;
+    }
+    case 'shot': {
+      const [pageName, outputPath] = args;
+      if (!pageName || !outputPath) throw new Error('Usage: shot <page> <file.png>');
+      fs.writeFileSync(outputPath, await withPage(state, pageName, (page) => page.screenshot()));
+      return;
+    }
+    case 'mpv': {
+      if (args.length === 0) throw new Error('Usage: mpv <command> [args...]');
+      const mpv = await connectMpv(state.mpvSocketPath);
+      try {
+        console.log(JSON.stringify((await mpv.command(...args.map(parseJsonOrString))) ?? null));
+      } finally {
+        mpv.close();
+      }
+      return;
+    }
+    case 'app':
+      await runAppCommand(state.target, args);
+      return;
+    case 'anki':
+      console.log(JSON.stringify(await (await fetch(state.ankiUrl)).json(), null, 2));
+      return;
+    case 'stop':
+      process.kill(state.pid, 'SIGTERM');
+      await waitUntil(() => !isAlive(state.pid), { description: 'e2e session to exit' });
+      return;
+    default:
+      throw new Error(`Unknown command "${command ?? ''}". See the header of e2e/cli.ts.`);
+  }
+}
+
+main().catch((error: unknown) => {
+  console.error(error instanceof Error ? error.message : error);
+  process.exit(1);
+});
@@ -0,0 +1,133 @@
+import { waitUntil, type Truthy, type WaitOptions } from './wait';
+
+export type CdpTarget = {
+  type: string;
+  title: string;
+  url: string;
+  webSocketDebuggerUrl: string;
+};
+
+export type CdpPage = {
+  /** Sends a raw DevTools protocol command, for anything the helpers below do not cover. */
+  send: (method: string, params?: Record<string, unknown>) => Promise<Record<string, unknown>>;
+  /** Evaluates an expression in the page, awaiting promises, and returns its JSON value. */
+  evaluate: <T>(expression: string) => Promise<T>;
+  /** Polls an expression until it is truthy and returns that value. */
+  waitFor: <T>(expression: string, options: WaitOptions) => Promise<Truthy<T>>;
+  /** Console output and uncaught exceptions seen since connecting, oldest first. */
+  console: string[];
+  /** PNG of the page as rendered by Chromium; needs no OS screen-capture permission. */
+  screenshot: () => Promise<Buffer>;
+  close: () => void;
+};
+
+type CdpReply = {
+  id?: number;
+  method?: string;
+  params?: Record<string, unknown>;
+  error?: { message: string };
+  result?: Record<string, unknown>;
+};
+
+type RemoteObject = { value?: unknown; description?: string };
+
+// Renders a console/exception event as one log line.
+function formatConsoleEvent(method: string, params: Record<string, unknown>): string | null {
+  if (method === 'Runtime.consoleAPICalled') {
+    const args = Array.isArray(params.args) ? (params.args as RemoteObject[]) : [];
+    const text = args.map((arg) => arg.description ?? JSON.stringify(arg.value)).join(' ');
+    return `console.${String(params.type)}: ${text}`;
+  }
+  if (method === 'Runtime.exceptionThrown') {
+    const details = params.exceptionDetails as
+      | { text?: string; exception?: RemoteObject }
+      | undefined;
+    return `exception: ${details?.exception?.description ?? details?.text ?? 'unknown'}`;
+  }
+  if (method === 'Log.entryAdded') {
+    const entry = params.entry as { level?: string; source?: string; text?: string } | undefined;
+    return `${String(entry?.source)}.${String(entry?.level)}: ${String(entry?.text)}`;
+  }
+  return null;
+}
+
+type EvaluateResult = {
+  result: { value?: unknown };
+  exceptionDetails?: { text: string; exception?: { description?: string } };
+};
+
+export async function listCdpTargets(port: number): Promise<CdpTarget[]> {
+  const response = await fetch(`http://127.0.0.1:${port}/json/list`);
+  return (await response.json()) as CdpTarget[];
+}
+
+export function connectCdpPage(target: CdpTarget): Promise<CdpPage> {
+  return connectCdp(target.webSocketDebuggerUrl, target.url);
+}
+
+/** Connects to any DevTools endpoint: a renderer page or Electron's main-process inspector. */
+export async function connectCdp(webSocketDebuggerUrl: string, label: string): Promise<CdpPage> {
+  const socket = new WebSocket(webSocketDebuggerUrl);
+  await new Promise<void>((resolve, reject) => {
+    socket.addEventListener('open', () => resolve(), { once: true });
+    socket.addEventListener('error', () => reject(new Error(`CDP connection to ${label} failed`)), {
+      once: true,
+    });
+  });
+
+  const pending = new Map<number, (reply: CdpReply) => void>();
+  const consoleLines: string[] = [];
+  let nextId = 1;
+  socket.addEventListener('message', (event) => {
+    const reply: CdpReply = JSON.parse(String(event.data));
+    if (reply.id === undefined) {
+      if (reply.method) {
+        const line = formatConsoleEvent(reply.method, reply.params ?? {});
+        if (line) consoleLines.push(line);
+      }
+      return;
+    }
+    pending.get(reply.id)?.(reply);
+    pending.delete(reply.id);
+  });
+
+  const send = (method: string, params: Record<string, unknown> = {}) =>
+    new Promise<Record<string, unknown>>((resolve, reject) => {
+      const id = nextId++;
+      pending.set(id, (reply) => {
+        if (reply.error) reject(new Error(`CDP ${method} failed: ${reply.error.message}`));
+        else resolve(reply.result ?? {});
+      });
+      socket.send(JSON.stringify({ id, method, params }));
+    });
+
+  const evaluate = async <T>(expression: string): Promise<T> => {
+    const reply = (await send('Runtime.evaluate', {
+      expression,
+      returnByValue: true,
+      awaitPromise: true,
+    })) as EvaluateResult;
+    if (reply.exceptionDetails) {
+      const { text, exception } = reply.exceptionDetails;
+      throw new Error(`Page evaluation threw: ${exception?.description ?? text}`);
+    }
+    return reply.result.value as T;
+  };
+
+  await send('Runtime.enable');
+  // The Node inspector behind Electron's main process has no Log domain.
+  await send('Log.enable').catch(() => undefined);
+
+  return {
+    send,
+    evaluate,
+    console: consoleLines,
+    waitFor: <T>(expression: string, options: WaitOptions) =>
+      waitUntil(() => evaluate<T>(expression), options),
+    screenshot: async () => {
+      const reply = await send('Page.captureScreenshot', { format: 'png' });
+      return Buffer.from(String(reply.data), 'base64');
+    },
+    close: () => socket.close(),
+  };
+}
@@ -0,0 +1,75 @@
+import { spawn } from 'node:child_process';
+import { once } from 'node:events';
+import { stopProcess, type EnvDelta } from './process';
+
+export const E2E_SCREEN = { width: 1280, height: 720 } as const;
+
+export type E2eDisplay = {
+  kind: 'xvfb' | 'host';
+  env: EnvDelta;
+  stop: () => Promise<void>;
+};
+
+// Linux gets a private Xvfb server so no window ever reaches the real desktop.
+// macOS and Windows have no offscreen display server, so windows open in the
+// current GUI session there. SUBMINER_E2E_DISPLAY=host forces that on Linux too.
+export async function startDisplay(): Promise<E2eDisplay> {
+  const requested = process.env.SUBMINER_E2E_DISPLAY?.trim().toLowerCase();
+  if (requested && requested !== 'host' && requested !== 'xvfb') {
+    throw new Error(`SUBMINER_E2E_DISPLAY must be "host" or "xvfb", got "${requested}"`);
+  }
+  const kind = requested ?? (process.platform === 'linux' ? 'xvfb' : 'host');
+  if (kind === 'host') {
+    return { kind, env: { set: {}, unset: [] }, stop: async () => {} };
+  }
+  return startXvfb();
+}
+
+async function startXvfb(): Promise<E2eDisplay> {
+  // -displayfd makes Xvfb pick a free display number and write it to fd 3 once
+  // it accepts connections, so there is no port guessing and no startup sleep.
+  const child = spawn(
+    'Xvfb',
+    [
+      '-displayfd',
+      '3',
+      '-screen',
+      '0',
+      `${E2E_SCREEN.width}x${E2E_SCREEN.height}x24`,
+      '-nolisten',
+      'tcp',
+    ],
+    { stdio: ['ignore', 'ignore', 'ignore', 'pipe'] },
+  );
+  const displayFd = child.stdio[3];
+  if (!displayFd) throw new Error('Xvfb did not expose its display fd');
+
+  const displayNumber = await Promise.race([
+    once(displayFd, 'data').then(([chunk]) => String(chunk).trim()),
+    once(child, 'error').then(([error]) => {
+      throw new Error(
+        `Could not start Xvfb (${String(error)}). Install it or set SUBMINER_E2E_DISPLAY=host.`,
+      );
+    }),
+    once(child, 'exit').then(([code]) => {
+      throw new Error(`Xvfb exited during startup with code ${String(code)}`);
+    }),
+  ]);
+
+  return {
+    kind: 'xvfb',
+    env: {
+      set: { DISPLAY: `:${displayNumber}`, XDG_SESSION_TYPE: 'x11' },
+      // Without these the app and mpv would pick the real Wayland session, or
+      // take the compositor-specific code paths of the desktop running the tests.
+      unset: [
+        'WAYLAND_DISPLAY',
+        'HYPRLAND_INSTANCE_SIGNATURE',
+        'SWAYSOCK',
+        'XDG_CURRENT_DESKTOP',
+        'XDG_SESSION_DESKTOP',
+      ],
+    },
+    stop: () => stopProcess(child),
+  };
+}
@@ -0,0 +1,106 @@
+import { once } from 'node:events';
+import http from 'node:http';
+import type { AddressInfo } from 'node:net';
+
+export type AnkiRequest = { action: string; params: Record<string, unknown> };
+
+export type FakeAnki = {
+  url: string;
+  /** Every AnkiConnect action received so far, with `multi` batches flattened. */
+  requests: AnkiRequest[];
+  stop: () => Promise<void>;
+};
+
+export const FAKE_ANKI_DECK = 'E2E';
+export const FAKE_ANKI_MODEL = 'Lapis';
+
+const MODEL_FIELDS = [
+  'Expression',
+  'ExpressionFurigana',
+  'ExpressionReading',
+  'ExpressionAudio',
+  'SelectionText',
+  'MainDefinition',
+  'Sentence',
+  'SentenceFurigana',
+  'SentenceAudio',
+  'Picture',
+  'Glossary',
+  'IsWordAndSentenceCard',
+  'IsClickCard',
+  'IsSentenceCard',
+  'IsAudioCard',
+  'MiscInfo',
+];
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+// A recording AnkiConnect stand-in: an empty collection with one deck and one
+// Lapis-shaped note type. Scenarios assert on `requests`, not on stored notes.
+export async function startFakeAnki(): Promise<FakeAnki> {
+  const requests: AnkiRequest[] = [];
+  let nextNoteId = 1000;
+
+  const handle = (body: unknown): unknown => {
+    if (!isRecord(body) || typeof body.action !== 'string') return null;
+    const params = isRecord(body.params) ? body.params : {};
+    if (body.action === 'multi') {
+      return Array.isArray(params.actions) ? params.actions.map(handle) : [];
+    }
+    requests.push({ action: body.action, params });
+    switch (body.action) {
+      case 'version':
+        return 6;
+      case 'deckNames':
+        return [FAKE_ANKI_DECK];
+      case 'modelNames':
+        return [FAKE_ANKI_MODEL];
+      case 'modelFieldNames':
+        return MODEL_FIELDS;
+      case 'addNote':
+        return nextNoteId++;
+      case 'findNotes':
+      case 'notesInfo':
+        return [];
+      case 'storeMediaFile':
+        return params.filename ?? null;
+      default:
+        return null;
+    }
+  };
+
+  const server = http.createServer((request, response) => {
+    response.setHeader('content-type', 'application/json');
+    // GET exposes the request log so the session CLI can read it from outside.
+    if (request.method === 'GET') {
+      response.end(JSON.stringify(requests));
+      return;
+    }
+    const chunks: Buffer[] = [];
+    request.on('data', (chunk: Buffer) => chunks.push(chunk));
+    request.on('end', () => {
+      let body: unknown = null;
+      try {
+        body = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+      } catch {
+        // Malformed bodies get the same null result AnkiConnect gives unknown actions.
+      }
+      response.end(JSON.stringify({ result: handle(body), error: null }));
+    });
+  });
+  server.listen(0, '127.0.0.1');
+  await once(server, 'listening');
+  const { port } = server.address() as AddressInfo;
+
+  return {
+    url: `http://127.0.0.1:${port}`,
+    requests,
+    stop: async () => {
+      server.closeAllConnections();
+      server.close();
+      await once(server, 'close');
+    },
+  };
+}
@@ -0,0 +1,92 @@
+import { execFile } from 'node:child_process';
+import fs from 'node:fs';
+import { promisify } from 'node:util';
+import { writeStoredZipAsync } from '../../src/shared/stored-zip';
+
+const execFileAsync = promisify(execFile);
+
+export const FIXTURE_DICTIONARY_TITLE = 'SubMiner E2E Fixture';
+export const FIXTURE_CLIP_SECONDS = 15;
+
+/** Cues of the synthetic clip. Seek to `at` to land inside a cue. */
+export const FIXTURE_CUES = [
+  { start: 1, end: 4, at: 2, text: '今日はいい天気ですね。' },
+  { start: 5, end: 8, at: 6, text: '猫が好きです。' },
+  { start: 9, end: 12, at: 10, text: '明日は学校に行きます。' },
+] as const;
+
+// [term, reading, part of speech, gloss] for every content word in FIXTURE_CUES.
+const FIXTURE_TERMS = [
+  ['今日', 'きょう', 'n', 'today'],
+  ['いい', 'いい', 'adj-i', 'good'],
+  ['天気', 'てんき', 'n', 'weather'],
+  ['猫', 'ねこ', 'n', 'cat'],
+  ['好き', 'すき', 'adj-na', 'liked'],
+  ['明日', 'あした', 'n', 'tomorrow'],
+  ['学校', 'がっこう', 'n', 'school'],
+  ['行く', 'いく', 'v5', 'to go'],
+] as const;
+
+function srtTimestamp(seconds: number): string {
+  return `00:00:${String(seconds).padStart(2, '0')},000`;
+}
+
+export function writeFixtureSubtitles(outputPath: string): void {
+  const blocks = FIXTURE_CUES.map(
+    (cue, index) =>
+      `${index + 1}\n${srtTimestamp(cue.start)} --> ${srtTimestamp(cue.end)}\n${cue.text}\n`,
+  );
+  fs.writeFileSync(outputPath, blocks.join('\n'), 'utf8');
+}
+
+/** Renders a deterministic test-pattern clip with a sine tone, so no real media is needed. */
+export async function generateFixtureClip(outputPath: string): Promise<void> {
+  await execFileAsync('ffmpeg', [
+    '-nostdin',
+    '-v',
+    'error',
+    '-y',
+    '-f',
+    'lavfi',
+    '-i',
+    `testsrc2=size=640x360:rate=24:duration=${FIXTURE_CLIP_SECONDS}`,
+    '-f',
+    'lavfi',
+    '-i',
+    `sine=frequency=440:duration=${FIXTURE_CLIP_SECONDS}`,
+    '-c:v',
+    'libx264',
+    '-preset',
+    'ultrafast',
+    '-pix_fmt',
+    'yuv420p',
+    '-c:a',
+    'aac',
+    outputPath,
+  ]);
+}
+
+/** Writes a minimal Yomitan term dictionary so the tokenizer has real entries to match. */
+export async function buildFixtureDictionary(outputPath: string): Promise<void> {
+  const index = {
+    title: FIXTURE_DICTIONARY_TITLE,
+    revision: '1',
+    format: 3,
+    author: 'SubMiner',
+    description: 'Synthetic dictionary for the e2e harness.',
+  };
+  const termBank = FIXTURE_TERMS.map(([term, reading, partOfSpeech, gloss], sequence) => [
+    term,
+    reading,
+    '',
+    partOfSpeech,
+    0,
+    [gloss],
+    sequence + 1,
+    '',
+  ]);
+  await writeStoredZipAsync(outputPath, [
+    { name: 'index.json', data: Buffer.from(JSON.stringify(index), 'utf8') },
+    { name: 'term_bank_1.json', data: Buffer.from(JSON.stringify(termBank), 'utf8') },
+  ]);
+}
@@ -0,0 +1,95 @@
+import { spawn, type ChildProcess } from 'node:child_process';
+import { once } from 'node:events';
+import fs from 'node:fs';
+import net from 'node:net';
+import type { E2eDisplay } from './display';
+import { E2E_SCREEN } from './display';
+import { applyEnvDelta } from './process';
+import { waitUntil } from './wait';
+
+export type MpvClient = {
+  /** Sends one mpv JSON IPC command and resolves with its `data` field. */
+  command: (...args: unknown[]) => Promise<unknown>;
+  close: () => void;
+};
+
+type MpvReply = { request_id?: number; error?: string; data?: unknown };
+
+export async function startMpv(options: {
+  socketPath: string;
+  mediaPath: string;
+  subtitlePath: string;
+  logPath: string;
+  display: E2eDisplay;
+}): Promise<ChildProcess> {
+  const log = fs.openSync(options.logPath, 'w');
+  const child = spawn(
+    'mpv',
+    [
+      '--no-config',
+      '--no-terminal',
+      '--pause',
+      '--keep-open=yes',
+      '--ao=null',
+      `--geometry=${E2E_SCREEN.width}x${E2E_SCREEN.height}+0+0`,
+      // Xvfb has no GPU; the software X11 output always works there.
+      ...(options.display.kind === 'xvfb' ? ['--vo=x11'] : []),
+      `--input-ipc-server=${options.socketPath}`,
+      `--sub-file=${options.subtitlePath}`,
+      options.mediaPath,
+    ],
+    { env: applyEnvDelta(process.env, options.display.env), stdio: ['ignore', log, log] },
+  );
+  fs.closeSync(log);
+  await Promise.race([
+    once(child, 'spawn'),
+    once(child, 'error').then(([error]) => {
+      throw new Error(`Could not start mpv (${String(error)}). Is it on PATH?`);
+    }),
+  ]);
+  return child;
+}
+
+function tryConnect(socketPath: string): Promise<net.Socket | null> {
+  return new Promise((resolve) => {
+    const socket = net.connect(socketPath);
+    socket.once('connect', () => resolve(socket));
+    socket.once('error', () => resolve(null));
+  });
+}
+
+export async function connectMpv(socketPath: string): Promise<MpvClient> {
+  const socket = await waitUntil(() => tryConnect(socketPath), {
+    description: `mpv IPC socket ${socketPath}`,
+  });
+  const pending = new Map<number, (reply: MpvReply) => void>();
+  let nextRequestId = 1;
+  let buffer = '';
+
+  socket.setEncoding('utf8');
+  socket.on('data', (chunk: string) => {
+    buffer += chunk;
+    const lines = buffer.split('\n');
+    buffer = lines.pop() ?? '';
+    for (const line of lines) {
+      if (!line.trim()) continue;
+      const reply: MpvReply = JSON.parse(line);
+      if (reply.request_id === undefined) continue;
+      pending.get(reply.request_id)?.(reply);
+      pending.delete(reply.request_id);
+    }
+  });
+
+  return {
+    command: (...args) =>
+      new Promise((resolve, reject) => {
+        const requestId = nextRequestId++;
+        pending.set(requestId, (reply) => {
+          if (reply.error === 'success') resolve(reply.data);
+          else reject(new Error(`mpv ${JSON.stringify(args)} failed: ${reply.error}`));
+        });
+        socket.write(`${JSON.stringify({ command: args, request_id: requestId })}\n`);
+      }),
+    close: () => socket.destroy(),
+  };
+}
@@ -0,0 +1,24 @@
+import type { ChildProcess } from 'node:child_process';
+import { once } from 'node:events';
+
+export type EnvDelta = { set: Record<string, string>; unset: string[] };
+
+export function applyEnvDelta(base: NodeJS.ProcessEnv, ...deltas: EnvDelta[]): NodeJS.ProcessEnv {
+  const env = { ...base };
+  for (const delta of deltas) {
+    for (const name of delta.unset) delete env[name];
+    Object.assign(env, delta.set);
+  }
+  return env;
+}
+
+/** Terminates a child and waits for it to exit, escalating to SIGKILL after `graceMs`. */
+export async function stopProcess(child: ChildProcess, graceMs = 5_000): Promise<void> {
+  // A child that never spawned (missing binary) has no pid and never emits exit.
+  if (child.pid === undefined || child.exitCode !== null || child.signalCode !== null) return;
+  const exited = once(child, 'exit');
+  child.kill();
+  const timer = setTimeout(() => child.kill('SIGKILL'), graceMs);
+  await exited;
+  clearTimeout(timer);
+}
@@ -0,0 +1,332 @@
+import { spawn, type ChildProcess } from 'node:child_process';
+import { once } from 'node:events';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { connectCdp, connectCdpPage, listCdpTargets, type CdpPage } from './cdp';
+import { startDisplay, type E2eDisplay } from './display';
+import { FAKE_ANKI_DECK, FAKE_ANKI_MODEL, startFakeAnki, type FakeAnki } from './fake-anki';
+import { buildFixtureDictionary, generateFixtureClip, writeFixtureSubtitles } from './fixtures';
+import { connectMpv, startMpv, type MpvClient } from './mpv';
+import { applyEnvDelta, stopProcess, type EnvDelta } from './process';
+import { waitUntil } from './wait';
+import {
+  shouldForceX11ElectronBackend,
+  X11_ELECTRON_BOOTSTRAP_ENV,
+} from '../../src/core/utils/electron-backend';
+
+const repoRoot = path.resolve(__dirname, '..', '..');
+
+/** URL fragments identifying the app's windows among the CDP targets. The modal
+ * window loads the same document with `layer=modal`, so the layer is required. */
+export const OVERLAY_PAGE = 'renderer/index.html?layer=visible';
+const YOMITAN_SETTINGS_PAGE = 'settings.html';
+
+type JsonObject = { [key: string]: JsonValue };
+type JsonValue = string | number | boolean | null | JsonValue[] | JsonObject;
+
+export type E2eSessionOptions = {
+  /** Deep-merged over the harness config, for scenarios that need other settings. */
+  config?: JsonObject;
+};
+
+export type AppTarget = {
+  /** Environment changes that point a process at the isolated instance. */
+  env: EnvDelta;
+  /** Electron/Chromium switches every launch needs. */
+  electronArgs: string[];
+  /** Receives stdout and stderr of every launch. */
+  logPath: string;
+};
+
+export type E2eSession = {
+  /** Temp dir holding the isolated config, fixtures, sockets, and logs. */
+  root: string;
+  display: E2eDisplay['kind'];
+  cdpPort: number;
+  /** DevTools endpoint of the Electron main process (Node inspector). */
+  inspectorUrl: string;
+  mpvSocketPath: string;
+  /** How to start a process that talks to this isolated instance. */
+  target: AppTarget;
+  mpv: MpvClient;
+  anki: FakeAnki;
+  /** Connects to the first window or frame whose URL contains `urlPart`, waiting for it to exist. */
+  openPage: (urlPart: string) => Promise<CdpPage>;
+  /** Evaluates in the main process; reach modules via `process.mainModule.require`. */
+  mainProcess: () => Promise<CdpPage>;
+  /** Runs a CLI command (e.g. `--mine-sentence`) against the running instance. */
+  runAppCommand: (...args: string[]) => Promise<void>;
+  dispose: () => Promise<void>;
+};
+
+function isJsonObject(value: JsonValue | undefined): value is JsonObject {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function mergeConfig(base: JsonObject, overrides: JsonObject): JsonObject {
+  const merged = { ...base };
+  for (const [key, value] of Object.entries(overrides)) {
+    const existing = merged[key];
+    merged[key] =
+      isJsonObject(existing) && isJsonObject(value) ? mergeConfig(existing, value) : value;
+  }
+  return merged;
+}
+
+// Everything that could reach outside the sandbox (network services, the real
+// Anki, ports the user's own SubMiner holds) is off or pointed at a fake.
+function buildConfig(mpvSocketPath: string, ankiUrl: string): JsonObject {
+  return {
+    mpv: { socketPath: mpvSocketPath, aniskipEnabled: false },
+    ankiConnect: {
+      url: ankiUrl,
+      deck: FAKE_ANKI_DECK,
+      proxy: { enabled: false },
+      isLapis: { enabled: true, sentenceCardModel: FAKE_ANKI_MODEL },
+    },
+    stats: { autoStartServer: false },
+    updates: { enabled: false },
+    discordPresence: { enabled: false },
+    websocket: { enabled: false },
+    annotationWebsocket: { enabled: false },
+    texthooker: { launchAtStartup: false },
+  };
+}
+
+// Outside Electron the package's entry point is the path of its binary, and
+// resolving it downloads the binary when an install skipped that step (CI).
+function resolveElectronBinary(): string {
+  const binary: unknown = require('electron');
+  if (typeof binary !== 'string') throw new Error('Could not resolve the Electron binary path');
+  return binary;
+}
+
+// Electron announces its main-process inspector on stderr; `offset` skips earlier launches.
+function readInspectorUrl(logPath: string, byteOffset: number): string | null {
+  const tail = fs.readFileSync(logPath).subarray(byteOffset).toString('utf8');
+  return /Debugger listening on (ws:\/\/\S+)/.exec(tail)?.[1] ?? null;
+}
+
+function readDevToolsPort(portFile: string): number | null {
+  try {
+    const port = Number(fs.readFileSync(portFile, 'utf8').split('\n')[0]);
+    return port > 0 ? port : null;
+  } catch {
+    return null;
+  }
+}
+
+function spawnApp(target: AppTarget, electronArgs: string[], args: string[]): ChildProcess {
+  const log = fs.openSync(target.logPath, 'a');
+  const child = spawn(
+    resolveElectronBinary(),
+    [...target.electronArgs, ...electronArgs, repoRoot, ...args],
+    { cwd: repoRoot, env: applyEnvDelta(process.env, target.env), stdio: ['ignore', log, log] },
+  );
+  fs.closeSync(log);
+  return child;
+}
+
+/** Runs a CLI command against the running instance and waits for it to finish. */
+export async function runAppCommand(target: AppTarget, args: string[]): Promise<void> {
+  const child = spawnApp(target, [], args);
+  const timer = setTimeout(() => child.kill('SIGKILL'), 30_000);
+  const [code] = await once(child, 'exit');
+  clearTimeout(timer);
+  if (code !== 0) {
+    throw new Error(
+      `SubMiner ${args.join(' ')} exited with ${String(code)}; see ${target.logPath}`,
+    );
+  }
+}
+
+async function openPage(cdpPort: number, urlPart: string): Promise<CdpPage> {
+  const target = await waitUntil(
+    async () =>
+      (await listCdpTargets(cdpPort)).find((candidate) => candidate.url.includes(urlPart)),
+    { description: `app window matching "${urlPart}"`, timeoutMs: 30_000 },
+  );
+  const page = await connectCdpPage(target);
+  // A target is listed before its document exists; callers expect a usable DOM.
+  await page.waitFor(`document.readyState === "complete"`, {
+    description: `"${urlPart}" document to load`,
+  });
+  return page;
+}
+
+export async function startE2eSession(options: E2eSessionOptions = {}): Promise<E2eSession> {
+  if (!fs.existsSync(path.join(repoRoot, 'dist', 'main-entry.js'))) {
+    throw new Error('dist/ is missing. Run `bun run build` before the e2e harness.');
+  }
+
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-e2e-'));
+  const configHome = path.join(root, 'config');
+  const userDataDir = path.join(configHome, 'SubMiner');
+  const mediaPath = path.join(root, 'clip.mkv');
+  const subtitlePath = path.join(root, 'clip.srt');
+  const dictionaryPath = path.join(root, 'fixture-dictionary.zip');
+  const mpvSocketPath =
+    process.platform === 'win32'
+      ? `\\\\.\\pipe\\${path.basename(root)}-mpv`
+      : path.join(root, 'mpv.sock');
+
+  // Teardown steps, run in reverse. Also used to unwind a failed startup.
+  const teardown: Array<() => Promise<void> | void> = [];
+  const dispose = async (): Promise<void> => {
+    for (const step of teardown.reverse()) await step();
+    teardown.length = 0;
+    if (process.env.SUBMINER_E2E_KEEP !== '1') {
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  };
+
+  try {
+    fs.mkdirSync(userDataDir, { recursive: true });
+    writeFixtureSubtitles(subtitlePath);
+    await Promise.all([generateFixtureClip(mediaPath), buildFixtureDictionary(dictionaryPath)]);
+
+    const display = await startDisplay();
+    teardown.push(display.stop);
+    const anki = await startFakeAnki();
+    teardown.push(anki.stop);
+
+    const config = mergeConfig(buildConfig(mpvSocketPath, anki.url), options.config ?? {});
+    fs.writeFileSync(path.join(userDataDir, 'config.jsonc'), JSON.stringify(config, null, 2));
+
+    const env: EnvDelta = {
+      set: {
+        ...display.env.set,
+        // The app derives its config dir, Electron profile, and control socket from these.
+        ...(process.platform === 'win32'
+          ? { APPDATA: configHome }
+          : { XDG_CONFIG_HOME: configHome, XDG_DATA_HOME: path.join(root, 'data') }),
+        SUBMINER_APP_LOG: path.join(root, 'app.log'),
+        // Stay attached instead of re-spawning detached, so the harness owns the process.
+        SUBMINER_BACKGROUND_CHILD: '1',
+      },
+      unset: [...display.env.unset, 'ELECTRON_RUN_AS_NODE'],
+    };
+    // --enable-logging routes renderer console output into the app log too.
+    const electronArgs = ['--password-store=basic', '--enable-logging=stderr'];
+    // Outside Hyprland/Sway the app re-spawns itself detached onto the X11
+    // backend. Start it there directly so the process we spawn is the app.
+    if (shouldForceX11ElectronBackend(applyEnvDelta(process.env, env))) {
+      env.set[X11_ELECTRON_BOOTSTRAP_ENV] = '1';
+      electronArgs.push('--ozone-platform=x11');
+    }
+    // CI containers and runners lack the user namespaces Chromium's sandbox needs.
+    if (process.platform === 'linux' && process.env.CI) electronArgs.push('--no-sandbox');
+    const target: AppTarget = { env, electronArgs, logPath: path.join(root, 'app-stdio.log') };
+
+    const launchApp = async (
+      args: string[],
+    ): Promise<{ child: ChildProcess; cdpPort: number; inspectorUrl: string }> => {
+      // With port 0 Chromium and Node each pick a free port; Chromium records
+      // its port in the profile dir, Node prints its endpoint to stderr.
+      const portFile = path.join(userDataDir, 'DevToolsActivePort');
+      fs.rmSync(portFile, { force: true });
+      const logOffset = fs.existsSync(target.logPath) ? fs.statSync(target.logPath).size : 0;
+      const child = spawnApp(
+        target,
+        ['--remote-debugging-port=0', '--inspect=0'],
+        [...args, '--log-level', 'debug'],
+      );
+      const stop = () => stopProcess(child);
+      teardown.push(stop);
+      const cdpPort = await waitUntil(
+        () => {
+          if (child.exitCode !== null) {
+            throw new Error(`SubMiner exited with code ${child.exitCode} during startup`);
+          }
+          return readDevToolsPort(portFile);
+        },
+        { description: 'SubMiner DevTools port', timeoutMs: 30_000 },
+      );
+      const inspectorUrl = await waitUntil(() => readInspectorUrl(target.logPath, logOffset), {
+        description: 'SubMiner main-process inspector endpoint',
+      });
+      return { child, cdpPort, inspectorUrl };
+    };
+
+    // First boot: import the fixture dictionary through Yomitan's settings page.
+    // Without one the tokenizer finds nothing and first-run setup takes over.
+    const seeder = await launchApp(['--yomitan']);
+    const settings = await openPage(seeder.cdpPort, YOMITAN_SETTINGS_PAGE);
+    await settings.waitFor('globalThis.__subminerYomitanSettingsAutomation?.ready === true', {
+      description: 'Yomitan settings automation bridge',
+    });
+    const archive = fs.readFileSync(dictionaryPath).toString('base64');
+    await settings.evaluate(
+      `globalThis.__subminerYomitanSettingsAutomation
+        .importDictionaryArchiveBase64(${JSON.stringify(archive)}, "fixture-dictionary.zip")
+        .then(() => true)`,
+    );
+    settings.close();
+    await stopProcess(seeder.child);
+
+    const mpvProcess = await startMpv({
+      socketPath: mpvSocketPath,
+      mediaPath,
+      subtitlePath,
+      logPath: path.join(root, 'mpv.log'),
+      display,
+    });
+    teardown.push(() => stopProcess(mpvProcess));
+    const mpv = await connectMpv(mpvSocketPath);
+    teardown.push(mpv.close);
+
+    const app = await launchApp(['--start']);
+    // mpv starts paused and the app resumes it once the overlay and tokenizer
+    // are ready, so that resume marks the end of startup.
+    await waitUntil(async () => (await mpv.command('get_property', 'pause')) === false, {
+      description: 'SubMiner to resume playback after overlay startup',
+      timeoutMs: 30_000,
+    });
+    // Hand scenarios a paused player. The app retries its resume for a moment,
+    // so keep pausing until the pause has held for longer than that retry window.
+    let pausedSince: number | null = null;
+    await waitUntil(
+      async () => {
+        if ((await mpv.command('get_property', 'pause')) !== true) {
+          pausedSince = null;
+          await mpv.command('set_property', 'pause', true);
+          return false;
+        }
+        pausedSince ??= Date.now();
+        return Date.now() - pausedSince >= 1_500;
+      },
+      { description: 'playback to stay paused after startup', timeoutMs: 40_000 },
+    );
+    const pages: CdpPage[] = [];
+    teardown.push(() => pages.forEach((page) => page.close()));
+
+    return {
+      root,
+      display: display.kind,
+      cdpPort: app.cdpPort,
+      inspectorUrl: app.inspectorUrl,
+      mpvSocketPath,
+      target,
+      mpv,
+      anki,
+      openPage: async (urlPart) => {
+        const page = await openPage(app.cdpPort, urlPart);
+        pages.push(page);
+        return page;
+      },
+      mainProcess: async () => {
+        const page = await connectCdp(app.inspectorUrl, 'main process');
+        pages.push(page);
+        return page;
+      },
+      runAppCommand: (...args) => runAppCommand(target, args),
+      dispose,
+    };
+  } catch (error) {
+    // Keep the logs: a failed startup is exactly when they are needed.
+    process.env.SUBMINER_E2E_KEEP = '1';
+    await dispose();
+    throw new Error(`E2E session failed to start (logs kept in ${root})`, { cause: error });
+  }
+}
@@ -0,0 +1,23 @@
+export type WaitOptions = {
+  description: string;
+  timeoutMs?: number;
+  intervalMs?: number;
+};
+
+export type Truthy<T> = Exclude<T, false | 0 | '' | null | undefined>;
+
+/** Polls `probe` until it returns a truthy value, then returns that value. */
+export async function waitUntil<T>(
+  probe: () => T | Promise<T>,
+  { description, timeoutMs = 15_000, intervalMs = 100 }: WaitOptions,
+): Promise<Truthy<T>> {
+  const deadline = Date.now() + timeoutMs;
+  for (;;) {
+    const value = await probe();
+    if (value) return value as Truthy<T>;
+    if (Date.now() >= deadline) {
+      throw new Error(`Timed out after ${timeoutMs}ms waiting for ${description}`);
+    }
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+  }
+}
@@ -0,0 +1,245 @@
+import assert from 'node:assert/strict';
+import test, { after } from 'node:test';
+import { connectCdpPage, listCdpTargets, type CdpPage } from './harness/cdp';
+import { FAKE_ANKI_DECK, FAKE_ANKI_MODEL } from './harness/fake-anki';
+import { FIXTURE_CUES } from './harness/fixtures';
+import { OVERLAY_PAGE, startE2eSession, type E2eSession } from './harness/session';
+import { waitUntil } from './harness/wait';
+
+type Started = { session: E2eSession; overlay: CdpPage };
+
+// Bun caps node:test hooks at 5s whatever their timeout option says, so the
+// session boots inside whichever test runs first and every test budgets for it.
+const TEST_TIMEOUT_MS = 120_000;
+let started: Promise<Started> | undefined;
+
+function useSession(): Promise<Started> {
+  started ??= (async () => {
+    const session = await startE2eSession();
+    try {
+      return { session, overlay: await session.openPage(OVERLAY_PAGE) };
+    } catch (error) {
+      await session.dispose();
+      throw error;
+    }
+  })();
+  return started;
+}
+
+after(async () => {
+  const running = await started?.catch(() => undefined);
+  await running?.session.dispose();
+});
+
+type RenderedToken = { surface: string; headword: string | null };
+
+// Parks playback inside a cue and waits for the overlay to show that line.
+async function showCue(cue: (typeof FIXTURE_CUES)[number]): Promise<RenderedToken[]> {
+  const { session, overlay } = await useSession();
+  await session.mpv.command('seek', cue.at, 'absolute+exact');
+  // One expression reads the line and its tokens together, so a re-render
+  // between two round trips cannot hand back a half-updated subtitle.
+  return overlay
+    .waitFor<RenderedToken[] | false>(
+      `(() => {
+      const root = document.getElementById('subtitleRoot');
+      const words = Array.from(root.querySelectorAll('.word'), (word) => ({
+        surface: word.textContent,
+        headword: word.getAttribute('data-headword'),
+      }));
+      return root.textContent === ${JSON.stringify(cue.text)} && words.length > 0 && words;
+    })()`,
+      { description: `overlay to render "${cue.text}" tokenized` },
+    )
+    .catch(async (error: unknown) => {
+      // Say what the overlay was showing, what main thinks the line is, and
+      // what the renderer logged, so a dropped update can be placed.
+      const state = await overlay.evaluate<string>(
+        `(async () => JSON.stringify({
+          visibility: document.visibilityState,
+          text: document.getElementById('subtitleRoot').textContent,
+          html: document.getElementById('subtitleRoot').innerHTML.slice(0, 200),
+          mainLine: (await window.electronAPI.getCurrentSubtitle())?.text,
+          errorToast: document.getElementById('overlayErrorToast')?.textContent,
+        }))()`,
+      );
+      // Diagnostics must not replace the cue failure if the inspector is gone too.
+      const windows = await session
+        .mainProcess()
+        .then((main) =>
+          main.evaluate<string>(
+            `JSON.stringify(process.mainModule.require('electron').BrowserWindow.getAllWindows().map((w) => ({
+              id: w.id,
+              title: w.getTitle(),
+              url: w.webContents.getURL().split('/').pop(),
+              visible: w.isVisible(),
+              loading: w.webContents.isLoading(),
+              documentLoaded: w.__subminerOverlayDocumentLoaded,
+              contentReady: w.__subminerOverlayContentReady,
+            })))`,
+          ),
+        )
+        .catch((inspectorError: unknown) => `unavailable (${String(inspectorError)})`);
+      const targets = (await listCdpTargets(session.cdpPort))
+        .filter((t) => t.type === 'page')
+        .map((t) => t.url.split('/').pop());
+      const log = overlay.console.slice(-20).join('\n');
+      throw new Error(
+        `Overlay state: ${state}\nMain windows: ${windows}\nPage targets: ${JSON.stringify(targets)}\nRenderer console:\n${log}`,
+        { cause: error },
+      );
+    });
+}
+
+function hasToken(tokens: RenderedToken[], surface: string, headword: string): boolean {
+  return tokens.some((token) => token.surface === surface && token.headword === headword);
+}
+
+test(
+  'overlay renders the current mpv subtitle line as dictionary tokens',
+  { timeout: TEST_TIMEOUT_MS },
+  async () => {
+    const tokens = await showCue(FIXTURE_CUES[0]);
+
+    assert.ok(hasToken(tokens, '今日', '今日'), JSON.stringify(tokens));
+    assert.ok(hasToken(tokens, '天気', '天気'), JSON.stringify(tokens));
+  },
+);
+
+test(
+  'seeking to another cue replaces the line and deinflects verbs to their headword',
+  { timeout: TEST_TIMEOUT_MS },
+  async () => {
+    const tokens = await showCue(FIXTURE_CUES[2]);
+
+    assert.ok(hasToken(tokens, '行きます', '行く'), JSON.stringify(tokens));
+  },
+);
+
+test(
+  'mining a sentence card sends the line with generated audio and image to Anki',
+  { timeout: TEST_TIMEOUT_MS },
+  async () => {
+    const { session } = await useSession();
+    const cue = FIXTURE_CUES[1];
+    await showCue(cue);
+    session.anki.requests.length = 0;
+
+    await session.runAppCommand('--mine-sentence');
+    const update = await waitUntil(
+      () => session.anki.requests.find((request) => request.action === 'updateNoteFields'),
+      { description: 'media fields to be written to the mined note', timeoutMs: 30_000 },
+    );
+
+    const added = session.anki.requests.filter((request) => request.action === 'addNote');
+    assert.equal(added.length, 1);
+    assert.partialDeepStrictEqual(added[0]?.params.note, {
+      deckName: FAKE_ANKI_DECK,
+      modelName: FAKE_ANKI_MODEL,
+      fields: { Sentence: cue.text },
+    });
+
+    const stored = session.anki.requests
+      .filter((request) => request.action === 'storeMediaFile')
+      .map((request) => String(request.params.filename));
+    assert.ok(
+      stored.some((name) => name.endsWith('.mp3')),
+      `no audio in ${stored.join(', ')}`,
+    );
+    assert.ok(
+      stored.some((name) => name.endsWith('.jpg')),
+      `no image in ${stored.join(', ')}`,
+    );
+
+    const updatedFields = JSON.stringify(update.params);
+    for (const filename of stored) assert.ok(updatedFields.includes(filename), filename);
+  },
+);
+
+test(
+  'open subtitle sidebar lists the parsed cues and follows playback',
+  { timeout: TEST_TIMEOUT_MS },
+  async () => {
+    const { session, overlay } = await useSession();
+    await showCue(FIXTURE_CUES[0]);
+    await session.runAppCommand('--toggle-subtitle-sidebar');
+    await overlay.waitFor(
+      `document.querySelectorAll('#subtitleSidebarList .subtitle-sidebar-item').length === ${FIXTURE_CUES.length}`,
+      { description: 'sidebar to list every fixture cue' },
+    );
+
+    for (const [index, cue] of FIXTURE_CUES.entries()) {
+      await session.mpv.command('seek', cue.at, 'absolute+exact');
+      await overlay.waitFor(
+        `document.querySelector('#subtitleSidebarList .subtitle-sidebar-item.active')?.dataset.index === '${index}'`,
+        { description: `sidebar to highlight cue ${index}` },
+      );
+    }
+
+    await session.runAppCommand('--toggle-subtitle-sidebar');
+    await overlay.waitFor(
+      `document.getElementById('subtitleSidebarModal').classList.contains('hidden')`,
+      { description: 'sidebar to close' },
+    );
+  },
+);
+
+// Runs last: it leaves the lookup popup open over the overlay.
+test(
+  'holding Shift over a word opens the Yomitan popup with its dictionary entry',
+  { timeout: TEST_TIMEOUT_MS },
+  async () => {
+    const { session, overlay } = await useSession();
+    await showCue(FIXTURE_CUES[0]);
+    const word = await overlay.evaluate<{ x: number; y: number }>(
+      `(() => {
+        const words = Array.from(document.querySelectorAll('#subtitleRoot .word'));
+        const box = words.find((word) => word.textContent === '天気').getBoundingClientRect();
+        return { x: box.x + box.width / 2, y: box.y + box.height / 2 };
+      })()`,
+    );
+
+    // Yomitan's default scan modifier is Shift, and it scans on mouse movement,
+    // so approach the word, hold Shift, then move across it.
+    const shift = { key: 'Shift', code: 'ShiftLeft', windowsVirtualKeyCode: 16 };
+    const move = (x: number, modifiers = 0) =>
+      overlay.send('Input.dispatchMouseEvent', { type: 'mouseMoved', x, y: word.y, modifiers });
+    await move(word.x - 30);
+    await overlay.send('Input.dispatchKeyEvent', { type: 'rawKeyDown', ...shift, modifiers: 8 });
+    await move(word.x - 2, 8);
+    await move(word.x, 8);
+
+    await overlay.waitFor(
+      `document.querySelector('[data-subminer-yomitan-popup-visible="true"]') !== null`,
+      { description: 'overlay to mark the Yomitan popup visible' },
+    );
+    // Yomitan keeps more than one popup frame around, so read whichever
+    // one holds the entry instead of trusting target order.
+    let seen: string[] = [];
+    const entry = await waitUntil(
+      async () => {
+        const targets = (await listCdpTargets(session.cdpPort)).filter((target) =>
+          target.url.includes('popup.html'),
+        );
+        seen = [];
+        for (const target of targets) {
+          // A frame can go away between listing and connecting; skip it.
+          const frame = await connectCdpPage(target).catch(() => undefined);
+          if (!frame) continue;
+          // textContent, not innerText: the entry counts once it is in the DOM,
+          // even where a GPU-less runner never lays the frame out.
+          const text = await frame.evaluate<string>('document.body?.textContent ?? ""');
+          frame.close();
+          seen.push(text);
+        }
+        return seen.find((text) => text.includes('weather'));
+      },
+      { description: 'a popup frame to show the fixture dictionary entry' },
+    ).catch((error: unknown) => {
+      const summary = seen.map((text) => text.replace(/\s+/g, ' ').trim().slice(0, 200));
+      throw new Error(`Popup frames held: ${JSON.stringify(summary)}`, { cause: error });
+    });
+    await overlay.send('Input.dispatchKeyEvent', { type: 'keyUp', ...shift });
+    assert.match(entry, /天気/);
+  },
+);
@@ -150,74 +150,7 @@ test('doctor command exits non-zero for missing hard dependencies', () => {
  );
 });

-test('doctor command forwards refresh-known-words to app binary', () => {
-  const context = createContext();
-  context.args.doctor = true;
-  context.args.doctorRefreshKnownWords = true;
-  const forwarded: string[][] = [];
-
-  const handled = runDoctorCommand(context, {
-    commandExists: () => false,
-    configExists: () => true,
-    resolveMainConfigPath: () => '/tmp/SubMiner/config.jsonc',
-    runAppCommandWithInherit: (_appPath, appArgs) => {
-      forwarded.push(appArgs);
-    },
-  });
-
-  assert.equal(handled, true);
-  assert.deepEqual(forwarded, [['--refresh-known-words']]);
-});
-
-test('logs command exports logs and writes archive path', () => {
-  const writes: string[] = [];
-  const context = createContext();
-  context.args.logsExport = true;
-  context.processAdapter = {
-    ...context.processAdapter,
-    writeStdout: (text) => writes.push(text),
-  };
-
-  const handled = runLogsCommand(context, {
-    exportLogsArchive: () => ({
-      zipPath: '/tmp/subminer-logs.zip',
-      exportedFiles: ['/tmp/app.log'],
-      mode: 'current-day',
-    }),
-  });
-
-  assert.equal(handled, true);
-  assert.deepEqual(writes, ['/tmp/subminer-logs.zip\n']);
-});
-
-test('logs command ignores unrelated launcher commands', () => {
-  const context = createContext();
-
-  assert.equal(runLogsCommand(context), false);
-});
-
-test('app command starts default macOS background app detached from launcher', () => {
-  const context = createContext();
-  context.args.appPassthrough = true;
-  context.args.appArgs = [];
-  const calls: string[] = [];
-
-  const handled = runAppPassthroughCommand(context, {
-    runAppCommandWithInherit: () => {
-      calls.push('attached');
-    },
-    launchSyncUiDetached: () => calls.push('sync-ui'),
-    launchYoutubeBrowserDetached: () => calls.push('youtube'),
-    launchAppBackgroundDetached: (appPath, logLevel) => {
-      calls.push(`detached:${appPath}:${logLevel}`);
-    },
-  });
-
-  assert.equal(handled, true);
-  assert.deepEqual(calls, ['detached:/tmp/subminer.app:warn']);
-});
-
-test('app command starts default Linux background app detached from launcher', () => {
+test('app command starts default background app detached from launcher app detached from launcher', () => {
  const context = createContext();
  context.args.appPassthrough = true;
  context.args.appArgs = [];
@@ -389,49 +322,6 @@ test('dictionary command forwards candidate and selection modes to app binary',
  ]);
 });

-test('dictionary command returns after app handoff starts', () => {
-  const context = createContext();
-  context.args.dictionary = true;
-
-  const handled = runDictionaryCommand(context, {
-    runAppCommandWithInherit: () => undefined,
-  });
-
-  assert.equal(handled, true);
-});
-
-test('update command runs direct Linux release update without launching Electron', async () => {
-  const context = createContext();
-  context.args.update = true;
-  const calls: string[] = [];
-
-  const handled = await runUpdateCommand(context, {
-    runAppCommandCaptureOutput: () => {
-      throw new Error('unexpected Electron launch');
-    },
-    runDirectReleaseUpdate: async (request) => {
-      calls.push(`direct:${request.appPath}:${request.launcherPath}:${request.channel}`);
-      return {
-        appImage: { status: 'not-found' },
-        launcher: { status: 'updated' },
-        supportAssets: [{ status: 'skipped' }],
-      };
-    },
-    readMainConfig: () => null,
-    log: (level, _configured, message) => {
-      calls.push(`${level}:${message}`);
-    },
-  });
-
-  assert.equal(handled, true);
-  assert.deepEqual(calls, [
-    'direct:/tmp/subminer.app:/tmp/subminer:stable',
-    'info:AppImage update: not-found',
-    'info:Launcher update: updated',
-    'info:Support assets update: skipped',
-  ]);
-});
-
 test('stats command launches attached app command with response path', async () => {
  const harness = createStatsTestHarness({ stats: true, logLevel: 'debug' });
  const handled = await runStatsCommand(harness.context, harness.commandDeps);
@@ -449,16 +339,41 @@ test('stats command launches attached app command with response path', async ()
  assert.equal(harness.removedPaths.length, 1);
 });

-test('stats background command launches attached daemon control command with response path', async () => {
-  const harness = createStatsTestHarness({ stats: true, statsBackground: true });
-  const handled = await runStatsCommand(harness.context, harness.commandDeps);
+const STATS_RESPONSE_ARGS = ['--stats-response-path', '/tmp/subminer-stats-test/response.json'];

-  assert.equal(handled, true);
-  assert.deepEqual(harness.forwarded, [
-    ['--stats-daemon-start', '--stats-response-path', '/tmp/subminer-stats-test/response.json'],
-  ]);
-  assert.equal(harness.removedPaths.length, 1);
-});
+const statsForwardingCases = [
+  {
+    name: 'stats background command launches the daemon start command',
+    overrides: { statsBackground: true },
+    expected: ['--stats-daemon-start', ...STATS_RESPONSE_ARGS],
+  },
+  {
+    name: 'stats stop command forwards the daemon stop flag',
+    overrides: { statsStop: true },
+    expected: ['--stats-daemon-stop', ...STATS_RESPONSE_ARGS],
+  },
+  {
+    name: 'stats cleanup command forwards cleanup vocab flags',
+    overrides: { statsCleanup: true, statsCleanupVocab: true },
+    expected: ['--stats', ...STATS_RESPONSE_ARGS, '--stats-cleanup', '--stats-cleanup-vocab'],
+  },
+  {
+    name: 'stats cleanup command forwards the lifetime rebuild flag',
+    overrides: { statsCleanup: true, statsCleanupLifetime: true },
+    expected: ['--stats', ...STATS_RESPONSE_ARGS, '--stats-cleanup', '--stats-cleanup-lifetime'],
+  },
+];
+
+for (const c of statsForwardingCases) {
+  test(`${c.name} to the app`, async () => {
+    const harness = createStatsTestHarness({ stats: true, ...c.overrides });
+    const handled = await runStatsCommand(harness.context, harness.commandDeps);
+
+    assert.equal(handled, true);
+    assert.deepEqual(harness.forwarded, [c.expected]);
+    assert.equal(harness.removedPaths.length, 1);
+  });
+}

 test('stats command waits for attached app exit after startup response', async () => {
  const harness = createStatsTestHarness({ stats: true });
@@ -503,45 +418,6 @@ test('stats command throws when attached app exits non-zero after startup respon
  assert.equal(harness.removedPaths.length, 1);
 });

-test('stats cleanup command forwards cleanup vocab flags to the app', async () => {
-  const harness = createStatsTestHarness({
-    stats: true,
-    statsCleanup: true,
-    statsCleanupVocab: true,
-  });
-  const handled = await runStatsCommand(harness.context, {
-    ...harness.commandDeps,
-    waitForStatsResponse: async () => ({ ok: true }),
-  });
-
-  assert.equal(handled, true);
-  assert.deepEqual(harness.forwarded, [
-    [
-      '--stats',
-      '--stats-response-path',
-      '/tmp/subminer-stats-test/response.json',
-      '--stats-cleanup',
-      '--stats-cleanup-vocab',
-    ],
-  ]);
-  assert.equal(harness.removedPaths.length, 1);
-});
-
-test('stats stop command forwards stop flag to the app', async () => {
-  const harness = createStatsTestHarness({ stats: true, statsStop: true });
-
-  const handled = await runStatsCommand(harness.context, {
-    ...harness.commandDeps,
-    waitForStatsResponse: async () => ({ ok: true }),
-  });
-
-  assert.equal(handled, true);
-  assert.deepEqual(harness.forwarded, [
-    ['--stats-daemon-stop', '--stats-response-path', '/tmp/subminer-stats-test/response.json'],
-  ]);
-  assert.equal(harness.removedPaths.length, 1);
-});
-
 test('stats stop command exits on process exit without waiting for startup response', async () => {
  const harness = createStatsTestHarness({ stats: true, statsStop: true });
  let waitedForResponse = false;
@@ -563,30 +439,6 @@ test('stats stop command exits on process exit without waiting for startup respo
  assert.equal(harness.removedPaths.length, 1);
 });

-test('stats cleanup command forwards lifetime rebuild flag to the app', async () => {
-  const harness = createStatsTestHarness({
-    stats: true,
-    statsCleanup: true,
-    statsCleanupLifetime: true,
-  });
-  const handled = await runStatsCommand(harness.context, {
-    ...harness.commandDeps,
-    waitForStatsResponse: async () => ({ ok: true }),
-  });
-
-  assert.equal(handled, true);
-  assert.deepEqual(harness.forwarded, [
-    [
-      '--stats',
-      '--stats-response-path',
-      '/tmp/subminer-stats-test/response.json',
-      '--stats-cleanup',
-      '--stats-cleanup-lifetime',
-    ],
-  ]);
-  assert.equal(harness.removedPaths.length, 1);
-});
-
 test('stats command throws when stats response reports an error', async () => {
  const harness = createStatsTestHarness({ stats: true });

@@ -692,36 +544,3 @@ test('stats command aborts pending response wait when attached app fails to spaw
  assert.equal(aborted, true);
  assert.equal(harness.removedPaths.length, 1);
 });
-
-test('stats cleanup command aborts pending response wait when app exits before startup response', async () => {
-  const harness = createStatsTestHarness({
-    stats: true,
-    statsCleanup: true,
-    statsCleanupVocab: true,
-  });
-  let aborted = false;
-
-  await assert.rejects(async () => {
-    await runStatsCommand(harness.context, {
-      ...harness.commandDeps,
-      runAppCommandAttached: async (...args) => {
-        await harness.runAppCommandAttachedStub(...args);
-        return 2;
-      },
-      waitForStatsResponse: async (_responsePath, signal) =>
-        await new Promise((resolve) => {
-          signal?.addEventListener(
-            'abort',
-            () => {
-              aborted = true;
-              resolve({ ok: false, error: 'aborted' });
-            },
-            { once: true },
-          );
-        }),
-    });
-  }, /Stats app exited before startup response \(status 2\)\./);
-
-  assert.equal(aborted, true);
-  assert.equal(harness.removedPaths.length, 1);
-});
@@ -4,81 +4,53 @@ import { EventEmitter } from 'node:events';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import type { Args } from '../types.js';
 import type { LauncherCommandContext } from './context.js';
 import { registerCleanup, runPlaybackCommandWithDeps } from './playback-command.js';
-import { state } from '../mpv.js';
+import { state, type startMpv } from '../mpv.js';
+import { makeLauncherArgs } from '../test-support/args.js';
+import { withEnv } from '../test-support/env.js';

-function createContext(): LauncherCommandContext {
+type PlaybackDeps = Parameters<typeof runPlaybackCommandWithDeps>[1];
+type StartMpvOptions = NonNullable<Parameters<typeof startMpv>[6]>;
+
+const YOUTUBE_URL = 'https://www.youtube.com/watch?v=65Ovd7t8sNw';
+
+function makePluginConfig(
+  overrides: Partial<LauncherCommandContext['pluginRuntimeConfig']> = {},
+): LauncherCommandContext['pluginRuntimeConfig'] {
  return {
-    args: {
-      backend: 'auto',
-      directory: '.',
-      recursive: false,
-      profile: '',
-      startOverlay: false,
-      youtubePrimarySubLangs: [],
-      youtubeSecondarySubLangs: [],
-      youtubeAudioLangs: [],
-      useTexthooker: false,
-      autoStartOverlay: false,
-      texthookerOnly: false,
-      texthookerOpenBrowser: false,
-      useRofi: false,
-      history: false,
-      sync: false,
-      syncCliTokens: [],
-      syncUi: false,
-      logLevel: 'info',
-      logRotation: 7,
-      passwordStore: '',
-      target: 'https://www.youtube.com/watch?v=65Ovd7t8sNw',
+    socketPath: '/tmp/subminer.sock',
+    binaryPath: '',
+    backend: 'auto',
+    autoStart: true,
+    autoStartVisibleOverlay: true,
+    autoStartPauseUntilReady: true,
+    osdMessages: false,
+    texthookerEnabled: false,
+    ...overrides,
+  };
+}
+
+/** A context for a YouTube URL target with logging at info and CLI texthooker off. */
+function createContext(
+  options: {
+    args?: Partial<Args>;
+    plugin?: Partial<LauncherCommandContext['pluginRuntimeConfig']>;
+  } = {},
+): LauncherCommandContext {
+  return {
+    args: makeLauncherArgs({
+      target: YOUTUBE_URL,
      targetKind: 'url',
-      jimakuApiKey: '',
-      jimakuApiKeyCommand: '',
-      jimakuApiBaseUrl: '',
-      jimakuLanguagePreference: 'ja',
-      jimakuMaxEntryResults: 20,
-      jellyfin: false,
-      jellyfinLogin: false,
-      jellyfinLogout: false,
-      jellyfinPlay: false,
-      jellyfinDiscovery: false,
-      dictionary: false,
-      dictionaryCandidates: false,
-      dictionarySelect: false,
-      stats: false,
-      doctor: false,
-      doctorRefreshKnownWords: false,
-      logsExport: false,
-      version: false,
-      settings: false,
-      youtubeBrowser: false,
-      configPath: false,
-      configShow: false,
-      mpvIdle: false,
-      mpvSocket: false,
-      mpvStatus: false,
-      mpvArgs: '',
-      appPassthrough: false,
-      appArgs: [],
-      jellyfinServer: '',
-      jellyfinUsername: '',
-      jellyfinPassword: '',
-      launchMode: 'normal',
-    },
+      logLevel: 'info',
+      useTexthooker: false,
+      ...options.args,
+    }),
    scriptPath: '/tmp/subminer',
    scriptName: 'subminer',
    mpvSocketPath: '/tmp/subminer.sock',
-    pluginRuntimeConfig: {
-      socketPath: '/tmp/subminer.sock',
-      binaryPath: '',
-      backend: 'auto',
-      autoStart: true,
-      autoStartVisibleOverlay: true,
-      autoStartPauseUntilReady: true,
-      osdMessages: false,
-      texthookerEnabled: false,
-    },
+    pluginRuntimeConfig: makePluginConfig(options.plugin),
    appPath: '/tmp/SubMiner.AppImage',
    launcherJellyfinConfig: {},
    processAdapter: {
@@ -93,8 +65,70 @@ function createContext(): LauncherCommandContext {
  };
 }

+const FILE_TARGET = { target: '/tmp/movie.mkv', targetKind: 'file' } as const;
+
+/**
+ * Playback harness. Deps are inert by default and record what the tests assert on: the
+ * options mpv was started with, the overlay launches, and an `events` log for the few cases
+ * where relative order is the behavior.
+ */
+function makeHarness(
+  options: {
+    context?: LauncherCommandContext;
+    deps?: Partial<PlaybackDeps>;
+    events?: string[];
+  } = {},
+) {
+  const context = options.context ?? createContext();
+  const events = options.events ?? [];
+  const startMpvOptions: StartMpvOptions[] = [];
+  const overlayCalls: Array<{ extraAppArgs: string[]; configDir?: string }> = [];
+  const deps: PlaybackDeps = {
+    ensurePlaybackSetupReady: async () => {},
+    ensureRuntimePluginReady: async () => {
+      events.push('plugin');
+    },
+    chooseTarget: async () => ({
+      target: context.args.target,
+      kind: context.args.targetKind === 'file' ? 'file' : 'url',
+    }),
+    checkDependencies: () => {},
+    registerCleanup: () => {},
+    startMpv: async (_target, _kind, _args, _socket, _appPath, _subtitles, startOptions) => {
+      events.push('startMpv');
+      if (startOptions) startMpvOptions.push(startOptions);
+    },
+    waitForUnixSocketReady: async () => true,
+    startOverlay: async (_appPath, _args, _socket, extraAppArgs = [], configDir) => {
+      events.push('startOverlay');
+      overlayCalls.push({ extraAppArgs, configDir });
+    },
+    launchAppCommandDetached: () => {},
+    log: () => {},
+    cleanupPlaybackSession: async () => {},
+    getMpvProc: () => null,
+    ...options.deps,
+  };
+  return {
+    context,
+    events,
+    startMpvOptions,
+    overlayCalls,
+    run: () => runPlaybackCommandWithDeps(context, deps),
+  };
+}
+
+function assertRanInOrder(events: string[], ...expected: string[]): void {
+  const positions = expected.map((event) => events.indexOf(event));
+  assert.ok(
+    positions.every(
+      (position, index) => position >= 0 && (index === 0 || position > positions[index - 1]!),
+    ),
+    `expected ${expected.join(' -> ')} in order, got ${events.join(', ')}`,
+  );
+}
+
 test('playback cleanup signal handlers are registered once across repeated sessions', () => {
-  assert.equal(typeof registerCleanup, 'function', 'cleanup registration is not exported');
  const context = createContext();
  const registeredSignals: NodeJS.Signals[] = [];
  context.processAdapter.onSignal = (signal) => {
@@ -108,121 +142,41 @@ test('playback cleanup signal handlers are registered once across repeated sessi
 });

 test('youtube playback launches overlay with app-owned youtube flow args', async () => {
-  const calls: string[] = [];
-  const context = createContext();
-  context.pluginRuntimeConfig = {
-    ...context.pluginRuntimeConfig,
-    autoStart: false,
-    autoStartVisibleOverlay: false,
-    autoStartPauseUntilReady: false,
-  };
-  const receivedStartMpvOptions: Record<string, unknown>[] = [];
-
-  await runPlaybackCommandWithDeps(context, {
-    ensurePlaybackSetupReady: async () => {},
-    ensureRuntimePluginReady: async () => {},
-    chooseTarget: async (_args, _scriptPath) => ({ target: context.args.target, kind: 'url' }),
-    checkDependencies: () => {},
-    registerCleanup: () => {},
-    startMpv: async (
-      _target,
-      _targetKind,
-      _args,
-      _socketPath,
-      _appPath,
-      _preloadedSubtitles,
-      options,
-    ) => {
-      if (options) {
-        receivedStartMpvOptions.push(options as Record<string, unknown>);
-      }
-      calls.push('startMpv');
-    },
-    waitForUnixSocketReady: async () => true,
-    startOverlay: async (_appPath, _args, _socketPath, extraAppArgs = []) => {
-      calls.push(`startOverlay:${extraAppArgs.join(' ')}`);
-    },
-    launchAppCommandDetached: (_appPath: string, appArgs: string[]) => {
-      calls.push(`launch:${appArgs.join(' ')}`);
-    },
-    log: () => {},
-    cleanupPlaybackSession: async () => {},
-    getMpvProc: () => null,
+  const harness = makeHarness({
+    context: createContext({
+      plugin: {
+        autoStart: false,
+        autoStartVisibleOverlay: false,
+        autoStartPauseUntilReady: false,
+      },
+    }),
  });

-  assert.deepEqual(calls, [
-    'startMpv',
-    'startOverlay:--youtube-play https://www.youtube.com/watch?v=65Ovd7t8sNw',
-  ]);
-  assert.equal(receivedStartMpvOptions[0]?.startPaused, true);
-  assert.equal(receivedStartMpvOptions[0]?.disableYoutubeSubtitleAutoLoad, true);
+  await harness.run();
+
+  assertRanInOrder(harness.events, 'startMpv', 'startOverlay');
+  assert.deepEqual(harness.overlayCalls[0]?.extraAppArgs, ['--youtube-play', YOUTUBE_URL]);
+  assert.equal(harness.startMpvOptions[0]?.startPaused, true);
+  assert.equal(harness.startMpvOptions[0]?.disableYoutubeSubtitleAutoLoad, true);
 });

 test('youtube app-owned playback disables mpv plugin auto-start', async () => {
-  const context = createContext();
-  context.pluginRuntimeConfig = {
-    ...context.pluginRuntimeConfig,
-    autoStart: true,
-    autoStartVisibleOverlay: true,
-    autoStartPauseUntilReady: true,
-  };
-  const receivedStartMpvOptions: Record<string, unknown>[] = [];
+  const harness = makeHarness();

-  await runPlaybackCommandWithDeps(context, {
-    ensurePlaybackSetupReady: async () => {},
-    ensureRuntimePluginReady: async () => {},
-    chooseTarget: async () => ({ target: context.args.target, kind: 'url' }),
-    checkDependencies: () => {},
-    registerCleanup: () => {},
-    startMpv: async (
-      _target,
-      _targetKind,
-      _args,
-      _socketPath,
-      _appPath,
-      _preloadedSubtitles,
-      options,
-    ) => {
-      if (options) {
-        receivedStartMpvOptions.push(options as Record<string, unknown>);
-      }
-    },
-    waitForUnixSocketReady: async () => true,
-    startOverlay: async () => {},
-    launchAppCommandDetached: () => {},
-    log: () => {},
-    cleanupPlaybackSession: async () => {},
-    getMpvProc: () => null,
-  });
+  await harness.run();

-  const runtimeConfig = receivedStartMpvOptions[0]?.runtimePluginConfig as
-    | { autoStart?: boolean; autoStartVisibleOverlay?: boolean; autoStartPauseUntilReady?: boolean }
-    | undefined;
+  const runtimeConfig = harness.startMpvOptions[0]?.runtimePluginConfig;
  assert.equal(runtimeConfig?.autoStart, false);
  assert.equal(runtimeConfig?.autoStartVisibleOverlay, false);
  assert.equal(runtimeConfig?.autoStartPauseUntilReady, false);
 });

 test('plugin auto-start playback leaves app lifetime to managed-playback owner', async () => {
-  const context = createContext();
-  context.args = {
-    ...context.args,
-    target: '/tmp/movie.mkv',
-    targetKind: 'file',
-    useTexthooker: true,
-  };
-  context.pluginRuntimeConfig = {
-    socketPath: '/tmp/subminer.sock',
-    binaryPath: '',
-    backend: 'auto',
-    autoStart: true,
-    autoStartVisibleOverlay: false,
-    autoStartPauseUntilReady: false,
-    osdMessages: false,
-    texthookerEnabled: false,
-  };
-  const appPath = context.appPath ?? '';
-  state.appPath = appPath;
+  const context = createContext({
+    args: { ...FILE_TARGET, useTexthooker: true },
+    plugin: { autoStartVisibleOverlay: false, autoStartPauseUntilReady: false },
+  });
+  state.appPath = context.appPath ?? '';
  state.overlayManagedByLauncher = false;
  const mpvProc = new EventEmitter() as EventEmitter & {
    exitCode: number | null;
@@ -233,31 +187,27 @@ test('plugin auto-start playback leaves app lifetime to managed-playback owner',
  mpvProc.killed = false;
  mpvProc.kill = () => true;
  let cleanupSawManagedOverlay = true;
-
-  try {
-    await runPlaybackCommandWithDeps(context, {
-      ensurePlaybackSetupReady: async () => {},
-      ensureRuntimePluginReady: async () => {},
-      chooseTarget: async () => ({ target: context.args.target, kind: 'file' }),
-      checkDependencies: () => {},
-      registerCleanup: () => {},
+  const harness = makeHarness({
+    context,
+    deps: {
      startMpv: async () => {
        setTimeout(() => {
          mpvProc.exitCode = 0;
          mpvProc.emit('exit', 0);
        }, 5);
      },
-      waitForUnixSocketReady: async () => true,
      startOverlay: async () => {
        throw new Error('startOverlay should not run when plugin auto-start is used');
      },
-      launchAppCommandDetached: () => {},
-      log: () => {},
      cleanupPlaybackSession: async () => {
        cleanupSawManagedOverlay = state.overlayManagedByLauncher;
      },
      getMpvProc: () => mpvProc as NonNullable<typeof state.mpvProc>,
-    });
+    },
+  });
+
+  try {
+    await harness.run();

    assert.equal(cleanupSawManagedOverlay, false);
  } finally {
@@ -267,258 +217,89 @@ test('plugin auto-start playback leaves app lifetime to managed-playback owner',
 });

 test('plugin auto-start playback attaches a warm background app through the launcher', async () => {
-  const context = createContext();
-  context.args = {
-    ...context.args,
-    target: '/tmp/movie.mkv',
-    targetKind: 'file',
-    useTexthooker: true,
-  };
-  context.pluginRuntimeConfig = {
-    socketPath: '/tmp/subminer.sock',
-    binaryPath: '',
-    backend: 'auto',
-    autoStart: true,
-    autoStartVisibleOverlay: true,
-    autoStartPauseUntilReady: true,
-    osdMessages: false,
-    texthookerEnabled: true,
-  };
-  const calls: string[] = [];
-  const receivedStartMpvOptions: Record<string, unknown>[] = [];
-
-  await runPlaybackCommandWithDeps(context, {
-    ensurePlaybackSetupReady: async () => {},
-    ensureRuntimePluginReady: async () => {},
-    chooseTarget: async () => ({ target: context.args.target, kind: 'file' }),
-    checkDependencies: () => {},
-    registerCleanup: () => {},
-    startMpv: async (
-      _target,
-      _targetKind,
-      _args,
-      _socketPath,
-      _appPath,
-      _preloadedSubtitles,
-      options,
-    ) => {
-      calls.push('startMpv');
-      if (options) {
-        receivedStartMpvOptions.push(options as Record<string, unknown>);
-      }
-    },
-    waitForUnixSocketReady: async () => true,
-    startOverlay: async (_appPath, _args, _socketPath, extraAppArgs = []) => {
-      calls.push(`startOverlay:${extraAppArgs.join(' ')}`);
-    },
-    launchAppCommandDetached: () => {},
-    log: () => {},
-    cleanupPlaybackSession: async () => {},
-    getMpvProc: () => null,
-    isAppControlServerAvailable: async () => true,
-  } as Parameters<typeof runPlaybackCommandWithDeps>[1] & {
-    isAppControlServerAvailable: () => Promise<boolean>;
+  const harness = makeHarness({
+    context: createContext({
+      args: { ...FILE_TARGET, useTexthooker: true },
+      plugin: { texthookerEnabled: true },
+    }),
+    deps: { isAppControlServerAvailable: async () => true },
  });

-  assert.deepEqual(calls, ['startMpv', 'startOverlay:--show-visible-overlay --texthooker']);
-  assert.equal(receivedStartMpvOptions[0]?.startPaused, true);
-  assert.equal(
-    (receivedStartMpvOptions[0]?.runtimePluginConfig as { autoStart?: boolean } | undefined)
-      ?.autoStart,
-    false,
-  );
+  await harness.run();
+
+  assertRanInOrder(harness.events, 'startMpv', 'startOverlay');
+  assert.deepEqual(harness.overlayCalls[0]?.extraAppArgs, [
+    '--show-visible-overlay',
+    '--texthooker',
+  ]);
+  assert.equal(harness.startMpvOptions[0]?.startPaused, true);
+  assert.equal(harness.startMpvOptions[0]?.runtimePluginConfig?.autoStart, false);
 });

 test('plugin auto-start attach mode reuses launcher-resolved config dir for app control', async () => {
-  const context = createContext();
-  const originalXdgConfigHome = process.env.XDG_CONFIG_HOME;
-  const originalAppData = process.env.APPDATA;
  const xdgConfigHome = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-test-xdg-'));
  const expectedConfigDir = path.join(xdgConfigHome, 'SubMiner');
  fs.mkdirSync(expectedConfigDir, { recursive: true });
  fs.writeFileSync(path.join(expectedConfigDir, 'config.jsonc'), '{}');
-  context.args = {
-    ...context.args,
-    target: '/tmp/movie.mkv',
-    targetKind: 'file',
-    useTexthooker: true,
-  };
-  context.pluginRuntimeConfig = {
-    socketPath: '/tmp/subminer.sock',
-    binaryPath: '',
-    backend: 'auto',
-    autoStart: true,
-    autoStartVisibleOverlay: true,
-    autoStartPauseUntilReady: true,
-    osdMessages: false,
-    texthookerEnabled: true,
-  };
  let availabilityConfigDir: string | undefined;
-  let overlayConfigDir: string | undefined;
-  let overlayLoadingOsd: boolean | undefined;
-
-  try {
-    process.env.XDG_CONFIG_HOME = xdgConfigHome;
-    process.env.APPDATA = xdgConfigHome;
-
-    await runPlaybackCommandWithDeps(context, {
-      ensurePlaybackSetupReady: async () => {},
-      ensureRuntimePluginReady: async () => {},
-      chooseTarget: async () => ({ target: context.args.target, kind: 'file' }),
-      checkDependencies: () => {},
-      registerCleanup: () => {},
-      startMpv: async (
-        _target,
-        _targetKind,
-        _args,
-        _socketPath,
-        _appPath,
-        _preloadedSubtitles,
-        options,
-      ) => {
-        overlayLoadingOsd = (
-          options?.runtimePluginConfig as { overlayLoadingOsd?: boolean } | undefined
-        )?.overlayLoadingOsd;
-      },
-      waitForUnixSocketReady: async () => true,
-      startOverlay: async (_appPath, _args, _socketPath, _extraAppArgs = [], configDir) => {
-        overlayConfigDir = configDir;
-      },
-      launchAppCommandDetached: () => {},
-      log: () => {},
-      cleanupPlaybackSession: async () => {},
-      getMpvProc: () => null,
+  const harness = makeHarness({
+    context: createContext({
+      args: { ...FILE_TARGET, useTexthooker: true },
+      plugin: { texthookerEnabled: true },
+    }),
+    deps: {
      isAppControlServerAvailable: async (_logLevel, configDir) => {
        availabilityConfigDir = configDir;
        return true;
      },
-    });
+    },
+  });
+
+  try {
+    await withEnv({ XDG_CONFIG_HOME: xdgConfigHome, APPDATA: xdgConfigHome }, () => harness.run());

    assert.equal(availabilityConfigDir, expectedConfigDir);
-    assert.equal(overlayConfigDir, expectedConfigDir);
-    assert.equal(overlayLoadingOsd, true);
+    assert.equal(harness.overlayCalls[0]?.configDir, expectedConfigDir);
+    assert.equal(harness.startMpvOptions[0]?.runtimePluginConfig?.overlayLoadingOsd, true);
  } finally {
-    if (originalXdgConfigHome === undefined) {
-      delete process.env.XDG_CONFIG_HOME;
-    } else {
-      process.env.XDG_CONFIG_HOME = originalXdgConfigHome;
-    }
-    if (originalAppData === undefined) {
-      delete process.env.APPDATA;
-    } else {
-      process.env.APPDATA = originalAppData;
-    }
    fs.rmSync(xdgConfigHome, { recursive: true, force: true });
  }
 });

 test('plugin auto-start attach mode omits texthooker flag when CLI texthooker is disabled', async () => {
-  const context = createContext();
-  context.args = {
-    ...context.args,
-    target: '/tmp/movie.mkv',
-    targetKind: 'file',
-  };
-  context.pluginRuntimeConfig = {
-    socketPath: '/tmp/subminer.sock',
-    binaryPath: '',
-    backend: 'auto',
-    autoStart: true,
-    autoStartVisibleOverlay: true,
-    autoStartPauseUntilReady: true,
-    osdMessages: false,
-    texthookerEnabled: true,
-  };
-  const calls: string[] = [];
-
-  await runPlaybackCommandWithDeps(context, {
-    ensurePlaybackSetupReady: async () => {},
-    ensureRuntimePluginReady: async () => {},
-    chooseTarget: async () => ({ target: context.args.target, kind: 'file' }),
-    checkDependencies: () => {},
-    registerCleanup: () => {},
-    startMpv: async () => {
-      calls.push('startMpv');
-    },
-    waitForUnixSocketReady: async () => true,
-    startOverlay: async (_appPath, _args, _socketPath, extraAppArgs = []) => {
-      calls.push(`startOverlay:${extraAppArgs.join(' ')}`);
-    },
-    launchAppCommandDetached: () => {},
-    log: () => {},
-    cleanupPlaybackSession: async () => {},
-    getMpvProc: () => null,
-    isAppControlServerAvailable: async () => true,
-  } as Parameters<typeof runPlaybackCommandWithDeps>[1] & {
-    isAppControlServerAvailable: () => Promise<boolean>;
+  const harness = makeHarness({
+    context: createContext({ args: FILE_TARGET, plugin: { texthookerEnabled: true } }),
+    deps: { isAppControlServerAvailable: async () => true },
  });

-  assert.deepEqual(calls, ['startMpv', 'startOverlay:--show-visible-overlay']);
+  await harness.run();
+
+  assert.deepEqual(harness.overlayCalls[0]?.extraAppArgs, ['--show-visible-overlay']);
 });

 test('playback command ensures Linux runtime plugin before mpv launch', async () => {
-  const context = createContext();
-  context.args = {
-    ...context.args,
-    target: '/tmp/movie.mkv',
-    targetKind: 'file',
-  };
-  const calls: string[] = [];
+  const harness = makeHarness({ context: createContext({ args: FILE_TARGET }) });

-  await runPlaybackCommandWithDeps(context, {
-    ensurePlaybackSetupReady: async () => {},
-    ensureRuntimePluginReady: async () => {
-      calls.push('plugin');
-    },
-    chooseTarget: async () => ({ target: context.args.target, kind: 'file' }),
-    checkDependencies: () => {},
-    registerCleanup: () => {},
-    startMpv: async () => {
-      calls.push('startMpv');
-    },
-    waitForUnixSocketReady: async () => true,
-    startOverlay: async () => {},
-    launchAppCommandDetached: () => {},
-    log: () => {},
-    cleanupPlaybackSession: async () => {},
-    getMpvProc: () => null,
-  });
+  await harness.run();

-  assert.deepEqual(calls, ['plugin', 'startMpv']);
+  assertRanInOrder(harness.events, 'plugin', 'startMpv');
 });

 test('rofi playback repairs support assets before opening the picker', async () => {
-  const context = createContext();
-  context.args = {
-    ...context.args,
-    target: '',
-    targetKind: '',
-    useRofi: true,
-  };
-  const calls: string[] = [];
-
-  await runPlaybackCommandWithDeps(context, {
-    ensurePlaybackSetupReady: async () => {},
-    ensureRuntimePluginReady: async () => {
-      calls.push('assets');
+  const events: string[] = [];
+  const harness = makeHarness({
+    events,
+    context: createContext({ args: { target: '', targetKind: '', useRofi: true } }),
+    deps: {
+      chooseTarget: async () => {
+        events.push('picker');
+        return { target: '/tmp/movie.mkv', kind: 'file' };
+      },
+      checkPickerDependencies: () => {},
    },
-    chooseTarget: async () => {
-      calls.push('picker');
-      return { target: '/tmp/movie.mkv', kind: 'file' };
-    },
-    checkPickerDependencies: () => {},
-    checkDependencies: () => {},
-    registerCleanup: () => {},
-    startMpv: async () => {
-      calls.push('startMpv');
-    },
-    waitForUnixSocketReady: async () => true,
-    startOverlay: async () => {},
-    launchAppCommandDetached: () => {},
-    log: () => {},
-    cleanupPlaybackSession: async () => {},
-    getMpvProc: () => null,
  });

-  assert.deepEqual(calls, ['assets', 'picker', 'startMpv']);
+  await harness.run();
+
+  assertRanInOrder(events, 'plugin', 'picker', 'startMpv');
 });
@@ -48,49 +48,6 @@ test('runSyncCommand proxies sync argv to the app in --sync-cli mode', async ()
  assert.equal(spawned.length, 1);
 });

-test('runSyncCommand forwards tokens verbatim and appends the effective log level', async () => {
-  const spawned: string[][] = [];
-  const deps: Partial<SyncCommandDeps> = {
-    runAppCommand: (_appPath, appArgs) => {
-      spawned.push(appArgs);
-    },
-  };
-
-  await runSyncCommand(
-    makeContext({
-      syncCliTokens: [
-        'media-box',
-        '--pull',
-        '--remote-cmd',
-        '/opt/SubMiner.AppImage',
-        '--db',
-        '/tmp/db.sqlite',
-        '--force',
-        '--json',
-      ],
-      logLevel: 'debug',
-    }),
-    deps,
-  );
-
-  assert.deepEqual(spawned, [
-    [
-      '--sync-cli',
-      'sync',
-      'media-box',
-      '--pull',
-      '--remote-cmd',
-      '/opt/SubMiner.AppImage',
-      '--db',
-      '/tmp/db.sqlite',
-      '--force',
-      '--json',
-      '--log-level',
-      'debug',
-    ],
-  ]);
-});
-
 test('runSyncCommand fails with a clear message when the app binary is missing', async () => {
  const deps: Partial<SyncCommandDeps> = {
    runAppCommand: () => {
@@ -8,7 +8,6 @@ import {
  buildPluginRuntimeScriptOptParts,
  parsePluginRuntimeConfigFromMainConfig,
 } from './config/plugin-runtime-config.js';
-import { getDefaultSocketPath } from './types.js';

 test('parseLauncherYoutubeSubgenConfig keeps only valid typed values', () => {
  const parsed = parseLauncherYoutubeSubgenConfig({
@@ -207,10 +206,6 @@ test('buildPluginRuntimeScriptOptParts strips script-option delimiters from stri
  );
 });

-test('getDefaultSocketPath returns Windows named pipe default', () => {
-  assert.equal(getDefaultSocketPath('win32'), '\\\\.\\pipe\\subminer-socket');
-});
-
 test('parseLauncherMpvConfig reads configured mpv profile', () => {
  assert.deepEqual(
    parseLauncherMpvConfig({
@@ -1,20 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { execFileSync } from 'node:child_process';
-import path from 'node:path';
-
-test('launcher root help lists subcommands', () => {
-  const output = execFileSync('bun', ['run', path.join(process.cwd(), 'launcher/main.ts'), '-h'], {
-    encoding: 'utf8',
-  });
-
-  assert.match(output, /Commands:/);
-  assert.match(output, /jellyfin\|jf/);
-  assert.match(output, /doctor/);
-  assert.match(output, /config/);
-  assert.match(output, /mpv/);
-  assert.match(output, /logs/);
-  assert.match(output, /dictionary\|dict/);
-  assert.match(output, /texthooker/);
-  assert.match(output, /app\|bin/);
-});
@@ -9,6 +9,7 @@ import {
  applyRootOptionsToArgs,
  createDefaultArgs,
 } from './args-normalizer.js';
+import type { CliInvocations } from './cli-parser-builder.js';

 function withTempDir<T>(fn: (dir: string) => T): T {
  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-launcher-args-'));
@@ -19,6 +20,48 @@ function withTempDir<T>(fn: (dir: string) => T): T {
  }
 }

+/** An invocations bag with nothing triggered; tests pass only the fields under test. */
+function emptyInvocations(overrides: Partial<CliInvocations> = {}): CliInvocations {
+  return {
+    jellyfinInvocation: null,
+    configInvocation: null,
+    settingsInvocation: null,
+    youtubeBrowserInvocation: null,
+    mpvInvocation: null,
+    appInvocation: null,
+    dictionaryTriggered: false,
+    dictionaryTarget: null,
+    dictionaryLogLevel: null,
+    dictionaryCandidates: false,
+    dictionarySelect: false,
+    dictionaryAnilistId: null,
+    statsTriggered: false,
+    statsBackground: false,
+    statsStop: false,
+    statsCleanup: false,
+    statsCleanupVocab: false,
+    statsCleanupLifetime: false,
+    statsCleanupDuplicateLines: false,
+    statsCleanupDryRun: false,
+    statsCleanupLookbackDays: null,
+    statsLogLevel: null,
+    syncTriggered: false,
+    syncCliTokens: [],
+    syncLogLevel: null,
+    syncUiTriggered: false,
+    syncUiLogLevel: null,
+    doctorTriggered: false,
+    doctorLogLevel: null,
+    doctorRefreshKnownWords: false,
+    logsTriggered: false,
+    logsExport: false,
+    texthookerTriggered: false,
+    texthookerLogLevel: null,
+    texthookerOpenBrowser: false,
+    ...overrides,
+  };
+}
+
 test('createDefaultArgs normalizes configured language codes', () => {
  const parsed = createDefaultArgs({
    primarySubLanguages: [' JA ', 'jpn', 'ja'],
@@ -92,53 +135,23 @@ test('applyRootOptionsToArgs rejects unsupported targets', () => {
 test('applyInvocationsToArgs maps config and jellyfin invocation state', () => {
  const parsed = createDefaultArgs({});

-  applyInvocationsToArgs(parsed, {
-    jellyfinInvocation: {
-      action: 'play',
-      play: true,
-      server: 'https://jf.example',
-      username: 'alice',
-      password: 'secret',
-      logLevel: 'debug',
-    },
-    configInvocation: {
-      action: 'show',
-      logLevel: 'warn',
-    },
-    settingsInvocation: null,
-    youtubeBrowserInvocation: null,
-    mpvInvocation: null,
-    appInvocation: null,
-    dictionaryTriggered: false,
-    dictionaryTarget: null,
-    dictionaryLogLevel: null,
-    dictionaryCandidates: false,
-    dictionarySelect: false,
-    dictionaryAnilistId: null,
-    statsTriggered: false,
-    statsBackground: false,
-    statsStop: false,
-    statsCleanup: false,
-    statsCleanupVocab: false,
-    statsCleanupLifetime: false,
-    statsCleanupDuplicateLines: false,
-    statsCleanupDryRun: false,
-    statsCleanupLookbackDays: null,
-    statsLogLevel: null,
-    syncTriggered: false,
-    syncCliTokens: [],
-    syncLogLevel: null,
-    syncUiTriggered: false,
-    syncUiLogLevel: null,
-    doctorTriggered: false,
-    doctorLogLevel: null,
-    doctorRefreshKnownWords: false,
-    logsTriggered: false,
-    logsExport: false,
-    texthookerTriggered: false,
-    texthookerLogLevel: null,
-    texthookerOpenBrowser: false,
-  });
+  applyInvocationsToArgs(
+    parsed,
+    emptyInvocations({
+      jellyfinInvocation: {
+        action: 'play',
+        play: true,
+        server: 'https://jf.example',
+        username: 'alice',
+        password: 'secret',
+        logLevel: 'debug',
+      },
+      configInvocation: {
+        action: 'show',
+        logLevel: 'warn',
+      },
+    }),
+  );

  assert.equal(parsed.jellyfin, false);
  assert.equal(parsed.jellyfinPlay, true);
@@ -155,45 +168,14 @@ test('applyInvocationsToArgs maps config and jellyfin invocation state', () => {
 test('applyInvocationsToArgs maps settings invocation to settings window', () => {
  const parsed = createDefaultArgs({});

-  applyInvocationsToArgs(parsed, {
-    jellyfinInvocation: null,
-    configInvocation: null,
-    settingsInvocation: {
-      logLevel: undefined,
-    },
-    youtubeBrowserInvocation: null,
-    mpvInvocation: null,
-    appInvocation: null,
-    dictionaryTriggered: false,
-    dictionaryTarget: null,
-    dictionaryLogLevel: null,
-    dictionaryCandidates: false,
-    dictionarySelect: false,
-    dictionaryAnilistId: null,
-    statsTriggered: false,
-    statsBackground: false,
-    statsStop: false,
-    statsCleanup: false,
-    statsCleanupVocab: false,
-    statsCleanupLifetime: false,
-    statsCleanupDuplicateLines: false,
-    statsCleanupDryRun: false,
-    statsCleanupLookbackDays: null,
-    statsLogLevel: null,
-    syncTriggered: false,
-    syncCliTokens: [],
-    syncLogLevel: null,
-    syncUiTriggered: false,
-    syncUiLogLevel: null,
-    doctorTriggered: false,
-    doctorLogLevel: null,
-    doctorRefreshKnownWords: false,
-    logsTriggered: false,
-    logsExport: false,
-    texthookerTriggered: false,
-    texthookerLogLevel: null,
-    texthookerOpenBrowser: false,
-  });
+  applyInvocationsToArgs(
+    parsed,
+    emptyInvocations({
+      settingsInvocation: {
+        logLevel: undefined,
+      },
+    }),
+  );

  assert.equal(parsed.settings, true);
  assert.equal(parsed.configPath, false);
@@ -203,45 +185,14 @@ test('applyInvocationsToArgs fails when config invocation has no action', () =>
  const parsed = createDefaultArgs({});

  const error = withProcessExitIntercept(() => {
-    applyInvocationsToArgs(parsed, {
-      jellyfinInvocation: null,
-      configInvocation: {
-        action: undefined,
-      },
-      settingsInvocation: null,
-      youtubeBrowserInvocation: null,
-      mpvInvocation: null,
-      appInvocation: null,
-      dictionaryTriggered: false,
-      dictionaryTarget: null,
-      dictionaryLogLevel: null,
-      dictionaryCandidates: false,
-      dictionarySelect: false,
-      dictionaryAnilistId: null,
-      statsTriggered: false,
-      statsBackground: false,
-      statsStop: false,
-      statsCleanup: false,
-      statsCleanupVocab: false,
-      statsCleanupLifetime: false,
-      statsCleanupDuplicateLines: false,
-      statsCleanupDryRun: false,
-      statsCleanupLookbackDays: null,
-      statsLogLevel: null,
-      syncTriggered: false,
-      syncCliTokens: [],
-      syncLogLevel: null,
-      syncUiTriggered: false,
-      syncUiLogLevel: null,
-      doctorTriggered: false,
-      doctorLogLevel: null,
-      doctorRefreshKnownWords: false,
-      logsTriggered: false,
-      logsExport: false,
-      texthookerTriggered: false,
-      texthookerLogLevel: null,
-      texthookerOpenBrowser: false,
-    });
+    applyInvocationsToArgs(
+      parsed,
+      emptyInvocations({
+        configInvocation: {
+          action: undefined,
+        },
+      }),
+    );
  });

  assert.equal(error.code, 1);
@@ -251,43 +202,13 @@ test('applyInvocationsToArgs fails when config invocation has no action', () =>
 test('applyInvocationsToArgs maps texthooker browser-open request', () => {
  const parsed = createDefaultArgs({});

-  applyInvocationsToArgs(parsed, {
-    jellyfinInvocation: null,
-    configInvocation: null,
-    settingsInvocation: null,
-    youtubeBrowserInvocation: null,
-    mpvInvocation: null,
-    appInvocation: null,
-    dictionaryTriggered: false,
-    dictionaryTarget: null,
-    dictionaryLogLevel: null,
-    dictionaryCandidates: false,
-    dictionarySelect: false,
-    dictionaryAnilistId: null,
-    statsTriggered: false,
-    statsBackground: false,
-    statsStop: false,
-    statsCleanup: false,
-    statsCleanupVocab: false,
-    statsCleanupLifetime: false,
-    statsCleanupDuplicateLines: false,
-    statsCleanupDryRun: false,
-    statsCleanupLookbackDays: null,
-    statsLogLevel: null,
-    syncTriggered: false,
-    syncCliTokens: [],
-    syncLogLevel: null,
-    syncUiTriggered: false,
-    syncUiLogLevel: null,
-    doctorTriggered: false,
-    doctorLogLevel: null,
-    doctorRefreshKnownWords: false,
-    logsTriggered: false,
-    logsExport: false,
-    texthookerTriggered: true,
-    texthookerLogLevel: null,
-    texthookerOpenBrowser: true,
-  });
+  applyInvocationsToArgs(
+    parsed,
+    emptyInvocations({
+      texthookerTriggered: true,
+      texthookerOpenBrowser: true,
+    }),
+  );

  assert.equal(parsed.texthookerOnly, true);
  assert.equal(parsed.texthookerOpenBrowser, true);
@@ -1,128 +1,312 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import type { Args } from './types.js';
-import { runJellyfinPlayMenuWithDeps } from './jellyfin.js';
+import path from 'node:path';
+import {
+  buildForwardedJellyfinAppArgs,
+  buildRootSearchGroups,
+  classifyJellyfinChildSelection,
+  deriveJellyfinTokenStorePath,
+  hasStoredJellyfinSession,
+  parseEpisodePathFromDisplay,
+  parseJellyfinErrorFromAppOutput,
+  parseJellyfinAppReply,
+  parseJellyfinItemsReply,
+  parseJellyfinLibrariesReply,
+  parseJellyfinPreviewAuthResponse,
+  runJellyfinPlayMenuWithDeps,
+  shouldRetryWithStartForNoRunningInstance,
+} from './jellyfin.js';
+import { makeLauncherArgs } from './test-support/args.js';
+import { withEnv } from './test-support/env.js';

-function createArgs(): Args {
-  return {
-    backend: 'auto',
-    directory: '.',
-    recursive: false,
-    profile: '',
-    startOverlay: false,
-    youtubePrimarySubLangs: [],
-    youtubeSecondarySubLangs: [],
-    youtubeAudioLangs: [],
-    useTexthooker: false,
-    autoStartOverlay: false,
-    texthookerOnly: false,
-    texthookerOpenBrowser: false,
-    useRofi: false,
-    history: false,
-    sync: false,
-    syncCliTokens: [],
-    syncUi: false,
-    logLevel: 'info',
-    logRotation: 7,
-    passwordStore: '',
-    target: '',
-    targetKind: '',
-    jimakuApiKey: '',
-    jimakuApiKeyCommand: '',
-    jimakuApiBaseUrl: '',
-    jimakuLanguagePreference: 'ja',
-    jimakuMaxEntryResults: 20,
-    jellyfin: false,
-    jellyfinLogin: false,
-    jellyfinLogout: false,
-    jellyfinPlay: false,
-    jellyfinDiscovery: false,
-    dictionary: false,
-    dictionaryCandidates: false,
-    dictionarySelect: false,
-    stats: false,
-    doctor: false,
-    doctorRefreshKnownWords: false,
-    logsExport: false,
-    version: false,
-    settings: false,
-    youtubeBrowser: false,
-    configPath: false,
-    configShow: false,
-    mpvIdle: false,
-    mpvSocket: false,
-    mpvStatus: false,
-    mpvArgs: '',
-    appPassthrough: false,
-    appArgs: [],
-    jellyfinServer: 'https://jellyfin.example.test',
-    jellyfinUsername: '',
-    jellyfinPassword: '',
-    launchMode: 'normal',
+class HandoffComplete extends Error {}
+
+type PlayMenuDeps = NonNullable<Parameters<typeof runJellyfinPlayMenuWithDeps>[4]>;
+
+/**
+ * Runs the play menu with fake deps and a direct env session. The app handoff never returns in
+ * production, so the fake throws `HandoffComplete` after recording its args into `handoff`.
+ */
+async function runPlayMenu(options: {
+  socketReady?: boolean;
+  overrides?: Partial<PlayMenuDeps>;
+  args?: Parameters<typeof makeLauncherArgs>[0];
+}) {
+  const launches: string[] = [];
+  const handoff: { appArgs: string[] | null } = { appArgs: null };
+  const deps: PlayMenuDeps = {
+    loadLauncherJellyfinConfig: () => ({}),
+    findRofiTheme: () => null,
+    resolveJellyfinSelection: async () => 'item-123',
+    resolveJellyfinSelectionViaApp: async () => {
+      throw new Error('unexpected app-based selection');
+    },
+    hasStoredJellyfinSession: () => true,
+    requestJellyfinPreviewAuthFromApp: async () => null,
+    resolveLauncherMainConfigPath: () => '/tmp/SubMiner/config.jsonc',
+    pathExists: () => options.socketReady ?? false,
+    ensureRuntimePluginReady: async () => {
+      launches.push('plugin');
+    },
+    waitForUnixSocketReady: async () => true,
+    launchMpvIdleDetached: async () => {
+      launches.push('launch');
+    },
+    resolveLauncherRuntimePluginPath: () => '/tmp/plugin/main.lua',
+    runAppCommandWithInheritLogged: (_appPath, appArgs) => {
+      handoff.appArgs = appArgs;
+      throw new HandoffComplete();
+    },
+    isAppManagedByLauncher: () => false,
+    runAppCommandCaptureOutput: () => {
+      throw new Error('unexpected owned-app handoff');
+    },
+    waitForUnixSocketClosed: async () => {
+      throw new Error('unexpected wait for mpv to close');
+    },
+    exitProcess: () => {
+      throw new Error('unexpected exit');
+    },
+    log: () => {},
+    ...options.overrides,
  };
+
+  await withEnv(
+    { SUBMINER_JELLYFIN_ACCESS_TOKEN: 'token', SUBMINER_JELLYFIN_USER_ID: 'user' },
+    () =>
+      assert.rejects(
+        () =>
+          runJellyfinPlayMenuWithDeps(
+            '/tmp/SubMiner.AppImage',
+            makeLauncherArgs({ jellyfinServer: 'https://jellyfin.example.test', ...options.args }),
+            '/tmp/subminer',
+            '/tmp/subminer.sock',
+            deps,
+          ),
+        HandoffComplete,
+      ),
+  );
+
+  return { launches, appArgs: handoff.appArgs };
 }

-test('Jellyfin playback ensures Linux runtime plugin before detached idle mpv bootstrap', async () => {
-  const originalAccessToken = process.env.SUBMINER_JELLYFIN_ACCESS_TOKEN;
-  const originalUserId = process.env.SUBMINER_JELLYFIN_USER_ID;
-  process.env.SUBMINER_JELLYFIN_ACCESS_TOKEN = 'token';
-  process.env.SUBMINER_JELLYFIN_USER_ID = 'user';
-  const calls: string[] = [];
+test('Jellyfin playback launches the idle mpv with the runtime plugin, then hands the item to the app', async () => {
+  const { launches, appArgs } = await runPlayMenu({});

-  try {
-    await assert.rejects(
-      () =>
-        runJellyfinPlayMenuWithDeps(
-          '/tmp/SubMiner.AppImage',
-          createArgs(),
-          '/tmp/subminer',
-          '/tmp/subminer.sock',
-          {
-            loadLauncherJellyfinConfig: () => ({}),
-            findRofiTheme: () => null,
-            resolveJellyfinSelection: async () => 'item-123',
-            resolveJellyfinSelectionViaApp: async () => {
-              throw new Error('unexpected app-based selection');
-            },
-            hasStoredJellyfinSession: () => true,
-            requestJellyfinPreviewAuthFromApp: async () => null,
-            resolveLauncherMainConfigPath: () => '/tmp/SubMiner/config.jsonc',
-            pathExists: () => false,
-            ensureRuntimePluginReady: async () => {
-              calls.push('plugin');
-            },
-            waitForUnixSocketReady: async () => {
-              calls.push('wait');
-              return true;
-            },
-            launchMpvIdleDetached: async () => {
-              calls.push('launch');
-            },
-            resolveLauncherRuntimePluginPath: () => {
-              calls.push('resolve');
-              return '/tmp/plugin/main.lua';
-            },
-            runAppCommandWithInheritLogged: () => {
-              calls.push('handoff');
-              throw new Error('stop after handoff');
-            },
-            log: () => {},
-          },
-        ),
-      /stop after handoff/,
-    );
-
-    assert.deepEqual(calls, ['plugin', 'resolve', 'launch', 'wait', 'handoff']);
-  } finally {
-    if (originalAccessToken === undefined) {
-      delete process.env.SUBMINER_JELLYFIN_ACCESS_TOKEN;
-    } else {
-      process.env.SUBMINER_JELLYFIN_ACCESS_TOKEN = originalAccessToken;
-    }
-    if (originalUserId === undefined) {
-      delete process.env.SUBMINER_JELLYFIN_USER_ID;
-    } else {
-      process.env.SUBMINER_JELLYFIN_USER_ID = originalUserId;
-    }
-  }
+  assert.deepEqual(launches, ['plugin', 'launch']);
+  assert.deepEqual(appArgs, ['--start', '--jellyfin-play', '--jellyfin-item-id=item-123']);
+});
+
+test('Jellyfin playback reuses a ready mpv socket instead of launching idle mpv', async () => {
+  const { launches, appArgs } = await runPlayMenu({ socketReady: true });
+
+  assert.deepEqual(launches, []);
+  assert.deepEqual(appArgs, ['--start', '--jellyfin-play', '--jellyfin-item-id=item-123']);
+});
+
+test('Jellyfin playback in an app the picker started waits for mpv to close before exiting', async () => {
+  const events: string[] = [];
+  const { appArgs } = await runPlayMenu({
+    socketReady: true,
+    overrides: {
+      isAppManagedByLauncher: () => true,
+      runAppCommandCaptureOutput: (_appPath, appArgs) => {
+        events.push(`handoff ${appArgs.join(' ')}`);
+        return { status: 0, stdout: '', stderr: '' };
+      },
+      waitForUnixSocketClosed: async (socketPath) => {
+        events.push(`wait ${socketPath}`);
+      },
+      exitProcess: (code) => {
+        events.push(`exit ${code}`);
+        throw new HandoffComplete();
+      },
+    },
+  });
+
+  assert.equal(appArgs, null);
+  assert.deepEqual(events, [
+    'handoff --start --jellyfin-play --jellyfin-item-id=item-123',
+    'wait /tmp/subminer.sock',
+    'exit 0',
+  ]);
+});
+
+test('parseJellyfinAppReply maps library and item replies to picker entries', () => {
+  const libraries = parseJellyfinAppReply(
+    JSON.stringify({
+      libraries: [
+        { id: 'lib1', name: 'Anime', collectionType: 'tvshows' },
+        { id: 'lib1', name: 'Duplicate', collectionType: 'tvshows' },
+        { name: 'No id' },
+      ],
+    }),
+  );
+  assert.ok(libraries?.ok);
+  assert.deepEqual(parseJellyfinLibrariesReply(libraries.payload), [
+    { id: 'lib1', name: 'Anime', kind: 'tvshows' },
+  ]);
+
+  const items = parseJellyfinAppReply(
+    JSON.stringify({ items: [{ id: 'movie-1', title: 'Movie [Alt]', type: 'Movie' }] }),
+  );
+  assert.ok(items?.ok);
+  assert.deepEqual(parseJellyfinItemsReply(items.payload), [
+    { id: 'movie-1', name: 'Movie [Alt]', type: 'Movie', display: 'Movie [Alt]' },
+  ]);
+  assert.equal(parseJellyfinLibrariesReply(items.payload), null);
+});
+
+test('parseJellyfinAppReply surfaces app errors and rejects partial files', () => {
+  assert.deepEqual(
+    parseJellyfinAppReply(
+      JSON.stringify({ error: 'Missing Jellyfin session. Run --jellyfin-login first.' }),
+    ),
+    { ok: false, error: 'Missing Jellyfin session. Run `subminer jellyfin -l` to log in again.' },
+  );
+  assert.equal(parseJellyfinAppReply(''), null);
+  assert.equal(parseJellyfinAppReply('{"libraries": ['), null);
+});
+
+test('buildForwardedJellyfinAppArgs appends server, password store, and log level', () => {
+  const forwarded = buildForwardedJellyfinAppArgs(
+    {
+      jellyfinServer: 'https://jf.example.test/',
+      passwordStore: 'gnome-libsecret',
+      logLevel: 'info',
+    } as never,
+    ['--jellyfin-libraries'],
+  );
+
+  assert.deepEqual(forwarded, [
+    '--jellyfin-libraries',
+    '--jellyfin-server',
+    'https://jf.example.test',
+    '--password-store',
+    'gnome-libsecret',
+    '--log-level',
+    'info',
+  ]);
+});
+
+test('parseJellyfinErrorFromAppOutput extracts bracketed error lines', () => {
+  const parsed = parseJellyfinErrorFromAppOutput(`
+[subminer] - 2026-03-01 13:10:34 - WARN - [main] test warning
+[2026-03-01T21:11:28.821Z] [ERROR] Missing Jellyfin session. Set SUBMINER_JELLYFIN_ACCESS_TOKEN and SUBMINER_JELLYFIN_USER_ID, then retry.
+`);
+
+  assert.equal(
+    parsed,
+    'Missing Jellyfin session. Set SUBMINER_JELLYFIN_ACCESS_TOKEN and SUBMINER_JELLYFIN_USER_ID, then retry.',
+  );
+});
+
+test('parseJellyfinErrorFromAppOutput extracts main runtime error lines', () => {
+  const parsed = parseJellyfinErrorFromAppOutput(`
+[subminer] - 2026-03-01 13:10:34 - ERROR - [main] runJellyfinCommand failed: {"message":"Missing Jellyfin password."}
+`);
+
+  assert.equal(
+    parsed,
+    '[main] runJellyfinCommand failed: {"message":"Missing Jellyfin password."}',
+  );
+});
+
+test('parseJellyfinPreviewAuthResponse parses valid structured response payload', () => {
+  const parsed = parseJellyfinPreviewAuthResponse({
+    serverUrl: 'http://pve-main:8096/',
+    accessToken: 'token-123',
+    userId: 'user-1',
+  });
+
+  assert.deepEqual(parsed, {
+    serverUrl: 'http://pve-main:8096',
+    accessToken: 'token-123',
+    userId: 'user-1',
+  });
+});
+
+test('parseJellyfinPreviewAuthResponse returns null without a token', () => {
+  assert.equal(
+    parseJellyfinPreviewAuthResponse({
+      serverUrl: 'http://pve-main:8096',
+      accessToken: '',
+      userId: 'user-1',
+    }),
+    null,
+  );
+});
+
+test('hasStoredJellyfinSession checks token-store existence', () => {
+  const configPath = path.join('/home/test', '.config', 'SubMiner', 'config.jsonc');
+  const tokenPath = deriveJellyfinTokenStorePath(configPath);
+  const exists = (candidate: string): boolean => candidate === tokenPath;
+  assert.equal(hasStoredJellyfinSession(configPath, exists), true);
+  assert.equal(
+    hasStoredJellyfinSession(path.join('/home/test', '.config', 'Other', 'alt.jsonc'), exists),
+    false,
+  );
+});
+
+test('shouldRetryWithStartForNoRunningInstance matches expected app lifecycle error', () => {
+  assert.equal(
+    shouldRetryWithStartForNoRunningInstance('No running instance. Use --start to launch the app.'),
+    true,
+  );
+  assert.equal(
+    shouldRetryWithStartForNoRunningInstance(
+      'Missing Jellyfin session. Run --jellyfin-login first.',
+    ),
+    false,
+  );
+});
+
+test('parseEpisodePathFromDisplay extracts series and season from episode display titles', () => {
+  assert.deepEqual(
+    parseEpisodePathFromDisplay('KONOSUBA S01E03 A Panty Treasure in This Right Hand!'),
+    {
+      seriesName: 'KONOSUBA',
+      seasonNumber: 1,
+    },
+  );
+  assert.deepEqual(parseEpisodePathFromDisplay('Frieren S2E10 Something'), {
+    seriesName: 'Frieren',
+    seasonNumber: 2,
+  });
+});
+
+test('parseEpisodePathFromDisplay returns null for non-episode displays', () => {
+  assert.equal(parseEpisodePathFromDisplay('Movie Title (Movie)'), null);
+  assert.equal(parseEpisodePathFromDisplay('Just A Name'), null);
+});
+
+test('buildRootSearchGroups excludes episodes and keeps containers/movies', () => {
+  const groups = buildRootSearchGroups([
+    { id: 'series-1', name: 'The Eminence in Shadow', type: 'Series', display: 'x' },
+    { id: 'movie-1', name: 'Spirited Away', type: 'Movie', display: 'x' },
+    { id: 'episode-1', name: 'The Eminence in Shadow S01E01', type: 'Episode', display: 'x' },
+  ]);
+
+  assert.deepEqual(groups, [
+    {
+      id: 'series-1',
+      name: 'The Eminence in Shadow',
+      type: 'Series',
+      display: 'The Eminence in Shadow (Series)',
+    },
+    {
+      id: 'movie-1',
+      name: 'Spirited Away',
+      type: 'Movie',
+      display: 'Spirited Away (Movie)',
+    },
+  ]);
+});
+
+test('classifyJellyfinChildSelection keeps container drilldown state instead of flattening', () => {
+  const next = classifyJellyfinChildSelection({ id: 'season-2', type: 'Season' });
+  assert.deepEqual(next, {
+    kind: 'container',
+    id: 'season-2',
+  });
 });
@@ -10,7 +10,8 @@ import type {
  JellyfinGroupEntry,
 } from './types.js';
 import { shouldForwardLogLevel } from './types.js';
-import { log, fail, getMpvLogPath } from './log.js';
+import type { JellyfinPreviewAuthPayload } from '../src/shared/jellyfin-cli-response.js';
+import { log, fail } from './log.js';
 import { nowMs } from './time.js';
 import { commandExists, resolvePathMaybe, sleep } from './util.js';
 import {
@@ -23,11 +24,14 @@ import {
 import { loadLauncherJellyfinConfig } from './config.js';
 import { resolveLauncherMainConfigPath } from './config/shared-config-reader.js';
 import {
+  adoptLauncherStartedApp,
+  isAppManagedByLauncher,
  runAppCommandWithInheritLogged,
  runAppCommandCaptureOutput,
-  launchAppStartDetached,
+  launchAppBackgroundDetached,
  launchMpvIdleDetached,
  resolveLauncherRuntimePluginPath,
+  waitForUnixSocketClosed,
  waitForUnixSocketReady,
 } from './mpv.js';
 import { ensureLinuxRuntimePluginAvailable } from './runtime-plugin-preflight.js';
@@ -52,6 +56,10 @@ type JellyfinPlayMenuDeps = {
  launchMpvIdleDetached: typeof launchMpvIdleDetached;
  resolveLauncherRuntimePluginPath: typeof resolveLauncherRuntimePluginPath;
  runAppCommandWithInheritLogged: typeof runAppCommandWithInheritLogged;
+  isAppManagedByLauncher: typeof isAppManagedByLauncher;
+  runAppCommandCaptureOutput: typeof runAppCommandCaptureOutput;
+  waitForUnixSocketClosed: typeof waitForUnixSocketClosed;
+  exitProcess: (code: number) => never;
  log: typeof log;
 };

@@ -75,6 +83,10 @@ const defaultJellyfinPlayMenuDeps: JellyfinPlayMenuDeps = {
  launchMpvIdleDetached,
  resolveLauncherRuntimePluginPath,
  runAppCommandWithInheritLogged,
+  isAppManagedByLauncher,
+  runAppCommandCaptureOutput,
+  waitForUnixSocketClosed,
+  exitProcess: (code) => process.exit(code),
  log,
 };

@@ -171,76 +183,77 @@ function stripAnsi(value: string): string {
  return value.replace(ANSI_ESCAPE_PATTERN, '');
 }

-function parseNamedJellyfinRecord(payload: string): {
-  name: string;
-  id: string;
-  type: string;
-} | null {
-  const typeClose = payload.lastIndexOf(')');
-  if (typeClose !== payload.length - 1) return null;
+// Reply the app writes to --jellyfin-response-path; see src/shared/jellyfin-cli-response.ts.
+export type JellyfinAppReply =
+  | { ok: true; payload: Record<string, unknown> }
+  | { ok: false; error: string };

-  const typeOpen = payload.lastIndexOf(' (');
-  if (typeOpen <= 0 || typeOpen >= typeClose) return null;
-
-  const idClose = payload.lastIndexOf(']', typeOpen);
-  if (idClose <= 0) return null;
-
-  const idOpen = payload.lastIndexOf(' [', idClose);
-  if (idOpen <= 0 || idOpen >= idClose) return null;
-
-  const name = payload.slice(0, idOpen).trim();
-  const id = payload.slice(idOpen + 2, idClose).trim();
-  const type = payload.slice(typeOpen + 2, typeClose).trim();
-  if (!name || !id || !type) return null;
-
-  return { name, id, type };
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
 }

-export function parseJellyfinLibrariesFromAppOutput(output: string): JellyfinLibraryEntry[] {
+function readString(record: Record<string, unknown>, key: string): string {
+  const value = record[key];
+  return typeof value === 'string' ? value.trim() : '';
+}
+
+export function parseJellyfinAppReply(raw: string): JellyfinAppReply | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (!isRecord(parsed)) return null;
+  const error = readString(parsed, 'error');
+  if (error) return { ok: false, error: normalizeJellyfinAppError(error) };
+  return { ok: true, payload: parsed };
+}
+
+export function parseJellyfinLibrariesReply(
+  payload: Record<string, unknown>,
+): JellyfinLibraryEntry[] | null {
+  if (!Array.isArray(payload.libraries)) return null;
  const libraries: JellyfinLibraryEntry[] = [];
  const seenIds = new Set<string>();
-
-  for (const rawLine of output.split(/\r?\n/)) {
-    const line = stripAnsi(rawLine);
-    const markerIndex = line.indexOf('Jellyfin library:');
-    if (markerIndex < 0) continue;
-    const payload = line.slice(markerIndex + 'Jellyfin library:'.length).trim();
-    const parsed = parseNamedJellyfinRecord(payload);
-    if (!parsed || seenIds.has(parsed.id)) continue;
-    seenIds.add(parsed.id);
+  for (const entry of payload.libraries) {
+    if (!isRecord(entry)) continue;
+    const id = readString(entry, 'id');
+    if (!id || seenIds.has(id)) continue;
+    seenIds.add(id);
    libraries.push({
-      id: parsed.id,
-      name: parsed.name,
-      kind: parsed.type,
+      id,
+      name: readString(entry, 'name') || 'Untitled',
+      kind: readString(entry, 'collectionType') || 'unknown',
    });
  }
-
  return libraries;
 }

-export function parseJellyfinItemsFromAppOutput(output: string): JellyfinItemEntry[] {
+export function parseJellyfinItemsReply(
+  payload: Record<string, unknown>,
+): JellyfinItemEntry[] | null {
+  if (!Array.isArray(payload.items)) return null;
  const items: JellyfinItemEntry[] = [];
  const seenIds = new Set<string>();
-
-  for (const rawLine of output.split(/\r?\n/)) {
-    const line = stripAnsi(rawLine);
-    const markerIndex = line.indexOf('Jellyfin item:');
-    if (markerIndex < 0) continue;
-    const payload = line.slice(markerIndex + 'Jellyfin item:'.length).trim();
-    const parsed = parseNamedJellyfinRecord(payload);
-    if (!parsed || seenIds.has(parsed.id)) continue;
-    seenIds.add(parsed.id);
-    items.push({
-      id: parsed.id,
-      name: parsed.name,
-      type: parsed.type,
-      display: parsed.name,
-    });
+  for (const entry of payload.items) {
+    if (!isRecord(entry)) continue;
+    const id = readString(entry, 'id');
+    if (!id || seenIds.has(id)) continue;
+    seenIds.add(id);
+    const title = readString(entry, 'title') || 'Untitled';
+    items.push({ id, name: title, type: readString(entry, 'type'), display: title });
  }
-
  return items;
 }

+function normalizeJellyfinAppError(message: string): string {
+  if (message.includes('Missing Jellyfin session')) {
+    return 'Missing Jellyfin session. Run `subminer jellyfin -l` to log in again.';
+  }
+  return message;
+}
+
 export function parseJellyfinErrorFromAppOutput(output: string): string {
  const lines = output.split(/\r?\n/).map((line) => stripAnsi(line).trim());
  for (let i = lines.length - 1; i >= 0; i -= 1) {
@@ -260,41 +273,20 @@ export function parseJellyfinErrorFromAppOutput(output: string): string {
    }

    if (line.includes('Missing Jellyfin session')) {
-      return 'Missing Jellyfin session. Run `subminer jellyfin -l` to log in again.';
+      return normalizeJellyfinAppError(line);
    }
  }
  return '';
 }

-type JellyfinPreviewAuthResponse = {
-  serverUrl: string;
-  accessToken: string;
-  userId: string;
-};
-
-export function parseJellyfinPreviewAuthResponse(raw: string): JellyfinPreviewAuthResponse | null {
-  if (!raw || raw.trim().length === 0) return null;
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return null;
-  }
-  if (!parsed || typeof parsed !== 'object') return null;
-
-  const candidate = parsed as Record<string, unknown>;
-  const serverUrl = sanitizeServerUrl(
-    typeof candidate.serverUrl === 'string' ? candidate.serverUrl : '',
-  );
-  const accessToken = typeof candidate.accessToken === 'string' ? candidate.accessToken.trim() : '';
-  const userId = typeof candidate.userId === 'string' ? candidate.userId.trim() : '';
+export function parseJellyfinPreviewAuthResponse(
+  payload: Record<string, unknown>,
+): JellyfinPreviewAuthPayload | null {
+  const serverUrl = sanitizeServerUrl(readString(payload, 'serverUrl'));
+  const accessToken = readString(payload, 'accessToken');
+  const userId = readString(payload, 'userId');
  if (!serverUrl || !accessToken) return null;
-
-  return {
-    serverUrl,
-    accessToken,
-    userId,
-  };
+  return { serverUrl, accessToken, userId };
 }

 export function shouldRetryWithStartForNoRunningInstance(errorMessage: string): boolean {
@@ -312,19 +304,6 @@ export function hasStoredJellyfinSession(
  return exists(deriveJellyfinTokenStorePath(configPath));
 }

-export function readUtf8FileAppendedSince(logPath: string, offsetBytes: number): string {
-  try {
-    const buffer = fs.readFileSync(logPath);
-    if (buffer.length === 0) return '';
-    const normalizedOffset =
-      Number.isFinite(offsetBytes) && offsetBytes >= 0 ? Math.floor(offsetBytes) : 0;
-    const startOffset = normalizedOffset > buffer.length ? 0 : normalizedOffset;
-    return buffer.subarray(startOffset).toString('utf8');
-  } catch {
-    return '';
-  }
-}
-
 export function parseEpisodePathFromDisplay(
  display: string,
 ): { seriesName: string; seasonNumber: number } | null {
@@ -421,145 +400,79 @@ export function buildForwardedJellyfinAppArgs(args: Args, appArgs: string[]): st
  return forwarded;
 }

-async function runAppJellyfinListCommand(
-  appPath: string,
-  args: Args,
-  appArgs: string[],
-  label: string,
-): Promise<string> {
-  const attempt = await runAppJellyfinCommand(appPath, args, appArgs, label);
-  if (attempt.status !== 0) {
-    const message = attempt.output.trim();
-    fail(message || `${label} failed.`);
+const JELLYFIN_APP_REPLY_TIMEOUT_MS = 60_000;
+const JELLYFIN_PREVIEW_AUTH_TIMEOUT_MS = 15_000;
+
+function readJellyfinAppReply(responsePath: string): JellyfinAppReply | null {
+  try {
+    return parseJellyfinAppReply(fs.readFileSync(responsePath, 'utf8'));
+  } catch {
+    return null;
  }
-  if (attempt.error) {
-    fail(attempt.error);
-  }
-  return attempt.output;
 }

-async function runAppJellyfinCommand(
+// Runs a Jellyfin command in the app and waits for the reply it writes to a temp file. The helper
+// process usually hands the command to an already-running instance and exits at once with no
+// output, so the reply file is the only result channel that works in both cases.
+async function requestJellyfinReplyFromApp(
  appPath: string,
  args: Args,
  appArgs: string[],
  label: string,
-): Promise<{ status: number; output: string; error: string; logOffset: number }> {
-  const forwardedBase = buildForwardedJellyfinAppArgs(args, appArgs);
+  timeoutMs: number,
+): Promise<JellyfinAppReply> {
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-jf-reply-'));
+  const responsePath = path.join(tmpDir, 'response.json');
+  const forwarded = buildForwardedJellyfinAppArgs(args, [
+    ...appArgs,
+    `--jellyfin-response-path=${responsePath}`,
+  ]);

-  const readLogAppendedSince = (offset: number): string => {
-    const logPath = getMpvLogPath();
-    return readUtf8FileAppendedSince(logPath, offset);
-  };
-
-  const hasCommandSignal = (output: string): boolean => {
-    if (label === 'jellyfin-libraries') {
-      return (
-        output.includes('Jellyfin library:') || output.includes('No Jellyfin libraries found.')
-      );
-    }
-    if (label === 'jellyfin-items') {
-      return (
-        output.includes('Jellyfin item:') ||
-        output.includes('No Jellyfin items found for the selected library/search.')
-      );
-    }
-    if (label === 'jellyfin-preview-auth') {
-      return output.includes('Jellyfin preview auth written.');
-    }
-    return output.trim().length > 0;
-  };
-
-  const runOnce = (): { status: number; output: string; error: string; logOffset: number } => {
-    const forwarded = [...forwardedBase];
-    const logPath = getMpvLogPath();
-    let logOffset = 0;
-    try {
-      if (fs.existsSync(logPath)) {
-        logOffset = fs.statSync(logPath).size;
-      }
-    } catch {
-      logOffset = 0;
-    }
+  const runOnce = (): { status: number; output: string; error: string } => {
    log('debug', args.logLevel, `${label}: launching app with args: ${forwarded.join(' ')}`);
    const result = runAppCommandCaptureOutput(appPath, forwarded);
    log('debug', args.logLevel, `${label}: app command exited with status ${result.status}`);
-    let output = `${result.stdout || ''}\n${result.stderr || ''}\n${readLogAppendedSince(logOffset)}`;
-    let error = parseJellyfinErrorFromAppOutput(output);
-
-    return { status: result.status, output, error, logOffset };
+    const output = `${result.stdout || ''}\n${result.stderr || ''}`;
+    return { status: result.status, output, error: parseJellyfinErrorFromAppOutput(output) };
  };

-  let retriedAfterStart = false;
-  let attempt = runOnce();
-  if (shouldRetryWithStartForNoRunningInstance(attempt.error)) {
-    log('debug', args.logLevel, `${label}: starting app detached, then retrying command`);
-    launchAppStartDetached(appPath, args.logLevel);
-    await sleep(1000);
-    retriedAfterStart = true;
-    attempt = runOnce();
-  }
-
-  if (attempt.status === 0 && !attempt.error && !hasCommandSignal(attempt.output)) {
-    // When app is already running, command handling happens in the primary process and log
-    // lines can land slightly after the helper process exits.
-    const settleWindowMs = (() => {
-      if (label === 'jellyfin-items') {
-        return retriedAfterStart ? 45000 : 30000;
-      }
-      return retriedAfterStart ? 12000 : 4000;
-    })();
-    const settleDeadline = nowMs() + settleWindowMs;
-    const settleOffset = attempt.logOffset;
-    while (nowMs() < settleDeadline) {
-      await sleep(100);
-      const settledOutput = readLogAppendedSince(settleOffset);
-      if (!settledOutput.trim()) {
-        continue;
-      }
-      attempt.output = `${attempt.output}\n${settledOutput}`;
-      attempt.error = parseJellyfinErrorFromAppOutput(attempt.output);
-      if (attempt.error || hasCommandSignal(attempt.output)) {
-        break;
-      }
-    }
-  }
-
-  return attempt;
-}
-
-async function requestJellyfinPreviewAuthFromApp(
-  appPath: string,
-  args: Args,
-): Promise<JellyfinPreviewAuthResponse | null> {
-  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-jf-preview-auth-'));
-  const responsePath = path.join(tmpDir, 'response.json');
  try {
-    const attempt = await runAppJellyfinCommand(
-      appPath,
-      args,
-      ['--jellyfin-preview-auth', `--jellyfin-response-path=${responsePath}`],
-      'jellyfin-preview-auth',
-    );
-    if (attempt.status !== 0 || attempt.error) {
-      return null;
+    let attempt = runOnce();
+    if (shouldRetryWithStartForNoRunningInstance(attempt.error)) {
+      // Start it the way `subminer app` does: the app outlives this picker and the playback, so it
+      // needs its tray to be visible and quittable.
+      log(
+        'debug',
+        args.logLevel,
+        `${label}: starting app in the background, then retrying command`,
+      );
+      launchAppBackgroundDetached(appPath, args.logLevel);
+      adoptLauncherStartedApp(appPath, args);
+      // A cold start (an AppImage mount, first-run setup) can take a while to claim the instance
+      // lock, so keep retrying until the app takes the command or the request deadline passes.
+      const startDeadline = nowMs() + timeoutMs;
+      do {
+        await sleep(1000);
+        attempt = runOnce();
+      } while (shouldRetryWithStartForNoRunningInstance(attempt.error) && nowMs() < startDeadline);
+    }
+    // A written reply is authoritative; the exit status and log lines only explain a missing one.
+    const earlyReply = readJellyfinAppReply(responsePath);
+    if (earlyReply) return earlyReply;
+    if (attempt.status !== 0) {
+      return { ok: false, error: attempt.error || attempt.output.trim() || `${label} failed.` };
+    }
+    if (attempt.error) {
+      return { ok: false, error: attempt.error };
    }

-    const deadline = nowMs() + 4000;
+    const deadline = nowMs() + timeoutMs;
    while (nowMs() < deadline) {
-      try {
-        if (fs.existsSync(responsePath)) {
-          const raw = fs.readFileSync(responsePath, 'utf8');
-          const parsed = parseJellyfinPreviewAuthResponse(raw);
-          if (parsed) {
-            return parsed;
-          }
-        }
-      } catch {
-        // retry until timeout
-      }
+      const reply = readJellyfinAppReply(responsePath);
+      if (reply) return reply;
      await sleep(100);
    }
-    return null;
+    return { ok: false, error: `Timed out waiting for SubMiner to answer ${label}.` };
  } finally {
    try {
      fs.rmSync(tmpDir, { recursive: true, force: true });
@@ -569,19 +482,57 @@ async function requestJellyfinPreviewAuthFromApp(
  }
 }

+async function requestJellyfinPreviewAuthFromApp(
+  appPath: string,
+  args: Args,
+): Promise<JellyfinPreviewAuthPayload | null> {
+  const reply = await requestJellyfinReplyFromApp(
+    appPath,
+    args,
+    ['--jellyfin-preview-auth'],
+    'jellyfin-preview-auth',
+    JELLYFIN_PREVIEW_AUTH_TIMEOUT_MS,
+  );
+  if (!reply.ok) {
+    log('debug', args.logLevel, `jellyfin-preview-auth: ${reply.error}`);
+    return null;
+  }
+  return parseJellyfinPreviewAuthResponse(reply.payload);
+}
+
+async function requestJellyfinListFromApp<T>(
+  appPath: string,
+  args: Args,
+  appArgs: string[],
+  label: string,
+  parse: (payload: Record<string, unknown>) => T[] | null,
+): Promise<T[]> {
+  const reply = await requestJellyfinReplyFromApp(
+    appPath,
+    args,
+    appArgs,
+    label,
+    JELLYFIN_APP_REPLY_TIMEOUT_MS,
+  );
+  if (!reply.ok) fail(reply.error);
+  const entries = parse(reply.payload);
+  if (!entries) fail(`Unexpected reply from SubMiner for ${label}.`);
+  return entries;
+}
+
 async function resolveJellyfinSelectionViaApp(
  appPath: string,
  args: Args,
  session: JellyfinSessionConfig,
  themePath: string | null = null,
 ): Promise<string> {
-  const listLibrariesOutput = await runAppJellyfinListCommand(
+  const libraries = await requestJellyfinListFromApp(
    appPath,
    args,
    ['--jellyfin-libraries'],
    'jellyfin-libraries',
+    parseJellyfinLibrariesReply,
  );
-  const libraries = parseJellyfinLibrariesFromAppOutput(listLibrariesOutput);
  if (libraries.length === 0) {
    fail('No Jellyfin libraries found.');
  }
@@ -655,8 +606,13 @@ async function resolveJellyfinSelectionViaApp(
    if (includeItemTypes) {
      itemArgs.push(`--jellyfin-include-item-types=${includeItemTypes}`);
    }
-    const output = await runAppJellyfinListCommand(appPath, args, itemArgs, 'jellyfin-items');
-    return parseJellyfinItemsFromAppOutput(output);
+    return requestJellyfinListFromApp(
+      appPath,
+      args,
+      itemArgs,
+      'jellyfin-items',
+      parseJellyfinItemsReply,
+    );
  };

  let rootItems =
@@ -1106,5 +1062,22 @@ export async function runJellyfinPlayMenuWithDeps(
  const forwarded = ['--start', '--jellyfin-play', `--jellyfin-item-id=${itemId}`];
  if (shouldForwardLogLevel(args.logLevel)) forwarded.push('--log-level', args.logLevel);
  if (args.passwordStore) forwarded.push('--password-store', args.passwordStore);
-  deps.runAppCommandWithInheritLogged(appPath, forwarded, args.logLevel, 'jellyfin-play');
+  if (!deps.isAppManagedByLauncher()) {
+    // A running app keeps running after playback; a cold `--start --jellyfin-play` makes the app
+    // quit with mpv on its own.
+    deps.runAppCommandWithInheritLogged(appPath, forwarded, args.logLevel, 'jellyfin-play');
+  }
+  // The picker started the app, so this playback owns it, as with local playback: hand over the
+  // item, wait for mpv to close, then exit, which stops the app.
+  const handoff = deps.runAppCommandCaptureOutput(appPath, forwarded);
+  if (handoff.status !== 0) {
+    fail(handoff.error?.message || handoff.stderr.trim() || 'Failed to start Jellyfin playback.');
+  }
+  deps.log(
+    'debug',
+    args.logLevel,
+    'jellyfin-play: waiting for mpv to close before stopping the app',
+  );
+  await deps.waitForUnixSocketClosed(mpvSocketPath);
+  return deps.exitProcess(0);
 }
@@ -1121,6 +1121,21 @@ function clearOverlayManagedByLauncher(): void {
  state.overlayManagedByLauncher = false;
 }

+// For commands that start the app ahead of playback (the Jellyfin picker): the launcher now owns
+// it, as with local playback, and stops it when the launcher exits for any reason, including a
+// cancelled picker or Ctrl+C.
+export function adoptLauncherStartedApp(appPath: string, args: Args): void {
+  if (state.overlayManagedByLauncher) return;
+  markOverlayManagedByLauncher(appPath);
+  process.once('exit', () => stopManagedOverlayApp(args));
+  process.once('SIGINT', () => process.exit(130));
+  process.once('SIGTERM', () => process.exit(143));
+}
+
+export function isAppManagedByLauncher(): boolean {
+  return state.overlayManagedByLauncher;
+}
+
 function isAppAlreadyRunning(appPath: string, logLevel: LogLevel): boolean {
  const result = runSyncAppCommand(appPath, ['--app-ping'], false);
  if (result.error) {
@@ -1723,6 +1738,13 @@ export async function canConnectUnixSocket(socketPath: string): Promise<boolean>
  });
 }

+// Resolves once mpv stops accepting connections on its IPC socket, i.e. the player was closed.
+export async function waitForUnixSocketClosed(socketPath: string, pollMs = 1000): Promise<void> {
+  while (await canConnectUnixSocket(socketPath)) {
+    await sleep(pollMs);
+  }
+}
+
 export async function waitForUnixSocketReady(
  socketPath: string,
  timeoutMs: number,
@@ -30,12 +30,6 @@ test('parseArgs captures mpv args string', () => {
  assert.equal(parsed.mpvArgs, '--pause=yes --title="movie night"');
 });

-test('parseArgs appends CLI mpv profile to configured mpv profile', () => {
-  const parsed = parseArgs(['--profile', 'hdr'], 'subminer', {}, { profile: 'anime' });
-
-  assert.equal(parsed.profile, 'anime,hdr');
-});
-
 test('parseArgs maps root settings window option', () => {
  const parsed = parseArgs(['--settings'], 'subminer', {});

@@ -224,14 +218,6 @@ test('parseArgs maps stats cleanup to vocab mode by default', () => {
  assert.equal(parsed.statsCleanupVocab, true);
 });

-test('parseArgs maps explicit stats cleanup vocab flag', () => {
-  const parsed = parseArgs(['stats', 'cleanup', '-v'], 'subminer', {});
-
-  assert.equal(parsed.stats, true);
-  assert.equal(parsed.statsCleanup, true);
-  assert.equal(parsed.statsCleanupVocab, true);
-});
-
 test('parseArgs maps lifetime stats cleanup flag', () => {
  const parsed = parseArgs(['stats', 'cleanup', '--lifetime'], 'subminer', {});

@@ -119,11 +119,27 @@ export async function promptOptionalJellyfinSearch(
  themePath: string | null = null,
 ): Promise<string> {
  if (useRofi && commandExists('rofi')) {
-    const rofiArgs = ['-dmenu', '-i', '-p', formatRofiPrompt('Jellyfin Search (optional)')];
+    // Input-only prompt: the shipped theme pins a tall window and has no message widget, so
+    // drop the listview (an empty row there reads as "no results") and show the hint instead.
+    const inputOnlyTheme =
+      'window { height: 0; } mainbox { children: [inputbar, message]; } ' +
+      'message { background-color: transparent; padding: 10px 18px 4px 18px; } ' +
+      'textbox { background-color: transparent; }';
+    const rofiArgs = [
+      '-dmenu',
+      '-i',
+      '-p',
+      formatRofiPrompt('Jellyfin Search (optional)'),
+      '-mesg',
+      'Type to search, or press Enter to browse all',
+    ];
    if (themePath) {
-      rofiArgs.push('-theme', themePath);
+      rofiArgs.push('-theme', themePath, '-theme-str', inputOnlyTheme);
    } else {
-      rofiArgs.push('-theme-str', 'configuration { font: "Noto Sans CJK JP Regular 8";}');
+      rofiArgs.push(
+        '-theme-str',
+        `configuration { font: "Noto Sans CJK JP Regular 8";} ${inputOnlyTheme}`,
+      );
    }
    const result = spawnSync('rofi', rofiArgs, {
      input: '\n',
@@ -8,282 +8,168 @@ import {
  installManagedPluginAssetsViaApp,
 } from './runtime-plugin-preflight';

-test('ensureLinuxRuntimePluginAvailable is a no-op on non-Linux platforms', async () => {
-  const calls: string[] = [];
+type EnsureOptions = Parameters<typeof ensureLinuxRuntimePluginAvailable>[0];

-  await ensureLinuxRuntimePluginAvailable({
-    platform: 'darwin',
-    detectInstalledPlugin: () => {
-      calls.push('detect');
-      return false;
-    },
-    resolveRuntimePluginPath: () => {
-      calls.push('resolve');
-      return null;
-    },
-    installManagedPluginAssets: async () => {
-      calls.push('install');
-      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
-    },
-    log: () => {
-      calls.push('log');
-    },
-  });
-
-  assert.deepEqual(calls, []);
-});
-
-test('ensureLinuxRuntimePluginAvailable skips install when plugin, theme, and thumbnailer exist', async () => {
-  const calls: string[] = [];
-
-  await ensureLinuxRuntimePluginAvailable({
-    platform: 'linux',
-    detectInstalledPlugin: () => {
-      calls.push('detect');
-      return true;
-    },
-    resolveRuntimePluginPath: () => {
-      calls.push('resolve');
-      return null;
-    },
-    installManagedPluginAssets: async () => {
-      calls.push('install');
-      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
-    },
-    isManagedThemeAvailable: () => {
-      calls.push('theme');
-      return true;
-    },
-    isManagedThumbnailerAvailable: () => {
-      calls.push('thumbnailer');
-      return true;
-    },
-    log: () => {},
-  });
-
-  assert.deepEqual(calls, ['detect', 'theme', 'thumbnailer']);
-});
-
-test('ensureLinuxRuntimePluginAvailable skips install when all managed assets resolve', async () => {
-  const calls: string[] = [];
-
-  await ensureLinuxRuntimePluginAvailable({
-    platform: 'linux',
-    xdgDataHome: '/tmp/xdg-data',
-    detectInstalledPlugin: () => {
-      calls.push('detect');
-      return false;
-    },
-    resolveRuntimePluginPath: () => {
-      calls.push('resolve');
-      return '/tmp/plugin/main.lua';
-    },
-    installManagedPluginAssets: async () => {
-      calls.push('install');
-      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
-    },
-    isManagedThemeAvailable: () => {
-      calls.push('theme');
-      return true;
-    },
-    isManagedThumbnailerAvailable: () => {
-      calls.push('thumbnailer');
-      return true;
-    },
-    log: () => {},
-  });
-
-  assert.deepEqual(calls, ['detect', 'resolve', 'theme', 'thumbnailer']);
-});
-
-test('ensureLinuxRuntimePluginAvailable installs managed assets when rofi theme is missing', async () => {
-  const calls: string[] = [];
-  let themeAvailable = false;
-
-  await ensureLinuxRuntimePluginAvailable({
-    platform: 'linux',
-    xdgDataHome: '/tmp/xdg-data',
-    detectInstalledPlugin: () => {
-      calls.push('detect');
-      return false;
-    },
-    resolveRuntimePluginPath: () => {
-      calls.push('resolve');
-      return '/tmp/plugin/main.lua';
-    },
-    isManagedThemeAvailable: () => {
-      calls.push('theme');
-      return themeAvailable;
-    },
-    isManagedThumbnailerAvailable: () => {
-      calls.push('thumbnailer');
-      return true;
-    },
-    installManagedPluginAssets: async () => {
-      calls.push('install');
-      themeAvailable = true;
-      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
-    },
-    log: (level, _configured, message) => {
-      calls.push(`${level}:${message}`);
-    },
-  });
-
-  assert.deepEqual(calls, [
-    'detect',
-    'resolve',
-    'theme',
-    'info:Linux runtime support assets missing; installing managed plugin/theme/thumbnailer assets.',
-    'install',
-    'info:Managed Linux runtime support assets installed: plugin=/tmp/plugin/main.lua theme=/tmp/xdg-data/SubMiner/themes/subminer.rasi thumbnailer=/tmp/xdg-data/SubMiner/thumbnailers/subminer-ffmpegthumbnailer.thumbnailer',
-    'resolve',
-    'theme',
-    'thumbnailer',
-  ]);
-});
-
-test('ensureLinuxRuntimePluginAvailable installs managed assets when thumbnailer is missing', async () => {
-  const calls: string[] = [];
-  let thumbnailerAvailable = false;
-
-  await ensureLinuxRuntimePluginAvailable({
-    platform: 'linux',
-    xdgDataHome: '/tmp/xdg-data',
-    detectInstalledPlugin: () => true,
-    resolveRuntimePluginPath: () => '/tmp/plugin/main.lua',
-    isManagedThemeAvailable: () => true,
-    isManagedThumbnailerAvailable: () => thumbnailerAvailable,
-    installManagedPluginAssets: async () => {
-      calls.push('install');
-      thumbnailerAvailable = true;
-      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
-    },
-    log: (_level, _configured, message) => {
-      calls.push(message);
-    },
-  });
-
-  assert.deepEqual(calls, [
-    'Linux runtime support assets missing; installing managed plugin/theme/thumbnailer assets.',
-    'install',
-    'Managed Linux runtime support assets installed: plugin=/tmp/plugin/main.lua theme=/tmp/xdg-data/SubMiner/themes/subminer.rasi thumbnailer=/tmp/xdg-data/SubMiner/thumbnailers/subminer-ffmpegthumbnailer.thumbnailer',
-  ]);
-});
-
-test('ensureLinuxRuntimePluginAvailable retains an installed plugin after installing support assets', async () => {
-  const calls: string[] = [];
-  let thumbnailerAvailable = false;
-
-  await ensureLinuxRuntimePluginAvailable({
-    platform: 'linux',
-    xdgDataHome: '/tmp/xdg-data',
-    detectInstalledPlugin: () => true,
-    resolveRuntimePluginPath: () => {
-      calls.push('resolve');
-      return null;
-    },
-    isManagedThemeAvailable: () => true,
-    isManagedThumbnailerAvailable: () => thumbnailerAvailable,
-    installManagedPluginAssets: async () => {
-      calls.push('install');
-      thumbnailerAvailable = true;
-      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
-    },
-    log: () => {},
-  });
-
-  assert.deepEqual(calls, ['install']);
-});
-
-test('ensureLinuxRuntimePluginAvailable installs managed assets and re-resolves plugin path', async () => {
-  const calls: string[] = [];
-  let resolveCount = 0;
-
-  await ensureLinuxRuntimePluginAvailable({
+/**
+ * Linux preflight harness: by default every managed asset resolves, so tests override only
+ * the probes that should report something missing. Counts installs and collects log messages.
+ */
+function makeEnsureHarness(overrides: Partial<EnsureOptions> = {}) {
+  const state = { installs: 0, logs: [] as string[] };
+  const options: EnsureOptions = {
    platform: 'linux',
    xdgDataHome: '/tmp/xdg-data',
    detectInstalledPlugin: () => false,
-    resolveRuntimePluginPath: () => {
-      resolveCount += 1;
-      calls.push(`resolve:${resolveCount}`);
-      return resolveCount === 1 ? null : '/tmp/plugin/main.lua';
-    },
+    resolveRuntimePluginPath: () => '/tmp/plugin/main.lua',
    isManagedThemeAvailable: () => true,
    isManagedThumbnailerAvailable: () => true,
    installManagedPluginAssets: async () => {
-      calls.push('install');
+      state.installs += 1;
      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
    },
-    log: (level, _configured, message) => {
-      calls.push(`${level}:${message}`);
+    log: (_level, _configured, message) => {
+      state.logs.push(message);
+    },
+    ...overrides,
+  };
+  return { state, run: () => ensureLinuxRuntimePluginAvailable(options) };
+}
+
+test('ensureLinuxRuntimePluginAvailable is a no-op on non-Linux platforms', async () => {
+  const unexpected = () => {
+    throw new Error('probed on a non-Linux platform');
+  };
+  const harness = makeEnsureHarness({
+    platform: 'darwin',
+    detectInstalledPlugin: unexpected,
+    resolveRuntimePluginPath: unexpected,
+    isManagedThemeAvailable: unexpected,
+    isManagedThumbnailerAvailable: unexpected,
+  });
+
+  await harness.run();
+
+  assert.equal(harness.state.installs, 0);
+  assert.deepEqual(harness.state.logs, []);
+});
+
+const skipInstallCases: Array<{ name: string; overrides: Partial<EnsureOptions> }> = [
+  {
+    name: 'plugin, theme, and thumbnailer exist',
+    overrides: { detectInstalledPlugin: () => true, resolveRuntimePluginPath: () => null },
+  },
+  { name: 'all managed assets resolve', overrides: {} },
+];
+
+for (const c of skipInstallCases) {
+  test(`ensureLinuxRuntimePluginAvailable skips install when ${c.name}`, async () => {
+    const harness = makeEnsureHarness(c.overrides);
+
+    await harness.run();
+
+    assert.equal(harness.state.installs, 0);
+    assert.deepEqual(harness.state.logs, []);
+  });
+}
+
+const installWhenMissingCases: Array<{ name: string; missing: 'theme' | 'thumbnailer' }> = [
+  { name: 'rofi theme is missing', missing: 'theme' },
+  { name: 'thumbnailer is missing', missing: 'thumbnailer' },
+];
+
+for (const c of installWhenMissingCases) {
+  test(`ensureLinuxRuntimePluginAvailable installs managed assets when ${c.name}`, async () => {
+    let available = false;
+    const probe = {
+      [c.missing === 'theme' ? 'isManagedThemeAvailable' : 'isManagedThumbnailerAvailable']: () =>
+        available,
+    };
+    const harness = makeEnsureHarness({
+      ...probe,
+      installManagedPluginAssets: async () => {
+        harness.state.installs += 1;
+        available = true;
+        return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
+      },
+    });
+
+    await harness.run();
+
+    assert.equal(harness.state.installs, 1);
+    assert.equal(harness.state.logs.length, 2);
+    assert.match(harness.state.logs[0]!, /support assets missing; installing/);
+    assert.match(
+      harness.state.logs[1]!,
+      /installed: plugin=\/tmp\/plugin\/main\.lua theme=.*subminer\.rasi thumbnailer=.*\.thumbnailer/,
+    );
+  });
+}
+
+test('ensureLinuxRuntimePluginAvailable retains an installed plugin after installing support assets', async () => {
+  let thumbnailerAvailable = false;
+  const harness = makeEnsureHarness({
+    detectInstalledPlugin: () => true,
+    // An installed plugin means the bundled path is never needed, even after the install.
+    resolveRuntimePluginPath: () => null,
+    isManagedThumbnailerAvailable: () => thumbnailerAvailable,
+    installManagedPluginAssets: async () => {
+      harness.state.installs += 1;
+      thumbnailerAvailable = true;
+      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
    },
  });

-  assert.deepEqual(calls, [
-    'resolve:1',
-    'info:Linux runtime support assets missing; installing managed plugin/theme/thumbnailer assets.',
-    'install',
-    'info:Managed Linux runtime support assets installed: plugin=/tmp/plugin/main.lua theme=/tmp/xdg-data/SubMiner/themes/subminer.rasi thumbnailer=/tmp/xdg-data/SubMiner/thumbnailers/subminer-ffmpegthumbnailer.thumbnailer',
-    'resolve:2',
-  ]);
+  await harness.run();
+
+  assert.equal(harness.state.installs, 1);
 });

-test('ensureLinuxRuntimePluginAvailable fails when install result is not ok', async () => {
-  await assert.rejects(
-    () =>
-      ensureLinuxRuntimePluginAvailable({
-        platform: 'linux',
-        detectInstalledPlugin: () => false,
-        resolveRuntimePluginPath: () => null,
-        installManagedPluginAssets: async () => ({
-          ok: false,
-          status: 'failed',
-          error: 'copy failed',
-        }),
-        log: () => {},
-      }),
-    /copy failed/,
-  );
+test('ensureLinuxRuntimePluginAvailable installs managed assets and re-resolves plugin path', async () => {
+  let installed = false;
+  const harness = makeEnsureHarness({
+    resolveRuntimePluginPath: () => (installed ? '/tmp/plugin/main.lua' : null),
+    installManagedPluginAssets: async () => {
+      harness.state.installs += 1;
+      installed = true;
+      return { ok: true, status: 'installed', path: '/tmp/plugin/main.lua' };
+    },
+  });
+
+  await harness.run();
+
+  assert.equal(harness.state.installs, 1);
 });

-test('ensureLinuxRuntimePluginAvailable fails when runtime path remains unresolved after install', async () => {
-  await assert.rejects(
-    () =>
-      ensureLinuxRuntimePluginAvailable({
-        platform: 'linux',
-        detectInstalledPlugin: () => false,
-        resolveRuntimePluginPath: () => null,
-        installManagedPluginAssets: async () => ({
-          ok: true,
-          status: 'installed',
-          path: '/tmp/plugin/main.lua',
-        }),
-        log: () => {},
+const failureCases: Array<{ name: string; overrides: Partial<EnsureOptions>; error: RegExp }> = [
+  {
+    name: 'install result is not ok',
+    overrides: {
+      resolveRuntimePluginPath: () => null,
+      installManagedPluginAssets: async () => ({
+        ok: false,
+        status: 'failed',
+        error: 'copy failed',
      }),
-    /managed runtime plugin assets could not be installed/i,
-  );
-});
+    },
+    error: /copy failed/,
+  },
+  {
+    name: 'runtime path remains unresolved after install',
+    overrides: { resolveRuntimePluginPath: () => null },
+    error: /managed runtime plugin assets could not be installed/i,
+  },
+  {
+    name: 'thumbnailer remains missing after install',
+    overrides: { detectInstalledPlugin: () => true, isManagedThumbnailerAvailable: () => false },
+    error: /thumbnailer=.*subminer-ffmpegthumbnailer\.thumbnailer/i,
+  },
+];

-test('ensureLinuxRuntimePluginAvailable fails when thumbnailer remains missing after install', async () => {
-  await assert.rejects(
-    () =>
-      ensureLinuxRuntimePluginAvailable({
-        platform: 'linux',
-        xdgDataHome: '/tmp/xdg-data',
-        detectInstalledPlugin: () => true,
-        resolveRuntimePluginPath: () => '/tmp/plugin/main.lua',
-        isManagedThemeAvailable: () => true,
-        isManagedThumbnailerAvailable: () => false,
-        installManagedPluginAssets: async () => ({
-          ok: true,
-          status: 'installed',
-          path: '/tmp/plugin/main.lua',
-        }),
-        log: () => {},
-      }),
-    /thumbnailer=.*subminer-ffmpegthumbnailer\.thumbnailer/i,
-  );
-});
+for (const c of failureCases) {
+  test(`ensureLinuxRuntimePluginAvailable fails when ${c.name}`, async () => {
+    await assert.rejects(() => makeEnsureHarness(c.overrides).run(), c.error);
+  });
+}

 test('ensureLinuxRuntimePluginAvailable rejects a thumbnailer directory before and after install', async () => {
  const xdgDataHome = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-thumbnailer-directory-'));
@@ -3,104 +3,90 @@ import assert from 'node:assert/strict';
 import { ensureLauncherSetupReady, waitForSetupCompletion } from './setup-gate';
 import type { SetupState } from '../src/shared/setup-state';

-const commandLineSetupDefaults = {
-  bunInstallStatus: 'unknown',
-  launcherInstallStatus: 'unknown',
-  launcherInstallPath: null,
-} satisfies Pick<SetupState, 'bunInstallStatus' | 'launcherInstallStatus' | 'launcherInstallPath'>;
+/** An in-progress setup state; tests override only the fields that matter. */
+function makeState(overrides: Partial<SetupState> = {}): SetupState {
+  return {
+    version: 4,
+    status: 'in_progress',
+    completedAt: null,
+    completionSource: null,
+    yomitanSetupMode: null,
+    lastSeenYomitanDictionaryCount: 0,
+    pluginInstallStatus: 'unknown',
+    pluginInstallPathSummary: null,
+    windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
+    windowsMpvShortcutLastStatus: 'unknown',
+    bunInstallStatus: 'unknown',
+    launcherInstallStatus: 'unknown',
+    launcherInstallPath: null,
+    ...overrides,
+  };
+}

-test('waitForSetupCompletion resolves completed and cancelled states', async () => {
-  const sequence: Array<SetupState | null> = [
-    null,
-    {
-      version: 4,
-      status: 'in_progress',
-      completedAt: null,
-      completionSource: null,
-      yomitanSetupMode: null,
-      lastSeenYomitanDictionaryCount: 0,
-      pluginInstallStatus: 'unknown',
-      pluginInstallPathSummary: null,
-      windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-      windowsMpvShortcutLastStatus: 'unknown',
-      ...commandLineSetupDefaults,
-    },
-    {
-      version: 4,
-      status: 'completed',
-      completedAt: '2026-03-07T00:00:00.000Z',
-      completionSource: 'user',
-      yomitanSetupMode: 'internal',
-      lastSeenYomitanDictionaryCount: 1,
-      pluginInstallStatus: 'skipped',
-      pluginInstallPathSummary: null,
-      windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-      windowsMpvShortcutLastStatus: 'skipped',
-      ...commandLineSetupDefaults,
-    },
-  ];
+function completedState(overrides: Partial<SetupState> = {}): SetupState {
+  return makeState({
+    status: 'completed',
+    completedAt: '2026-03-07T00:00:00.000Z',
+    completionSource: 'user',
+    yomitanSetupMode: 'internal',
+    lastSeenYomitanDictionaryCount: 1,
+    ...overrides,
+  });
+}

-  const result = await waitForSetupCompletion({
-    readSetupState: () => sequence.shift() ?? null,
+const cancelledState = () => makeState({ status: 'cancelled' });
+
+/** Deterministic clock: every `now()` advances 100ms and `sleep` returns immediately. */
+function fakeClock() {
+  let value = 0;
+  return {
    sleep: async () => undefined,
-    now: (() => {
-      let value = 0;
-      return () => (value += 100);
-    })(),
+    now: () => (value += 100),
    timeoutMs: 5_000,
    pollIntervalMs: 100,
-  });
+  };
+}

-  assert.equal(result, 'completed');
-});
+/** Reader that serves `states` in order, then repeats the last one; counts its reads. */
+function sequenceReader(states: Array<SetupState | null>) {
+  const reader = {
+    reads: 0,
+    read: (): SetupState | null => states[Math.min(reader.reads++, states.length - 1)] ?? null,
+  };
+  return reader;
+}
+
+for (const c of [
+  { name: 'completed', last: completedState(), expected: 'completed' },
+  { name: 'cancelled', last: cancelledState(), expected: 'cancelled' },
+] as const) {
+  test(`waitForSetupCompletion resolves ${c.name} state after polling through earlier states`, async () => {
+    const reader = sequenceReader([null, makeState(), c.last]);
+
+    const result = await waitForSetupCompletion({
+      readSetupState: reader.read,
+      ...fakeClock(),
+    });
+
+    assert.equal(result, c.expected);
+    assert.equal(reader.reads, 3);
+  });
+}

 test('ensureLauncherSetupReady launches setup app and resumes only after completion', async () => {
  const calls: string[] = [];
-  let reads = 0;
+  const reader = sequenceReader([
+    null,
+    makeState(),
+    completedState({ pluginInstallStatus: 'installed', pluginInstallPathSummary: '/tmp/mpv' }),
+  ]);

  const ready = await ensureLauncherSetupReady({
-    readSetupState: () => {
-      reads += 1;
-      if (reads === 1) return null;
-      if (reads === 2) {
-        return {
-          version: 4,
-          status: 'in_progress',
-          completedAt: null,
-          completionSource: null,
-          yomitanSetupMode: null,
-          lastSeenYomitanDictionaryCount: 0,
-          pluginInstallStatus: 'unknown',
-          pluginInstallPathSummary: null,
-          windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-          windowsMpvShortcutLastStatus: 'unknown',
-          ...commandLineSetupDefaults,
-        };
-      }
-      return {
-        version: 4,
-        status: 'completed',
-        completedAt: '2026-03-07T00:00:00.000Z',
-        completionSource: 'user',
-        yomitanSetupMode: 'internal',
-        lastSeenYomitanDictionaryCount: 1,
-        pluginInstallStatus: 'installed',
-        pluginInstallPathSummary: '/tmp/mpv',
-        windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-        windowsMpvShortcutLastStatus: 'installed',
-        ...commandLineSetupDefaults,
-      };
-    },
+    readSetupState: reader.read,
    launchSetupApp: () => {
      calls.push('launch');
    },
-    sleep: async () => undefined,
-    now: (() => {
-      let value = 0;
-      return () => (value += 100);
-    })(),
-    timeoutMs: 5_000,
-    pollIntervalMs: 100,
+    ...fakeClock(),
  });

  assert.equal(ready, true);
@@ -116,10 +102,7 @@ test('ensureLauncherSetupReady bypasses setup gate when external yomitan is conf
    launchSetupApp: () => {
      calls.push('launch');
    },
-    sleep: async () => undefined,
-    now: () => 0,
-    timeoutMs: 5_000,
-    pollIntervalMs: 100,
+    ...fakeClock(),
  });

  assert.equal(ready, true);
@@ -129,76 +112,47 @@ test('ensureLauncherSetupReady bypasses setup gate when external yomitan is conf
 test('ensureLauncherSetupReady waits for finish after legacy mpv plugin removal', async () => {
  const calls: string[] = [];
  let legacyPluginInstalled = true;
-  let reads = 0;
+  // The completion timestamp moves forward once the setup app has finished.
+  const reader = sequenceReader([
+    completedState({ yomitanSetupMode: null, lastSeenYomitanDictionaryCount: 0 }),
+    completedState({ yomitanSetupMode: null, lastSeenYomitanDictionaryCount: 0 }),
+    completedState({
+      completedAt: '2026-05-12T14:40:00.000Z',
+      yomitanSetupMode: null,
+      lastSeenYomitanDictionaryCount: 0,
+    }),
+  ]);

  const ready = await ensureLauncherSetupReady({
-    readSetupState: () => {
-      reads += 1;
-      return {
-        version: 4,
-        status: 'completed',
-        completedAt: reads < 3 ? '2026-03-07T00:00:00.000Z' : '2026-05-12T14:40:00.000Z',
-        completionSource: 'user',
-        yomitanSetupMode: null,
-        lastSeenYomitanDictionaryCount: 0,
-        pluginInstallStatus: 'unknown',
-        pluginInstallPathSummary: null,
-        windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-        windowsMpvShortcutLastStatus: 'unknown',
-        ...commandLineSetupDefaults,
-      };
-    },
+    readSetupState: reader.read,
    hasLegacyMpvPlugin: () => legacyPluginInstalled,
    launchSetupApp: () => {
      calls.push('launch');
      legacyPluginInstalled = false;
    },
-    sleep: async () => undefined,
-    now: (() => {
-      let value = 0;
-      return () => (value += 100);
-    })(),
-    timeoutMs: 5_000,
-    pollIntervalMs: 100,
+    ...fakeClock(),
  });

  assert.equal(ready, true);
  assert.deepEqual(calls, ['launch']);
-  assert.equal(reads >= 3, true);
+  assert.equal(reader.reads >= 3, true);
 });

 test('ensureLauncherSetupReady lets users continue without removing a legacy mpv plugin', async () => {
  const calls: string[] = [];
-  let reads = 0;
+  const reader = sequenceReader([
+    completedState({ lastSeenYomitanDictionaryCount: 2 }),
+    completedState({ lastSeenYomitanDictionaryCount: 2 }),
+    completedState({ completedAt: '2026-05-12T14:30:00.000Z', lastSeenYomitanDictionaryCount: 2 }),
+  ]);

  const ready = await ensureLauncherSetupReady({
-    readSetupState: () => {
-      reads += 1;
-      return {
-        version: 4,
-        status: 'completed',
-        completedAt: reads < 3 ? '2026-03-07T00:00:00.000Z' : '2026-05-12T14:30:00.000Z',
-        completionSource: 'user',
-        yomitanSetupMode: 'internal',
-        lastSeenYomitanDictionaryCount: 2,
-        pluginInstallStatus: 'unknown',
-        pluginInstallPathSummary: null,
-        windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-        windowsMpvShortcutLastStatus: 'unknown',
-        ...commandLineSetupDefaults,
-      };
-    },
+    readSetupState: reader.read,
    hasLegacyMpvPlugin: () => true,
    launchSetupApp: () => {
      calls.push('launch');
    },
-    sleep: async () => undefined,
-    now: (() => {
-      let value = 0;
-      return () => (value += 100);
-    })(),
-    timeoutMs: 5_000,
-    pollIntervalMs: 100,
+    ...fakeClock(),
  });

  assert.equal(ready, true);
@@ -207,90 +161,30 @@ test('ensureLauncherSetupReady lets users continue without removing a legacy mpv

 test('ensureLauncherSetupReady fails on timeout/cancelled state', async () => {
  const result = await ensureLauncherSetupReady({
-    readSetupState: () => ({
-      version: 4,
-      status: 'cancelled',
-      completedAt: null,
-      completionSource: null,
-      yomitanSetupMode: null,
-      lastSeenYomitanDictionaryCount: 0,
-      pluginInstallStatus: 'unknown',
-      pluginInstallPathSummary: null,
-      windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-      windowsMpvShortcutLastStatus: 'unknown',
-      ...commandLineSetupDefaults,
-    }),
+    readSetupState: cancelledState,
    launchSetupApp: () => undefined,
-    sleep: async () => undefined,
-    now: (() => {
-      let value = 0;
-      return () => (value += 100);
-    })(),
-    timeoutMs: 5_000,
-    pollIntervalMs: 100,
+    ...fakeClock(),
  });

  assert.equal(result, false);
 });

 test('ensureLauncherSetupReady ignores stale cancelled state after launching setup app', async () => {
-  let reads = 0;
+  const reader = sequenceReader([
+    cancelledState(),
+    cancelledState(),
+    makeState(),
+    completedState({
+      completionSource: 'legacy_auto_detected',
+      pluginInstallStatus: 'installed',
+      pluginInstallPathSummary: '/tmp/mpv',
+    }),
+  ]);

  const result = await ensureLauncherSetupReady({
-    readSetupState: () => {
-      reads += 1;
-      if (reads <= 2) {
-        return {
-          version: 4,
-          status: 'cancelled',
-          completedAt: null,
-          completionSource: null,
-          yomitanSetupMode: null,
-          lastSeenYomitanDictionaryCount: 0,
-          pluginInstallStatus: 'unknown',
-          pluginInstallPathSummary: null,
-          windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-          windowsMpvShortcutLastStatus: 'unknown',
-          ...commandLineSetupDefaults,
-        };
-      }
-      if (reads === 3) {
-        return {
-          version: 4,
-          status: 'in_progress',
-          completedAt: null,
-          completionSource: null,
-          yomitanSetupMode: null,
-          lastSeenYomitanDictionaryCount: 0,
-          pluginInstallStatus: 'unknown',
-          pluginInstallPathSummary: null,
-          windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-          windowsMpvShortcutLastStatus: 'unknown',
-          ...commandLineSetupDefaults,
-        };
-      }
-      return {
-        version: 4,
-        status: 'completed',
-        completedAt: '2026-03-07T00:00:00.000Z',
-        completionSource: 'legacy_auto_detected',
-        yomitanSetupMode: 'internal',
-        lastSeenYomitanDictionaryCount: 1,
-        pluginInstallStatus: 'installed',
-        pluginInstallPathSummary: '/tmp/mpv',
-        windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
-        windowsMpvShortcutLastStatus: 'unknown',
-        ...commandLineSetupDefaults,
-      };
-    },
+    readSetupState: reader.read,
    launchSetupApp: () => undefined,
-    sleep: async () => undefined,
-    now: (() => {
-      let value = 0;
-      return () => (value += 100);
-    })(),
-    timeoutMs: 5_000,
-    pollIntervalMs: 100,
+    ...fakeClock(),
  });

  assert.equal(result, true);
@@ -9,7 +9,6 @@ import {
  createDefaultSetupState,
  getDefaultConfigDir,
  getSetupStatePath,
-  readSetupState,
  writeSetupState,
 } from '../src/shared/setup-state.js';

@@ -407,65 +406,65 @@ setInterval(() => {}, 1000);
  };
 }

-test('launcher smoke fixture seeds completed setup state', () => {
-  const smokeCase = createSmokeCase('setup-state');
+/**
+ * Some sandboxes forbid binding unix sockets (EPERM). The fake mpv needs one, so these tests
+ * cannot pass there; probe once and skip them instead of weakening every assertion.
+ */
+function unixSocketsDenied(): boolean {
+  if (process.platform === 'win32') return false;
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-sock-probe-'));
  try {
-    const configDir = getDefaultConfigDir({
-      xdgConfigHome: smokeCase.xdgConfigHome,
-      homeDir: smokeCase.homeDir,
-    });
-    const statePath = getSetupStatePath(configDir);
-
-    assert.equal(readSetupState(statePath)?.status, 'completed');
+    const probe = spawnSync(
+      process.execPath,
+      [
+        '-e',
+        `require('node:net').createServer().on('error', (e) => { process.stderr.write(String(e)); process.exit(1); }).listen(${JSON.stringify(path.join(dir, 's.sock'))}, function () { this.close(() => process.exit(0)); });`,
+      ],
+      { encoding: 'utf8', timeout: 5000 },
+    );
+    return probe.status !== 0 && /eperm|operation not permitted/i.test(probe.stderr);
  } finally {
-    fs.rmSync(smokeCase.root, { recursive: true, force: true });
-    fs.rmSync(smokeCase.socketDir, { recursive: true, force: true });
+    fs.rmSync(dir, { recursive: true, force: true });
  }
-});
+}

-test('launcher mpv status returns ready when socket is connectable', async () => {
-  await withSmokeCase('mpv-status', async (smokeCase) => {
-    const env = makeTestEnv(smokeCase);
-    const fakeMpv = spawn(smokeCase.fakeMpvPath, [`--input-ipc-server=${smokeCase.socketPath}`], {
-      env,
-      stdio: 'ignore',
-    });
+const skipWithoutUnixSockets = unixSocketsDenied() ? 'sandbox denies unix socket binding' : false;

-    try {
-      await waitForSocketReady(smokeCase.socketPath);
-      const result = runLauncher(
-        smokeCase,
-        ['mpv', 'status', '--log-level', 'debug'],
+test(
+  'launcher mpv status returns ready when socket is connectable',
+  { skip: skipWithoutUnixSockets },
+  async () => {
+    await withSmokeCase('mpv-status', async (smokeCase) => {
+      const env = makeTestEnv(smokeCase);
+      const fakeMpv = spawn(smokeCase.fakeMpvPath, [`--input-ipc-server=${smokeCase.socketPath}`], {
        env,
-        'mpv-status',
-      );
-      const fakeMpvEntries = readJsonLines(path.join(smokeCase.artifactsDir, 'fake-mpv.log'));
-      const fakeMpvError = fakeMpvEntries.find(
-        (entry): entry is { error: string } => typeof entry.error === 'string',
-      )?.error;
-      const unixSocketDenied =
-        typeof fakeMpvError === 'string' && /eperm|operation not permitted/i.test(fakeMpvError);
+        stdio: 'ignore',
+      });

-      if (unixSocketDenied) {
-        assert.equal(result.status, 1);
-        assert.match(result.stdout, /socket not ready/i);
-      } else {
+      try {
+        await waitForSocketReady(smokeCase.socketPath);
+        const result = runLauncher(
+          smokeCase,
+          ['mpv', 'status', '--log-level', 'debug'],
+          env,
+          'mpv-status',
+        );
        assert.equal(result.status, 0);
        assert.match(result.stdout, /socket ready/i);
+      } finally {
+        if (fakeMpv.exitCode === null) {
+          await new Promise<void>((resolve) => {
+            fakeMpv.once('close', () => resolve());
+          });
+        }
      }
-    } finally {
-      if (fakeMpv.exitCode === null) {
-        await new Promise<void>((resolve) => {
-          fakeMpv.once('close', () => resolve());
-        });
-      }
-    }
-  });
-});
+    });
+  },
+);

 test(
  'launcher start-overlay run forwards socket/backend and stops owned background app after mpv exits',
-  { timeout: LONG_SMOKE_TEST_TIMEOUT_MS },
+  { timeout: LONG_SMOKE_TEST_TIMEOUT_MS, skip: skipWithoutUnixSockets },
  async () => {
    await withSmokeCase('overlay-start-stop', async (smokeCase) => {
      const env = makeTestEnv(smokeCase);
@@ -484,13 +483,8 @@ test(
      const appStartEntries = readJsonLines(appStartPath);
      const appStopEntries = readJsonLines(appStopPath);
      const mpvEntries = readJsonLines(path.join(smokeCase.artifactsDir, 'fake-mpv.log'));
-      const mpvError = mpvEntries.find(
-        (entry): entry is { error: string } => typeof entry.error === 'string',
-      )?.error;
-      const unixSocketDenied =
-        typeof mpvError === 'string' && /eperm|operation not permitted/i.test(mpvError);

-      assert.equal(result.status, unixSocketDenied ? 3 : 0);
+      assert.equal(result.status, 0);
      assert.match(result.stdout, /Starting SubMiner overlay/i);

      assert.equal(appStartEntries.length, 1);
@@ -523,7 +517,7 @@ test(

 test(
  'launcher start-overlay attaches to a running background app without spawning another app start command',
-  { timeout: LONG_SMOKE_TEST_TIMEOUT_MS },
+  { timeout: LONG_SMOKE_TEST_TIMEOUT_MS, skip: skipWithoutUnixSockets },
  async () => {
    await withSmokeCase('overlay-borrow-background', async (smokeCase) => {
      const controlServer = await startFakeControlServer(smokeCase);
@@ -550,13 +544,8 @@ test(
        const appStopEntries = readJsonLines(appStopPath);
        const controlEntries = readJsonLines(controlServer.logPath);
        const mpvEntries = readJsonLines(path.join(smokeCase.artifactsDir, 'fake-mpv.log'));
-        const mpvError = mpvEntries.find(
-          (entry): entry is { error: string } => typeof entry.error === 'string',
-        )?.error;
-        const unixSocketDenied =
-          typeof mpvError === 'string' && /eperm|operation not permitted/i.test(mpvError);

-        assert.equal(result.status, unixSocketDenied ? 3 : 0);
+        assert.equal(result.status, 0);
        if (process.platform === 'linux') {
          assert.equal(appEntries.length > 0, true);
          assert.equal(
@@ -583,7 +572,7 @@ test(

 test(
  'launcher starts mpv paused when plugin auto-start visible overlay gate is enabled',
-  { timeout: LONG_SMOKE_TEST_TIMEOUT_MS },
+  { timeout: LONG_SMOKE_TEST_TIMEOUT_MS, skip: skipWithoutUnixSockets },
  async () => {
    await withSmokeCase('autoplay-ready-gate', async (smokeCase) => {
      fs.writeFileSync(
@@ -607,14 +596,9 @@ test(
      );

      const mpvEntries = readJsonLines(path.join(smokeCase.artifactsDir, 'fake-mpv.log'));
-      const mpvError = mpvEntries.find(
-        (entry): entry is { error: string } => typeof entry.error === 'string',
-      )?.error;
-      const unixSocketDenied =
-        typeof mpvError === 'string' && /eperm|operation not permitted/i.test(mpvError);
      const mpvFirstArgs = mpvEntries[0]?.argv;

-      assert.equal(result.status, unixSocketDenied ? 3 : 0);
+      assert.equal(result.status, 0);
      assert.equal(Array.isArray(mpvFirstArgs), true);
      assert.equal((mpvFirstArgs as string[]).includes('--pause=yes'), true);
      assert.match(
@@ -0,0 +1,7 @@
+import { parseArgs } from '../config.js';
+import type { Args } from '../types.js';
+
+/** Default launcher `Args` (as if run with no CLI input), with `overrides` applied. */
+export function makeLauncherArgs(overrides: Partial<Args> = {}): Args {
+  return { ...parseArgs([], 'subminer', {}), ...overrides };
+}
@@ -0,0 +1,25 @@
+/**
+ * Runs `run` with the given process env values (`undefined` deletes a key) and restores the
+ * originals afterwards, even if `run` throws or rejects.
+ */
+export async function withEnv<T>(
+  overrides: Record<string, string | undefined>,
+  run: () => T | Promise<T>,
+): Promise<T> {
+  const originals = Object.fromEntries(
+    Object.keys(overrides).map((key) => [key, process.env[key]]),
+  );
+  const apply = (values: Record<string, string | undefined>): void => {
+    for (const [key, value] of Object.entries(values)) {
+      if (value === undefined) delete process.env[key];
+      else process.env[key] = value;
+    }
+  };
+
+  apply(overrides);
+  try {
+    return await run();
+  } finally {
+    apply(originals);
+  }
+}
@@ -5,7 +5,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { Database as BunDatabase } from 'bun:sqlite';
 import { ensureSchema } from '../../src/core/services/immersion-tracker/storage.js';
-import { createImmersionDbFixture, insertFixtureSession } from './immersion-db-fixture.js';
+import { createImmersionDbFixture } from './immersion-db-fixture.js';

 type SchemaRow = { type: string; name: string; tbl_name: string; sql: string | null };

@@ -108,65 +108,3 @@ test('fixture schema stays aligned with production sync-touched tables and index
    fs.rmSync(dir, { recursive: true, force: true });
  }
 });
-
-test('fixture leaves lexical rollups pending when their table is absent', () => {
-  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-fixture-rollup-state-'));
-  const fixturePath = path.join(dir, 'fixture.sqlite');
-  try {
-    createImmersionDbFixture(fixturePath);
-    const db = new BunDatabase(fixturePath, { readonly: true });
-    try {
-      const state = db
-        .query<{ state_value: string }>(
-          `SELECT state_value FROM imm_rollup_state
-           WHERE state_key = 'lexical_daily_rollups_version'`,
-        )
-        .get();
-      const rollupTable = db
-        .query<{ name: string }>(
-          `SELECT name FROM sqlite_schema
-           WHERE type = 'table' AND name = 'imm_lexical_daily_rollups'`,
-        )
-        .get();
-
-      assert.equal(state?.state_value, '0');
-      assert.equal(rollupTable, null);
-    } finally {
-      db.close();
-    }
-  } finally {
-    fs.rmSync(dir, { recursive: true, force: true });
-  }
-});
-
-test('fixture session inserts enforce foreign keys', () => {
-  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-fixture-foreign-keys-'));
-  const fixturePath = path.join(dir, 'fixture.sqlite');
-  try {
-    createImmersionDbFixture(fixturePath);
-    const db = new BunDatabase(fixturePath, { readwrite: true });
-    try {
-      db.run(`
-        CREATE TRIGGER remove_fixture_video
-        BEFORE INSERT ON imm_sessions
-        BEGIN
-          DELETE FROM imm_videos WHERE video_id = NEW.video_id;
-        END
-      `);
-    } finally {
-      db.close();
-    }
-
-    assert.throws(
-      () =>
-        insertFixtureSession(fixturePath, {
-          uuid: 'foreign-key-check',
-          videoKey: 'foreign-key-check',
-          startedAtMs: Date.UTC(2026, 6, 9),
-        }),
-      /FOREIGN KEY constraint failed/,
-    );
-  } finally {
-    fs.rmSync(dir, { recursive: true, force: true });
-  }
-});
@@ -2,7 +2,7 @@
  "name": "subminer",
  "productName": "SubMiner",
  "desktopName": "SubMiner.desktop",
-  "version": "0.20.1-beta.1",
+  "version": "0.20.1",
  "description": "All-in-one sentence mining overlay with AnkiConnect and dictionary integration",
  "packageManager": "bun@1.3.5",
  "main": "dist/main-entry.js",
@@ -62,6 +62,8 @@
    "test:launcher:unit:src": "bun scripts/run-test-lane.mjs bun-launcher-unit",
    "test:scripts": "bun scripts/run-test-lane.mjs scripts",
    "test:stats": "bun scripts/run-test-lane.mjs stats",
+    "test:e2e": "bun scripts/run-test-lane.mjs e2e --jobs 1",
+    "e2e": "bun e2e/cli.ts",
    "test:env": "bun run test:launcher:smoke:src && bun run test:plugin:src && bun run test:immersion:sqlite:src",
    "test:runtime:compat": "bun run test:smoke:dist",
    "test": "bun run test:fast",
@@ -128,7 +130,7 @@
    "@electron/asar": "3.4.1",
    "@types/node": "^24.10.0",
    "@types/ws": "^8.18.1",
-    "electron": "42.10.0",
+    "electron": "43.7.7",
    "electron-builder": "26.16.1",
    "esbuild": "^0.25.12",
    "eslint": "^10.8.0",
@@ -1,73 +1,76 @@
 > This is a prerelease build for testing. Stable changelog and docs-site updates remain pending until the final stable release.

-<!-- prerelease-version: 0.20.1-beta.1 -->
+<!-- prerelease-version: 0.20.1-beta.2; since: v0.20.1-beta.1 -->
+
+## Changes since v0.20.1-beta.1
+
+- Upgraded the desktop runtime to Electron 43.7.7.
+- SubMiner now refuses to start on an unsupported Electron runtime, or after an Electron major or minor downgrade, so your Yomitan profile data stays safe; patch downgrades are still allowed.
+- Automatic character-dictionary updates now stop if a Yomitan profile that had dictionaries suddenly reports none.
+- Development launches now use a separate `SubMiner-dev` profile unless you explicitly ask for the production profile.
+- Sentence mining (single and multi-line) no longer counts each card twice in session and lifetime stats.
+- Deleting sessions now updates word and kanji "first seen" and "last seen" dates correctly, and retention pruning keeps historical discovery dates and counts.
+- Words hidden by the vocabulary filter are no longer counted in the new-words charts, so the charts now match the vocabulary summary.
+- A one-time background repair on next launch fixes stale "last seen" dates and existing chart mismatches.
+- Overview totals, charts, the activity calendar, and the vocabulary summary now refresh after you delete sessions, and a failed refresh keeps the dashboard visible with a retry option.
+- Subtitle generation now works during Windows YouTube playback and loads the generated subtitles into the playing video.
+- On Windows, moving on to a video queued from the YouTube browser window no longer drops the rest of mpv's queue.
+- The stats docs now cover the automatic Overview refresh after deletions and how discovery dates are kept through retention pruning.

 ## Highlights
-
 ### Added

 - **YouTube Browser Window**:
-  - Open a YouTube browser with `subminer youtube` (or `subminer yt`), or pick **Browse YouTube** from the tray. It stays logged in to YouTube across restarts.
-  - Clicking a video plays it in mpv instead of on the page.
-  - Middle-click, Shift-click, Ctrl-click, or the right-click menu adds a video to mpv's playlist.
-  - When a queued video starts, it gets the same Japanese subtitle setup.
-  - If you started SubMiner with `subminer youtube`, closing the YouTube window quits SubMiner. If a video is still playing, SubMiner quits after mpv closes.
+  - Open it with `subminer youtube` (or `subminer yt`), or pick **Browse YouTube** from the tray. It stays logged in across restarts.
+  - Clicking a video plays it in mpv. Middle-click, Shift-click, Ctrl-click, or the right-click menu adds it to mpv's playlist.
+  - Queued videos get the same Japanese subtitle setup when they start.
+  - Closing the window quits SubMiner if you started it with `subminer youtube`. If a video is still playing, SubMiner waits until mpv closes.
 - **Whisper Subtitles for YouTube**:
-  - Set `youtube.subtitleSource` to `whisper` to make subtitles with Whisper instead of downloading YouTube's captions. The default is still `youtube`.
-  - The video stays paused while Whisper works, and progress shows in the subtitle generation modal. Close the modal to keep watching, or cancel to carry on without subtitles.
-  - The subtitle generation modal (`Ctrl+Shift+G`) now works on YouTube videos with either `youtube.subtitleSource` setting.
-  - Whisper downloads only a small audio stream and deletes it when generation ends, or when you switch videos, close mpv, or quit.
+  - Set `youtube.subtitleSource` to `whisper` to make subtitles with Whisper instead of downloading YouTube's captions.
+  - The video stays paused while Whisper works, and progress shows in the subtitle generation modal. You can close the modal to keep watching, or cancel.
+  - The subtitle generation modal (`Ctrl+Shift+G`) now works on YouTube videos, including on Windows.
 - **Mouse and Scroll Wheel Bindings**:
-  - `keybindings` now accepts scroll wheel keys (`WHEEL_UP`, `WHEEL_DOWN`, `WHEEL_LEFT`, `WHEEL_RIGHT`), with or without modifiers. You can also record them in the settings key editor.
-  - Mouse button and scroll wheel bindings from mpv now work while the cursor is over the overlay. This covers your `input.conf` and mpv's defaults, such as double-click for fullscreen, the wheel for volume, and back/forward for the playlist.
-  - Hyprland users benefit most: the overlay always takes input there, so these bindings did nothing before.
-  - SubMiner's own bindings and right-click pause still win over mpv's.
- **Session Help Commands**:
-  - During playback, press `Enter` or double-click a row in session help to run that command.
-  - Hovering over a row makes it the target for `Enter`.
-  - Session help opened from the tray with no video loaded is still read-only.
+  - You can now use scroll wheel keys (`WHEEL_UP`, `WHEEL_DOWN`, `WHEEL_LEFT`, `WHEEL_RIGHT`) in `keybindings` and record them in the settings key editor.
+  - mpv's mouse button and wheel bindings now work while the cursor is over the overlay. This matters most on Hyprland, where these bindings did nothing before.
+  - When a binding conflicts, SubMiner's own bindings and right-click pause take priority over mpv's.
+- **Session Help Commands**: During playback, press `Enter` or double-click a row in session help to run that command. Hovering over a row makes it the target for `Enter`.

 ### Changed

- **Release Assets**: Releases no longer include package-size JSON reports. Package contents are still validated before release.
+- **Release Assets**: Releases no longer include package-size JSON reports.

 ### Fixed

 - **Jellyfin Subtitles**:
-  - The Japanese subtitle track is selected, and annotations start, as soon as that track downloads. SubMiner no longer waits for every other track.
-  - Subtitle tracks now download in parallel, so a slow embedded track no longer holds up the main subtitles.
-  - Episodes with image-based subtitles (PGS, DVD, DVB) now select the Japanese and English tracks automatically.
-  - If one subtitle track fails to download, the other tracks are still selected.
- **Jellyfin Audio Track**: On direct-play Jellyfin streams, timing review previews and mined card audio now use the audio track you're playing, not the one Jellyfin marks as default.
+  - The Japanese track is selected, and annotations start, as soon as it downloads. SubMiner no longer waits for the other tracks.
+  - Japanese and English tracks are now picked automatically on episodes with image-based subtitles (PGS, DVD, DVB).
+  - If one track fails to download, the other tracks are still selected.
+- **Jellyfin Audio Track**: On direct-play streams, timing review previews and mined card audio now use the audio track you're playing.
 - **Media Timing Review**:
-  - Trim handles are now thin lines centered on the clip edges. The start and end of the clip are easier to see, and less of the waveform is hidden.
-  - The original subtitle boundaries are now plain orange bars without text labels, so the waveform stays visible.
-  - On macOS with Bluetooth headphones such as AirPods, the preview cursor now moves smoothly. Before, it stuttered and jumped to the end partway through. This affected Opus audio, including Jellyfin streams.
- **Hyprland Fullscreen**:
-  - The subtitle overlay now stays visible when mpv enters or leaves fullscreen, so focus changes no longer cancel fullscreen. Sway still refreshes the overlay as before.
-  - With `mpv.backend: x11`, subtitles and the sidebar no longer stop responding to clicks after mpv goes fullscreen.
- **mpv Key Bindings in the Overlay**:
-  - mpv key bindings, such as `9`/`0` for volume, now work while the overlay has focus.
-  - They used to do nothing if the overlay loaded before SubMiner connected to mpv, which was common with `mpv.backend: x11`. The overlay now reloads mpv's bindings once mpv connects.
- **YouTube Japanese Subtitles**:
-  - Some videos also list a machine-translated Japanese track. On those, Japanese subtitles no longer fail with "HTTP 429", because SubMiner now picks the real Japanese track.
-  - If YouTube refuses a direct subtitle download, SubMiner retries with yt-dlp.
- **AppImage in Sandboxes**: The AppImage now opens its window when started in a sandbox that mounts the image itself, such as `firejail --appimage`. Before, it exited without opening a window.
- **Ctrl+C Crash**: Stopping the terminal command that started SubMiner with Ctrl+C no longer crashes SubMiner with a "write EPIPE" error.
- **Security Updates**: Electron is updated to 42.10.0 and undici to 7.29.1 to fix known security advisories.
+  - Trim handles are now thin lines centered on the clip edges.
+  - Original subtitle boundaries are now plain orange bars with no labels.
+  - The preview cursor no longer stutters on macOS with Bluetooth headphones such as AirPods.
+- **Hyprland Fullscreen**: The overlay stays visible when mpv enters or leaves fullscreen. With `mpv.backend: x11`, subtitles and the sidebar stay clickable after going fullscreen.
+- **mpv Key Bindings in the Overlay**: mpv key bindings, such as `9`/`0` for volume, now work while the overlay has focus, even when the overlay loaded before mpv connected.
+- **YouTube Japanese Subtitles**: Some videos also list a machine-translated Japanese track. On those, Japanese subtitles no longer fail with "HTTP 429". If YouTube refuses a direct download, SubMiner retries with yt-dlp.
+- **Stats Accuracy**:
+  - Sentence mining no longer counts each card twice in session and lifetime stats.
+  - Overview totals, charts, the activity calendar, and the vocabulary summary now update after you delete sessions.
+  - Word and kanji dates stay correct after deleting sessions. New-word charts now match the vocabulary summary.
+- **Dictionary Safety**: Automatic character dictionary changes now stop if a Yomitan profile that had dictionaries suddenly reports none. SubMiner also refuses to load Yomitan data after a downgrade to an older Electron version.
+- **AppImage in Sandboxes**: The AppImage now opens its window in sandboxes that mount the image themselves, such as `firejail --appimage`.
+- **Ctrl+C Crash**: Stopping the terminal command that started SubMiner with Ctrl+C no longer crashes it with a "write EPIPE" error.
+- **Security Updates**: Electron is updated to 43.7.7 and undici to 7.29.1, which fixes known security advisories.

 ### Docs

- **Docs Site Rewrite**:
-  - Pages are shorter and easier to scan. Each one starts with setup and usage, and reference details are in compact tables.
-  - The configuration reference now gives each config block a short explanation and a table of keys and defaults.
-  - Pages that no longer matched how SubMiner works have been corrected.
- **Arch Linux Install**:
-  - The MeCab install command is fixed. MeCab is only in the AUR, as `mecab-git`.
-  - The README's requirements and quick start now match the installation guide.
+- **Docs Site Rewrite**: Pages are shorter and easier to scan. The configuration reference now has a short explanation and a table of keys and defaults for each config block. Pages that no longer matched current behavior are fixed.
+- **Arch Linux Install**: The MeCab install command now uses the AUR package `mecab-git`. The README now matches the installation guide.
+- **Stats**: The docs now cover the Overview refreshing after you delete sessions, and how first-seen dates are kept when old sessions are cleaned up.

 ## What's Changed

+- fix(storage): protect Yomitan profiles across Electron runtime changes by @ksyasuda in #211
 - fix(jellyfin): select subtitles faster and survive failed track downloads by @ksyasuda in #270
 - fix(jellyfin): use the current audio track for media generation by @ksyasuda in #271
 - feat(youtube): add YouTube browser window and Whisper subtitle source by @ksyasuda in #273
@@ -77,14 +80,17 @@
 - fix(linux): skip AppImage mount keepalive on sandbox squashfs mounts by @ksyasuda in #277
 - fix(overlay): reload imported mpv keys after mpv connects by @ksyasuda in #278
 - feat(overlay): forward mpv mouse button and wheel bindings by @ksyasuda in #279
+- fix(stats): count mined cards once and keep lexical stats exact after deletes by @ksyasuda in #280
+- fix(youtube): keep mpv queue when advancing to a queued video on Windows by @ksyasuda in #281
+- fix(subtitles): allow Whisper generation during Windows YouTube stream playback by @ksyasuda in #282

 ## Installation

-See the [installation guide](https://docs.subminer.moe/installation) for full setup steps.
+See the README and docs/installation guide for full setup steps.

 ## Assets

- Linux: `SubMiner-*.AppImage`
+- Linux: `SubMiner.AppImage`
 - macOS: `SubMiner-*.dmg` and `SubMiner-*.zip`
 - Windows: `SubMiner-*.exe` and `SubMiner-*-win.zip`
 - Optional extras: `subminer-assets.tar.gz`, the `subminer` launcher, and the Windows `subminer.cmd` launcher
@@ -476,21 +476,29 @@ You will receive a list of FRAGMENT entries below. Each fragment has metadata (t

   </details>
   Do not include the Internal section at all in MODE: release-notes; internal fragments will not be present in the input for that mode.
-4. Each top-level change item should:
-   - Lead with a short feature/area name in title case. Pick the name from the fragment's bullet content, not the raw 'area:' slug.
-   - Be written in user-facing language. Drop implementation jargon, internal class names, file paths, and PR numbers.
-   - Be merged with related bullets when possible. If five fragments all touch Windows overlay z-order/focus/restore, write one or two bullets that summarize the overall improvement instead of five.
+4. Start every item with a short bold feature/area name in title case and a colon. Pick the name from the fragment's bullet content, not the raw 'area:' slug.
+   - Default to inline: put one or two short sentences right after the colon. If the important details fit in two short sentences, stay inline.
+   - Use nested bullets only when an item has several distinct changes a user would care about separately and inline text would turn into a long run-on sentence. Then leave the top-level bullet as just the name and indent two to four nested bullets by two spaces.
+   - Each nested bullet is a single short sentence, roughly 20 words or fewer. Never write paragraph-length bullets. Cut minor details rather than adding sentences.
+5. Keep items brief. Release notes summarize; the docs hold the details.
+   - Say what changed for the user and how to reach it (shortcut, command, setting, or menu). Stop there.
+   - Leave out how it works internally, edge cases, precedence rules, defaults, fallbacks, tool discovery, migration mechanics, and step-by-step usage.
+   - Name a config key only when users must set it to use the change or to keep their current behavior.
+   - Write in user-facing language. Drop implementation jargon, internal class names, file paths, and PR numbers.
+   - Merge aggressively: one item per feature or area. If five fragments touch Jellyfin subtitles, audio, and auth, write one Jellyfin item, not five. Group small unrelated fixes for the same area into one item.
   - Drop bullets that only describe PR housekeeping, CodeRabbit follow-ups, or test-only changes that don't affect users.
-   - Preserve the substance of breaking changes that remain breaking after applying the Release Outcome Rules. Do not soften or omit them.
-5. In both modes, split every item into one nested bullet per distinct change. Write a short bold name on the top-level bullet, then indent the details two spaces:
-   - **Playlist Browser**:
-     - Saved shows now open without rescanning the library.
-     - The picker remembers the last folder you browsed between launches.
-   Each nested bullet covers exactly one change, behavior, or user-visible outcome. Never stack several distinct changes into one long paragraph-shaped bullet.
-   Aim for two to five nested bullets per item. When an item genuinely has only one thing to say, put it inline on the top-level bullet ("- **Playlist Browser**: Saved shows now open without rescanning the library.") instead of emitting a single nested bullet.
-   Keep nested bullets short, concrete, and readable by non-technical users. Avoid paragraph-style release-note bullets.
-   Bullets inside the Internal section may stay single-level.
-6. In MODE: release-notes, nested bullets should also cover user benefit and any user action or compatibility note when useful. Do not require the exact nested labels; natural phrasing is fine. Omit the action bullet when no action is needed.
+   - Preserve the substance of breaking changes that remain breaking after applying the Release Outcome Rules, including any action users must take. Do not soften or omit them.
+6. Match the length and density of this example:
+   ### Added
+   - **Subtitle Selection Modal**: Optional modal for picking primary and secondary subtitle tracks. Enable it in Settings under Behavior, then press g followed by s.
+   ### Changed
+   - **Faster Sync**: Sync between macOS and Linux machines now uses compressed, incremental rsync transfers. Windows and machines without rsync fall back to compressed scp.
+   ### Fixed
+   - **Subtitle Sidebar**: Space keeps its playback action after clicking a cue, and the sidebar no longer jumps away from the current position during subtitle gaps.
+   - **Jellyfin 12**:
+     - Playback, subtitles, artwork, and "Play on SubMiner" now work on Jellyfin 12.
+     - Casting no longer drops after about a minute.
+     - Mined cards get the episode title again.
 7. Do not invent features. Every bullet must be grounded in the input fragments.
 8. Do not include the version heading (## v...) — that wrapper is added by the caller.

@@ -791,7 +799,7 @@ function polishFragmentsWithClaude(
    ? [
        '## Existing Prerelease Notes',
        '',
-        'The input includes EXISTING PRERELEASE NOTES before the fragment list. Existing prerelease notes are a baseline, not an immutable changelog. Reuse reviewed highlight bullets when they still describe the current outcome, but replace stale beta or RC wording when new fragments supersede it. Merge in only new or changed fragment material, and deduplicate instead of restating existing bullets. Output only the final highlights body using the section headings above; do not include the prerelease disclaimer, any "Changes since" section, or the Installation or Assets sections.',
+        'The input includes EXISTING PRERELEASE NOTES before the fragment list. Existing prerelease notes are a baseline, not an immutable changelog. Reuse reviewed highlight bullets when they still describe the current outcome, but replace stale beta or RC wording when new fragments supersede it. Merge in only new or changed fragment material, and deduplicate instead of restating existing bullets. The output rules above win over the baseline format: shorten long baseline bullets and collapse nested lists that do not need to be nested. Output only the final highlights body using the section headings above; do not include the prerelease disclaimer, any "Changes since" section, or the Installation or Assets sections.',
        '',
      ].join('\n')
    : '';
@@ -814,7 +822,7 @@ Rules:
 3. ADDED fragments describe changes that are new in this build; summarize them.
 4. MODIFIED fragments include BEFORE and AFTER content. Describe only the behavioral difference between them. If the edit is editorial (rewording, deduplication, reformatting, reconciling stale phrasing) with no user-visible behavior change, omit it entirely.
 5. DELETED fragments mean the described change was removed or reverted before this build; say so explicitly.
-6. Keep bullets short and concrete. Use nested bullets sparingly.
+6. Keep each bullet to one short, concrete sentence. Use nested bullets sparingly.
 7. Do not invent changes. Every bullet must be grounded in the diffs.
 8. If no bullet survives rules 2-5, output exactly this single line:
   - No user-facing changes since PREVIOUS_TAG.
@@ -1,26 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-const source = readFileSync('scripts/compare-yomitan-api.ts', 'utf8');
-
-test('creates the configured Yomitan user-data directory before Electron uses it', () => {
-  const setPathIndex = source.indexOf(
-    "electronModule.app.setPath('userData', options.yomitanUserDataPath)",
-  );
-  assert.notEqual(setPathIndex, -1);
-
-  const mkdirIndex = source.lastIndexOf(
-    'fs.mkdirSync(options.yomitanUserDataPath, { recursive: true })',
-    setPathIndex,
-  );
-  assert.ok(mkdirIndex > -1, 'must create the user-data directory');
-  assert.ok(mkdirIndex < setPathIndex, 'must create the directory before app.setPath');
-});
-
-test('lets output drain by using exitCode in the top-level completion handlers', () => {
-  const completionHandlers = source.slice(source.lastIndexOf('\nmain()'));
-  assert.match(completionHandlers, /process\.exitCode = process\.exitCode \?\? 0/);
-  assert.match(completionHandlers, /process\.exitCode = 1/);
-  assert.doesNotMatch(completionHandlers, /process\.exit\(/);
-});
@@ -21,6 +21,7 @@ const requiredDocs = [
  'docs/workflow/README.md',
  'docs/workflow/agent-skills.md',
  'docs/workflow/planning.md',
+  'docs/workflow/testing.md',
  'docs/workflow/verification.md',
 ] as const;

@@ -1,94 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-const source = readFileSync('scripts/get-mpv-window-macos.swift', 'utf8');
-
-test('minimized Accessibility windows are validated by PID and socket before reporting minimized', () => {
-  const minimizedAssignmentIndex = source.indexOf('foundMinimizedTargetWindow = true');
-  assert.notEqual(minimizedAssignmentIndex, -1);
-
-  const loopStartIndex = source.lastIndexOf('for window in windows', minimizedAssignmentIndex);
-  assert.notEqual(loopStartIndex, -1);
-
-  const pidExtractionIndex = source.indexOf(
-    'AXUIElementGetPid(window, &windowPid)',
-    loopStartIndex,
-  );
-  const appPidMatchIndex = source.indexOf('windowPid != app.processIdentifier', loopStartIndex);
-  const socketCheckIndex = source.indexOf('if !windowHasTargetSocket(windowPid)', loopStartIndex);
-
-  assert.ok(
-    pidExtractionIndex > loopStartIndex && pidExtractionIndex < minimizedAssignmentIndex,
-    'window PID must be extracted before accepting a minimized window',
-  );
-  assert.ok(
-    appPidMatchIndex > pidExtractionIndex && appPidMatchIndex < minimizedAssignmentIndex,
-    'window PID must match the owning app before accepting a minimized window',
-  );
-  assert.ok(
-    socketCheckIndex > appPidMatchIndex && socketCheckIndex < minimizedAssignmentIndex,
-    'target socket must be validated before accepting a minimized window',
-  );
-});
-
-test('focused mpv window follows the frontmost mpv app signal', () => {
-  const focusHelperIndex = source.indexOf('private func isFocusedMpvWindow');
-  assert.notEqual(focusHelperIndex, -1);
-
-  const nextFunctionIndex = source.indexOf('\nprivate func ', focusHelperIndex + 1);
-  const focusHelperBody = source.slice(focusHelperIndex, nextFunctionIndex);
-
-  assert.ok(
-    focusHelperBody.includes('frontmost.pid == ownerPid'),
-    'matching frontmost PID should mark the mpv window focused',
-  );
-  assert.ok(
-    focusHelperBody.includes('frontmost.isMpv && windowHasTargetSocket(ownerPid)'),
-    'frontmost mpv app should mark the target mpv window focused even when PIDs differ',
-  );
-  assert.ok(
-    source.includes('focused: isFocusedMpvWindow(ownerPid: windowPid, frontmost: frontmost)'),
-    'Accessibility path should use the shared focused mpv helper',
-  );
-  assert.ok(
-    source.includes('focused: isFocusedMpvWindow(ownerPid: ownerPid, frontmost: frontmost)'),
-    'CoreGraphics path should use the shared focused mpv helper',
-  );
-});
-
-test('frontmost mpv app emits active state when geometry lookup misses', () => {
-  assert.ok(
-    /case\s+\.active:/.test(source),
-    'helper should expose an active state without window geometry',
-  );
-  assert.ok(
-    source.includes('if windowHasTargetSocket(frontmost.pid)'),
-    'active state should still accept a matching target socket when available',
-  );
-  assert.ok(
-    source.includes('return targetMpvSocketPath != nil'),
-    'active state should preserve frontmost mpv even if command-line socket detection fails',
-  );
-  assert.ok(
-    source.includes('return .active'),
-    'lookup should preserve active mpv state after geometry lookup misses',
-  );
-  assert.ok(source.includes('print("active")'), 'active state should be printed for the tracker');
-});
-
-test('frontmost non-mpv app emits inactive state when geometry lookup misses', () => {
-  assert.ok(
-    /case\s+\.inactive:/.test(source),
-    'helper should expose an inactive state without window geometry',
-  );
-  assert.ok(
-    source.includes('if frontmost != nil'),
-    'helper should distinguish a known non-mpv frontmost app from an unknown miss',
-  );
-  assert.ok(source.includes('return .inactive'), 'known non-mpv focus should return inactive');
-  assert.ok(
-    source.includes('print("inactive")'),
-    'inactive state should be printed for the tracker',
-  );
-});
@@ -1,45 +0,0 @@
-import assert from 'node:assert/strict';
-import fs from 'node:fs';
-import path from 'node:path';
-import test from 'node:test';
-import { spawnSync } from 'node:child_process';
-
-function createWorkspace(name: string): string {
-  const baseDir = path.join(process.cwd(), '.tmp', 'get-frequency-typecheck-test');
-  fs.mkdirSync(baseDir, { recursive: true });
-  return fs.mkdtempSync(path.join(baseDir, `${name}-`));
-}
-
-test('scripts/get_frequency.ts typechecks in isolation', () => {
-  const workspace = createWorkspace('isolated-script');
-  const tsconfigPath = path.join(workspace, 'tsconfig.json');
-
-  fs.writeFileSync(
-    tsconfigPath,
-    JSON.stringify(
-      {
-        extends: '../../../tsconfig.typecheck.json',
-        include: ['../../../scripts/get_frequency.ts'],
-        exclude: [],
-      },
-      null,
-      2,
-    ),
-    'utf8',
-  );
-
-  try {
-    const result = spawnSync('bunx', ['tsc', '--noEmit', '-p', tsconfigPath], {
-      cwd: process.cwd(),
-      encoding: 'utf8',
-    });
-
-    assert.equal(
-      result.status,
-      0,
-      `expected scripts/get_frequency.ts to typecheck\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`,
-    );
-  } finally {
-    fs.rmSync(workspace, { recursive: true, force: true });
-  }
-});
@@ -39,24 +39,6 @@ describe('Bun corresponding-source manifest', () => {
    }
  });

-  test('pins the source to the revision reported by the distributed binary', async () => {
-    const manifest = parseSourceManifest(
-      JSON.parse(
-        await fs.readFile(path.join(projectRoot, 'build/bun-source-manifest.json'), 'utf8'),
-      ),
-    );
-
-    expect(manifest.version).toBe('1.3.5');
-    expect(manifest.bunRevision).toBe('1e86cebd74a5723e818b5c0555276b646bcf0e4c');
-    expect(manifest.releaseTagCommit).toBe('fa5a5bbe556a4bda5bde77b4013aa6c3bb4ec9ab');
-    expect(manifest.sources.find((source) => source.name === 'WebKit')?.revision).toBe(
-      '6d0f3aac0b817cc01a846b3754b21271adedac12',
-    );
-    expect(manifest.sources.find((source) => source.name === 'tinycc')?.revision).toBe(
-      '29985a3b59898861442fa3b43f663fc1af2591d7',
-    );
-  });
-
  test('parses commit and tag registrations from Bun CMake', () => {
    const registrations = parseRegisteredRepositories(`
      register_repository(
@@ -1,16 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import fs from 'node:fs';
-import path from 'node:path';
-
-test('build:syncui bundles the sandboxed preload and keeps Electron external', () => {
-  const packageJson = JSON.parse(
-    fs.readFileSync(path.join(import.meta.dir, '..', 'package.json'), 'utf8'),
-  ) as { scripts: Record<string, string> };
-  const command = packageJson.scripts['build:syncui'] ?? '';
-
-  assert.match(command, /src\/preload-syncui\.ts/);
-  assert.match(command, /--bundle/);
-  assert.match(command, /--external:electron/);
-  assert.match(command, /--outfile=dist\/preload-syncui\.js/);
-});
@@ -1,27 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-const source = readFileSync('scripts/prepare-build-assets.mjs', 'utf8');
-
-test('macOS helper build creates dist scripts directory before swiftc output', () => {
-  const buildFunctionIndex = source.indexOf('function buildMacosHelper()');
-  assert.notEqual(buildFunctionIndex, -1);
-
-  const swiftcIndex = source.indexOf("'swiftc'", buildFunctionIndex);
-  assert.notEqual(swiftcIndex, -1);
-
-  const ensureDirIndex = source.lastIndexOf('ensureDir(scriptsOutputDir)', swiftcIndex);
-
-  assert.ok(
-    ensureDirIndex > buildFunctionIndex,
-    'buildMacosHelper must create dist/scripts before swiftc writes the helper binary',
-  );
-});
-
-// Regression guard for #213: an untargeted swiftc stamps the build machine's OS
-// version as the helper's minimum, so released builds refuse to load on older macOS.
-test('macOS helper is compiled with an explicit deployment target', () => {
-  assert.match(source, /-target/);
-  assert.match(source, /apple-macos\$\{MACOS_HELPER_DEPLOYMENT_TARGET\}/);
-});
@@ -12,6 +12,7 @@ paths=(
  ".prettierrc.json"
  ".github"
  "build"
+  "e2e"
  "launcher"
  "scripts"
  "src"
@@ -75,7 +75,7 @@ test('resolveCoverageDir keeps coverage output inside the repository', () => {
  assert.throws(() => resolveCoverageDir(repoRoot, ['--coverage-dir', '/tmp/escape']));
 });

-test('runCoverageLane returns a failure when a discovered test fails', () => {
+test('runCoverageLane returns a failure when a discovered test fails', async () => {
  const repoRoot = mkdtempSync(join(tmpdir(), 'subminer-coverage-failure-'));
  try {
    mkdirSync(join(repoRoot, 'src'));
@@ -93,10 +93,10 @@ test('runCoverageLane returns a failure when a discovered test fails', () => {
    );

    assert.notEqual(
-      runCoverageLane({
+      await runCoverageLane({
        repoRootDir: repoRoot,
        argv: ['bun-src-full', '--coverage-dir', 'coverage/test-src'],
-        stdio: 'pipe',
+        quiet: true,
      }),
      0,
    );
@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
+import { availableParallelism } from 'node:os';
 import { isAbsolute, join, relative, resolve } from 'node:path';
 import { collectLaneFiles } from './test-lanes';

@@ -201,9 +202,40 @@ export function mergeLcovReports(reports: string[]): string {
  return chunks.length > 0 ? `${chunks.join('\n')}\n` : '';
 }

-export function runCoverageLane(
-  options: { repoRootDir?: string; argv?: string[]; stdio?: 'inherit' | 'pipe' } = {},
-): number {
+type ShardResult = { status: number; output: string; lcov: string | null };
+
+// Runs one test file under coverage into its own shard directory, buffering
+// output so parallel shards do not interleave on the terminal.
+function runShard(repoRootDir: string, file: string, shardDir: string): Promise<ShardResult> {
+  return new Promise((resolveShard) => {
+    const child = spawn(
+      'bun',
+      ['test', '--coverage', '--coverage-reporter=lcov', '--coverage-dir', shardDir, `./${file}`],
+      { cwd: repoRootDir },
+    );
+    let output = '';
+    child.stdout.on('data', (chunk) => (output += chunk));
+    child.stderr.on('data', (chunk) => (output += chunk));
+    child.on('error', (error) => resolveShard({ status: 1, output: String(error), lcov: null }));
+    child.on('close', (code) => {
+      const lcovPath = join(shardDir, 'lcov.info');
+      const lcov = existsSync(lcovPath) ? readFileSync(lcovPath, 'utf8') : null;
+      resolveShard({ status: code ?? 1, output, lcov });
+    });
+  });
+}
+
+function parseJobsArg(argv: string[]): number {
+  const index = argv.indexOf('--jobs');
+  if (index === -1) return availableParallelism();
+  return Math.max(1, Number(argv[index + 1]) || 1);
+}
+
+// Shards run in parallel (one per CPU unless --jobs N). The first failing shard
+// stops scheduling new shards and its exit status becomes the lane result.
+export async function runCoverageLane(
+  options: { repoRootDir?: string; argv?: string[]; quiet?: boolean } = {},
+): Promise<number> {
  const repoRootDir = options.repoRootDir ?? repoRoot;
  const argv = options.argv ?? process.argv.slice(2);
  const laneName = argv[0];
@@ -225,40 +257,44 @@ export function runCoverageLane(
    process.stderr.write(`${error instanceof Error ? error.message : error}\n`);
    return 1;
  }
-  const reports: string[] = [];
+
+  const reports: Array<string | null> = new Array(files.length).fill(null);
+  const failures: Array<{ file: string; result: ShardResult }> = [];
+  let nextIndex = 0;
+
+  const worker = async (): Promise<void> => {
+    while (failures.length === 0 && nextIndex < files.length) {
+      const index = nextIndex++;
+      const file = files[index]!;
+      const shardDir = join(shardRoot, String(index + 1).padStart(3, '0'));
+      const result = await runShard(repoRootDir, file, shardDir);
+      if (result.status !== 0) {
+        failures.push({ file, result });
+        return;
+      }
+      if (result.lcov === null && !options.quiet) {
+        process.stdout.write(`Skipping empty coverage shard for ${file}\n`);
+      }
+      reports[index] = result.lcov;
+    }
+  };

  try {
-    for (const [index, file] of files.entries()) {
-      const shardDir = join(shardRoot, `${String(index + 1).padStart(3, '0')}`);
-      const result = spawnSync(
-        'bun',
-        ['test', '--coverage', '--coverage-reporter=lcov', '--coverage-dir', shardDir, `./${file}`],
-        {
-          cwd: repoRootDir,
-          stdio: options.stdio ?? 'inherit',
-        },
-      );
+    const jobs = Math.min(parseJobsArg(argv), files.length);
+    await Promise.all(Array.from({ length: jobs }, worker));

-      if (result.error) {
-        throw result.error;
+    const [failure] = failures;
+    if (failure !== undefined) {
+      const { file, result } = failure;
+      if (!options.quiet) {
+        process.stderr.write(`${result.output}\nCoverage shard failed: ${file}\n`);
      }
-      if ((result.status ?? 1) !== 0) {
-        return result.status ?? 1;
-      }
-
-      const lcovPath = join(shardDir, 'lcov.info');
-      if (!existsSync(lcovPath)) {
-        process.stdout.write(`Skipping empty coverage shard for ${file}\n`);
-        continue;
-      }
-
-      reports.push(readFileSync(lcovPath, 'utf8'));
+      return result.status;
    }

-    writeFileSync(join(coverageDir, 'lcov.info'), mergeLcovReports(reports), 'utf8');
-    process.stdout.write(
-      `Merged LCOV written to ${relative(repoRootDir, join(coverageDir, 'lcov.info'))}\n`,
-    );
+    const lcovPath = join(coverageDir, 'lcov.info');
+    writeFileSync(lcovPath, mergeLcovReports(reports.filter((r) => r !== null)), 'utf8');
+    process.stdout.write(`Merged LCOV written to ${relative(repoRootDir, lcovPath)}\n`);
    return 0;
  } finally {
    rmSync(shardRoot, { recursive: true, force: true });
@@ -267,5 +303,5 @@ export function runCoverageLane(

 // @ts-ignore Bun entrypoint detection; TS config for scripts still targets CommonJS.
 if (import.meta.main) {
-  process.exit(runCoverageLane());
+  runCoverageLane().then((status) => process.exit(status));
 }
@@ -1,5 +1,6 @@
 import { fileURLToPath } from 'node:url';
 import { resolve } from 'node:path';
+import { availableParallelism } from 'node:os';
 import { spawn, spawnSync } from 'node:child_process';
 import { collectLaneFiles } from './test-lanes.ts';

@@ -7,6 +8,8 @@ import { collectLaneFiles } from './test-lanes.ts';
 // test file so a hanging test or leaked global in one file cannot poison the
 // rest of the lane. Use --single-process for the old all-in-one-process mode.
 //
+// Files run in parallel, one worker per CPU by default; --jobs 1 runs serially.
+//
 // Usage: bun scripts/run-test-lane.mjs <lane> [--jobs N] [--timeout-secs N] [--single-process]

 const repoRoot = resolve(fileURLToPath(new URL('..', import.meta.url)));
@@ -34,7 +37,12 @@ for (const signal of ['SIGINT', 'SIGTERM']) {
 }

 function parseArgs(argv) {
-  const options = { lane: undefined, jobs: 1, timeoutSecs: 300, singleProcess: false };
+  const options = {
+    lane: undefined,
+    jobs: availableParallelism(),
+    timeoutSecs: 300,
+    singleProcess: false,
+  };
  for (let index = 0; index < argv.length; index += 1) {
    const arg = argv[index];
    if (arg === '--jobs') {
@@ -61,15 +61,6 @@ test('normalizeTarget maps each supported electron-builder target without using
  assert.throws(() => normalizeTarget('linux', 0), /Unsupported Bun runtime target architecture/);
 });

-test('resolveArtifact chooses baseline x64 builds and standard arm64 builds', () => {
-  const config = runtimeConfig();
-  assert.equal(resolveArtifact(config, 'linux', 'x64').file, 'bun-linux-x64-baseline.zip');
-  assert.equal(resolveArtifact(config, 'darwin', 'x64').file, 'bun-darwin-x64-baseline.zip');
-  assert.equal(resolveArtifact(config, 'win32', 'x64').file, 'bun-windows-x64-baseline.zip');
-  assert.equal(resolveArtifact(config, 'linux', 'arm64').file, 'bun-linux-aarch64.zip');
-  assert.equal(resolveArtifact(config, 'darwin', 'arm64').file, 'bun-darwin-aarch64.zip');
-});
-
 test('tracked runtime manifest covers every supported target at the packageManager version', async () => {
  const config = await loadRuntimeConfig();
  assert.equal(config.version, '1.3.5');
@@ -35,6 +35,12 @@ export const testLanes: Record<string, TestLane> = {
    roots: ['scripts'],
    include: ['.test.ts'],
  },
+  // Boots the built app, mpv, and a fake AnkiConnect on an offscreen display.
+  // Slow and dependent on mpv/ffmpeg/Xvfb, so it stays out of test:fast.
+  e2e: {
+    roots: ['e2e'],
+    include: ['.e2e.test.ts'],
+  },
  stats: {
    roots: ['stats/src'],
    include: ['.test.ts', '.test.tsx'],
@@ -3,20 +3,6 @@ import assert from 'node:assert/strict';
 import { AnkiConnectClient } from './anki-connect';
 import { setLogLevel } from './logger';

-test('AnkiConnectClient disables keep-alive agents to avoid stale socket retries', () => {
-  const client = new AnkiConnectClient('http://127.0.0.1:8765') as unknown as {
-    client: {
-      defaults: {
-        httpAgent?: { options?: { keepAlive?: boolean } };
-        httpsAgent?: { options?: { keepAlive?: boolean } };
-      };
-    };
-  };
-
-  assert.equal(client.client.defaults.httpAgent?.options?.keepAlive, false);
-  assert.equal(client.client.defaults.httpsAgent?.options?.keepAlive, false);
-});
-
 test('AnkiConnectClient includes action name in retry logs', async () => {
  const client = new AnkiConnectClient('http://127.0.0.1:8765') as unknown as {
    client: { post: (url: string, body: unknown, options: unknown) => Promise<unknown> };
@@ -2,9 +2,13 @@ import assert from 'node:assert/strict';
 import test from 'node:test';

 import { CardCreationService } from './card-creation';
-import type { AnkiConnectConfig } from '../types/anki';
-
-type CardCreationDeps = ConstructorParameters<typeof CardCreationService>[0];
+import {
+  type CardCreationDeps,
+  createAnkiConfig,
+  createCardCreationDeps,
+  createFakeClient,
+  createFakeMediaGenerator,
+} from './card-creation-test-utils';

 test('sentence card writes generated audio only to sentence audio field', async () => {
  const addedFields: Record<string, string>[] = [];
@@ -13,128 +17,88 @@ test('sentence card writes generated audio only to sentence audio field', async
  const requestedProperties: string[] = [];
  const audioVolumeScales: Array<number | undefined> = [];
  const audioRanges: Array<{ start: number; end: number; padding: number | undefined }> = [];
-
-  const deps: CardCreationDeps = {
-    getConfig: () =>
-      ({
-        deck: 'Mining',
-        fields: {
-          word: 'Expression',
-          sentence: 'Sentence',
-          audio: 'ExpressionAudio',
-          translation: 'SelectionText',
-        },
-        media: {
-          generateAudio: true,
-          generateImage: false,
-          mirrorMpvVolume: true,
-          maxMediaDuration: 30,
-        },
-        behavior: {},
-        ai: false,
-      }) as AnkiConnectConfig,
-    getAiConfig: () => ({}),
-    getTimingTracker: () => ({}) as never,
-    getMpvClient: () =>
-      ({
-        currentVideoPath: '/video.mp4',
-        currentSubText: '字幕',
-        currentSubStart: 12,
-        currentSubEnd: 14,
-        currentTimePos: 13,
-        currentAudioStreamIndex: 0,
-        requestProperty: async (name: string) => {
-          requestedProperties.push(name);
-          return 40;
-        },
-      }) as never,
-    client: {
-      addNote: async (_deck, _modelName, fields) => {
-        addedFields.push(fields);
-        return 42;
-      },
-      addTags: async () => undefined,
-      notesInfo: async () => [
-        {
-          noteId: 42,
-          fields: {
-            Expression: { value: '字幕' },
-            Sentence: { value: '字幕' },
-            SelectionText: { value: 'Subtitle' },
-            ExpressionAudio: { value: '' },
-            SentenceAudio: { value: '' },
-          },
-        },
-      ],
-      updateNoteFields: async (_noteId, fields) => {
-        updatedFields.push(fields);
-      },
-      storeMediaFile: async (filename) => {
-        storedMedia.push(filename);
-      },
-      findNotes: async () => [],
-      retrieveMediaFile: async () => '',
-      deleteNotes: async () => undefined,
-    },
-    mediaGenerator: {
-      generateAudio: async (
-        _path,
-        startTime,
-        endTime,
-        audioPadding,
-        _audioStreamIndex,
-        _normalizeAudio,
-        volumeScale,
-      ) => {
-        audioRanges.push({ start: startTime, end: endTime, padding: audioPadding });
-        audioVolumeScales.push(volumeScale);
-        return Buffer.from('audio');
-      },
-      generateScreenshot: async () => null,
-      generateAnimatedImage: async () => null,
-    },
-    showOsdNotification: () => undefined,
-    showUpdateResult: () => undefined,
-    showStatusNotification: () => undefined,
-    showNotification: async () => undefined,
-    beginUpdateProgress: () => undefined,
-    endUpdateProgress: () => undefined,
-    withUpdateProgress: async (_message, action) => action(),
-    resolveConfiguredFieldName: (noteInfo, ...preferredNames) => {
-      for (const preferredName of preferredNames) {
-        if (preferredName && preferredName in noteInfo.fields) return preferredName;
-      }
-      return null;
-    },
-    resolveNoteFieldName: (noteInfo, preferredName) =>
-      preferredName && preferredName in noteInfo.fields ? preferredName : null,
-    getAnimatedImageLeadInSeconds: async () => 0,
-    extractFields: () => ({}),
-    processSentence: (sentence) => sentence,
-    setCardTypeFields: () => undefined,
-    mergeFieldValue: (_existing, newValue) => newValue,
-    formatMiscInfoPattern: () => '',
-    getEffectiveSentenceCardConfig: () => ({
-      model: 'Sentence',
-      sentenceField: 'Sentence',
-      audioField: 'SentenceAudio',
-      lapisEnabled: true,
-      kikuEnabled: false,
-      fieldGroupingMode: 'disabled',
-    }),
-    getFallbackDurationSeconds: () => 10,
-    appendKnownWordsFromNoteInfo: () => undefined,
-    removeKnownWordNote: () => undefined,
-    isUpdateInProgress: () => false,
-    setUpdateInProgress: () => undefined,
-    trackLastAddedNoteId: () => undefined,
-    reviewMediaTiming: async () => ({ action: 'confirm', startTime: 11.4, endTime: 14.2 }),
+  let review: Awaited<ReturnType<NonNullable<CardCreationDeps['reviewMediaTiming']>>> = {
+    action: 'confirm',
+    startTime: 11.4,
+    endTime: 14.2,
  };

-  const service = new CardCreationService(deps);
-  const created = await service.createSentenceCard('字幕', 12, 14, 'Subtitle');
+  const service = new CardCreationService(
+    createCardCreationDeps({
+      getConfig: () =>
+        createAnkiConfig({
+          fields: {
+            word: 'Expression',
+            audio: 'ExpressionAudio',
+            translation: 'SelectionText',
+          },
+          media: { generateAudio: true, mirrorMpvVolume: true, maxMediaDuration: 30 },
+        }),
+      getMpvClient: () =>
+        ({
+          currentVideoPath: '/video.mp4',
+          currentSubText: '字幕',
+          currentSubStart: 12,
+          currentSubEnd: 14,
+          currentTimePos: 13,
+          currentAudioStreamIndex: 0,
+          requestProperty: async (name: string) => {
+            requestedProperties.push(name);
+            return 40;
+          },
+        }) as never,
+      client: createFakeClient({
+        addNote: async (_deck, _modelName, fields) => {
+          addedFields.push(fields);
+          return 42;
+        },
+        notesInfo: async () => [
+          {
+            noteId: 42,
+            fields: {
+              Expression: { value: '字幕' },
+              Sentence: { value: '字幕' },
+              SelectionText: { value: 'Subtitle' },
+              ExpressionAudio: { value: '' },
+              SentenceAudio: { value: '' },
+            },
+          },
+        ],
+        updateNoteFields: async (_noteId, fields) => {
+          updatedFields.push(fields);
+        },
+        storeMediaFile: async (filename) => {
+          storedMedia.push(filename);
+        },
+      }),
+      mediaGenerator: createFakeMediaGenerator({
+        generateAudio: async (
+          _path,
+          startTime,
+          endTime,
+          audioPadding,
+          _audioStreamIndex,
+          _normalizeAudio,
+          volumeScale,
+        ) => {
+          audioRanges.push({ start: startTime, end: endTime, padding: audioPadding });
+          audioVolumeScales.push(volumeScale);
+          return Buffer.from('audio');
+        },
+      }),
+      getEffectiveSentenceCardConfig: () => ({
+        model: 'Sentence',
+        sentenceField: 'Sentence',
+        audioField: 'SentenceAudio',
+        lapisEnabled: true,
+        kikuEnabled: false,
+        fieldGroupingMode: 'disabled',
+      }),
+      reviewMediaTiming: async () => review,
+    }),
+  );

-  assert.equal(created, true);
+  assert.equal(await service.createSentenceCard('字幕', 12, 14, 'Subtitle'), true);
  assert.deepEqual(addedFields[0], {
    Sentence: '字幕',
    SelectionText: 'Subtitle',
@@ -149,11 +113,11 @@ test('sentence card writes generated audio only to sentence audio field', async
  assert.equal(mediaUpdate?.SentenceAudio, `[sound:${storedMedia[0]}]`);
  assert.equal('ExpressionAudio' in mediaUpdate!, false);

-  deps.reviewMediaTiming = async () => ({ action: 'discard' });
+  review = { action: 'discard' };
  assert.equal(await service.createSentenceCard('作らない', 20, 22), false);
  assert.equal(addedFields.length, 1);

-  deps.reviewMediaTiming = async () => ({ action: 'skip-media' });
+  review = { action: 'skip-media' };
  assert.equal(await service.createSentenceCard('メディアなし', 30, 32), true);
  assert.equal(addedFields.length, 2);
  assert.equal(storedMedia.length, 1);
@@ -0,0 +1,107 @@
+import { CardCreationService } from './card-creation';
+import type { AnkiConnectConfig } from '../types/anki';
+
+export type CardCreationDeps = ConstructorParameters<typeof CardCreationService>[0];
+
+/** Builds the minimal config the service reads; pass only the sections a test cares about. */
+export function createAnkiConfig(
+  overrides: {
+    fields?: Record<string, string>;
+    media?: Record<string, unknown>;
+  } = {},
+): AnkiConnectConfig {
+  return {
+    deck: 'Mining',
+    fields: { sentence: 'Sentence', audio: 'SentenceAudio', ...overrides.fields },
+    media: { generateAudio: false, generateImage: false, ...overrides.media },
+    behavior: {},
+    ai: false,
+  } as AnkiConnectConfig;
+}
+
+/**
+ * Fake CardCreationService dependencies: a bare mpv session, a client that adds note 42, no media,
+ * and field resolvers that match exact field names. Override only what the test exercises.
+ */
+export function createCardCreationDeps(
+  overrides: Partial<CardCreationDeps> = {},
+): CardCreationDeps {
+  return {
+    getConfig: () => createAnkiConfig(),
+    getAiConfig: () => ({}),
+    getTimingTracker: () => ({}) as never,
+    getMpvClient: () =>
+      ({
+        currentVideoPath: '/video.mp4',
+        currentSubText: '字幕',
+        currentSubStart: 1,
+        currentSubEnd: 2,
+        currentTimePos: 1.5,
+        currentAudioStreamIndex: 0,
+      }) as never,
+    client: {
+      addNote: async () => 42,
+      addTags: async () => undefined,
+      notesInfo: async () => [],
+      updateNoteFields: async () => undefined,
+      storeMediaFile: async () => undefined,
+      findNotes: async () => [],
+      retrieveMediaFile: async () => '',
+      deleteNotes: async () => undefined,
+    },
+    mediaGenerator: {
+      generateAudio: async () => null,
+      generateScreenshot: async () => null,
+      generateAnimatedImage: async () => null,
+    },
+    showOsdNotification: () => undefined,
+    showUpdateResult: () => undefined,
+    showStatusNotification: () => undefined,
+    showNotification: async () => undefined,
+    beginUpdateProgress: () => undefined,
+    endUpdateProgress: () => undefined,
+    withUpdateProgress: async (_message, action) => action(),
+    resolveConfiguredFieldName: (noteInfo, ...preferredNames) => {
+      for (const preferredName of preferredNames) {
+        if (preferredName && preferredName in noteInfo.fields) return preferredName;
+      }
+      return null;
+    },
+    resolveNoteFieldName: (noteInfo, preferredName) =>
+      preferredName && preferredName in noteInfo.fields ? preferredName : null,
+    getAnimatedImageLeadInSeconds: async () => 0,
+    extractFields: () => ({}),
+    processSentence: (sentence) => sentence,
+    setCardTypeFields: () => undefined,
+    mergeFieldValue: (_existing, newValue) => newValue,
+    formatMiscInfoPattern: () => '',
+    getEffectiveSentenceCardConfig: () => ({
+      model: 'Sentence',
+      sentenceField: 'Sentence',
+      audioField: 'SentenceAudio',
+      lapisEnabled: false,
+      kikuEnabled: false,
+      fieldGroupingMode: 'disabled',
+    }),
+    getFallbackDurationSeconds: () => 10,
+    appendKnownWordsFromNoteInfo: () => undefined,
+    removeKnownWordNote: () => undefined,
+    isUpdateInProgress: () => false,
+    setUpdateInProgress: () => undefined,
+    trackLastAddedNoteId: () => undefined,
+    ...overrides,
+  };
+}
+
+/** Anki client overrides, kept separate so a test can swap one method without redeclaring the rest. */
+export function createFakeClient(
+  overrides: Partial<CardCreationDeps['client']> = {},
+): CardCreationDeps['client'] {
+  return { ...createCardCreationDeps().client, ...overrides };
+}
+
+export function createFakeMediaGenerator(
+  overrides: Partial<CardCreationDeps['mediaGenerator']> = {},
+): CardCreationDeps['mediaGenerator'] {
+  return { ...createCardCreationDeps().mediaGenerator, ...overrides };
+}
@@ -500,3 +500,38 @@ test('Senren merge keeps duplicate SentenceFurigana when the kept field is empty

  assert.equal(merged.SentenceFurigana, '<span class="group">duplicate furigana</span>');
 });
+
+test('computeFieldGroupingMergedFields keeps independent groups for identical sentence, audio, and image values', async () => {
+  const { collaborator } = createCollaborator();
+
+  const merged = await collaborator.computeFieldGroupingMergedFields(
+    202,
+    101,
+    makeNote(202, {
+      Sentence: 'same sentence',
+      SentenceAudio: '[sound:same.mp3]',
+      Picture: '<img src="same.png">',
+      ExpressionAudio: '[sound:same.mp3]',
+    }),
+    makeNote(101, {
+      Sentence: 'same sentence',
+      SentenceAudio: '[sound:same.mp3]',
+      Picture: '<img src="same.png">',
+    }),
+    false,
+  );
+
+  assert.equal(
+    merged.Sentence,
+    '<span data-group-id="202">same sentence</span><span data-group-id="101">same sentence</span>',
+  );
+  assert.equal(
+    merged.SentenceAudio,
+    '<span data-group-id="202">[sound:same.mp3]</span><span data-group-id="101">[sound:same.mp3]</span>',
+  );
+  assert.equal(
+    merged.Picture,
+    '<img data-group-id="202" src="same.png"><img data-group-id="101" src="same.png">',
+  );
+  assert.equal('ExpressionAudio' in merged, false);
+});
@@ -127,18 +127,6 @@ test('lifecycle config key is unchanged when maturity is disabled', () => {
  );
 });

-test('a cache built under the old tier rules is invalidated', () => {
-  const config: AnkiConnectConfig = {
-    knownWords: { highlightEnabled: true, maturityEnabled: true, refreshMinutes: 60 },
-  };
-  // v1 rules put lapsed cards in young because the interval queries did not
-  // exclude is:learn; those persisted tiers must not be served under v2.
-  assert.notEqual(
-    getKnownWordCacheLifecycleConfig(config),
-    '{"refreshMinutes":60,"scope":"all","fieldsWord":"","maturity":21}',
-  );
-});
-
 test('refresh fetches tier sets and getKnownWordTier classifies notes', async () => {
  const { manager, calls, clientState, cleanup } = createMaturityHarness(maturityConfig());

@@ -223,127 +223,6 @@ test('NoteUpdateWorkflow marks enriched Kiku word cards as word-and-sentence car
  });
 });

-test('NoteUpdateWorkflow marks the configured word card kind instead of word-and-sentence', async () => {
-  const harness = createWorkflowHarness();
-  harness.deps.getEffectiveSentenceCardConfig = () => ({
-    sentenceField: 'Sentence',
-    lapisEnabled: false,
-    kikuEnabled: true,
-    fieldGroupingMode: 'manual',
-    wordCardKind: 'click',
-  });
-  harness.deps.client.notesInfo = async () =>
-    [
-      {
-        noteId: 42,
-        fields: {
-          Expression: { value: 'taberu' },
-          Sentence: { value: '' },
-          IsWordAndSentenceCard: { value: 'x' },
-          IsClickCard: { value: '' },
-          IsSentenceCard: { value: '' },
-          IsAudioCard: { value: '' },
-        },
-      },
-    ] satisfies NoteUpdateWorkflowNoteInfo[];
-
-  await harness.workflow.execute(42);
-
-  assert.equal(harness.updates.length, 1);
-  assert.deepEqual(harness.updates[0]?.fields, {
-    Sentence: 'subtitle-text',
-    IsClickCard: 'x',
-    IsWordAndSentenceCard: '',
-    IsSentenceCard: '',
-    IsAudioCard: '',
-  });
-});
-
-test('NoteUpdateWorkflow leaves card type flags alone when the word card kind is none', async () => {
-  const harness = createWorkflowHarness();
-  harness.deps.getEffectiveSentenceCardConfig = () => ({
-    sentenceField: 'Sentence',
-    lapisEnabled: false,
-    kikuEnabled: true,
-    fieldGroupingMode: 'manual',
-    wordCardKind: 'none',
-  });
-  harness.deps.client.notesInfo = async () =>
-    [
-      {
-        noteId: 42,
-        fields: {
-          Expression: { value: 'taberu' },
-          Sentence: { value: '' },
-          IsWordAndSentenceCard: { value: '' },
-          IsSentenceCard: { value: '' },
-          IsAudioCard: { value: '' },
-        },
-      },
-    ] satisfies NoteUpdateWorkflowNoteInfo[];
-
-  await harness.workflow.execute(42);
-
-  assert.equal(harness.updates.length, 1);
-  assert.deepEqual(harness.updates[0]?.fields, {
-    Sentence: 'subtitle-text',
-  });
-});
-
-test('NoteUpdateWorkflow does not set Kiku card flags when Lapis and Kiku are disabled', async () => {
-  const harness = createWorkflowHarness();
-  harness.deps.client.notesInfo = async () =>
-    [
-      {
-        noteId: 42,
-        fields: {
-          Expression: { value: 'taberu' },
-          Sentence: { value: '' },
-          IsWordAndSentenceCard: { value: '' },
-          IsSentenceCard: { value: '' },
-          IsAudioCard: { value: '' },
-        },
-      },
-    ] satisfies NoteUpdateWorkflowNoteInfo[];
-
-  await harness.workflow.execute(42);
-
-  assert.equal(harness.updates.length, 1);
-  assert.deepEqual(harness.updates[0]?.fields, {
-    Sentence: 'subtitle-text',
-  });
-});
-
-test('NoteUpdateWorkflow preserves explicit sentence card type during sentence enrichment', async () => {
-  const harness = createWorkflowHarness();
-  harness.deps.getEffectiveSentenceCardConfig = () => ({
-    sentenceField: 'Sentence',
-    lapisEnabled: true,
-    kikuEnabled: false,
-    fieldGroupingMode: 'disabled',
-  });
-  harness.deps.client.notesInfo = async () =>
-    [
-      {
-        noteId: 42,
-        fields: {
-          Expression: { value: 'sentence expression' },
-          Sentence: { value: '' },
-          IsWordAndSentenceCard: { value: '' },
-          IsSentenceCard: { value: 'x' },
-          IsAudioCard: { value: '' },
-        },
-      },
-    ] satisfies NoteUpdateWorkflowNoteInfo[];
-
-  await harness.workflow.execute(42);
-
-  assert.equal(harness.updates.length, 1);
-  assert.deepEqual(harness.updates[0]?.fields, {
-    Sentence: 'subtitle-text',
-  });
-});
-
 test('NoteUpdateWorkflow no-ops when note info is missing', async () => {
  const harness = createWorkflowHarness();
  harness.deps.client.notesInfo = async () => [];
@@ -1,74 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-
-const ciWorkflowPath = resolve(__dirname, '../.github/workflows/ci.yml');
-const ciWorkflow = readFileSync(ciWorkflowPath, 'utf8');
-const docsPagesWorkflowPath = resolve(__dirname, '../.github/workflows/docs-pages.yml');
-const docsPagesWorkflow = readFileSync(docsPagesWorkflowPath, 'utf8');
-const packageJsonPath = resolve(__dirname, '../package.json');
-const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8')) as {
-  scripts: Record<string, string>;
-};
-
-test('package scripts expose a sharded maintained source coverage lane with lcov output', () => {
-  assert.equal(
-    packageJson.scripts['test:coverage:src'],
-    'bun run build:yomitan && bun run scripts/run-coverage-lane.ts bun-src-full --coverage-dir coverage/test-src',
-  );
-});
-
-test('source and coverage scripts discover the same maintained source lane', () => {
-  const sourceLane = packageJson.scripts['test:src']?.match(/run-test-lane\.mjs\s+([^\s]+)/)?.[1];
-  const coverageLane = packageJson.scripts['test:coverage:src']?.match(
-    /run-coverage-lane\.ts\s+([^\s]+)/,
-  )?.[1];
-
-  assert.equal(sourceLane, 'bun-src-full');
-  assert.equal(coverageLane, sourceLane);
-});
-
-test('environment suite owns launcher smoke execution', () => {
-  assert.match(
-    packageJson.scripts['test:env'] ?? '',
-    /^bun run test:launcher:smoke:src && bun run test:plugin:src && bun run test:immersion:sqlite:src$/,
-  );
-});
-
-test('ci delegates its gate instead of duplicating quality steps', () => {
-  assert.match(
-    ciWorkflow,
-    /build-test-audit:\s*\n\s*uses: \.\/\.github\/workflows\/quality-gate\.yml/,
-  );
-  assert.doesNotMatch(ciWorkflow, /oven-sh\/setup-bun/);
-  assert.doesNotMatch(ciWorkflow, /bun run test:coverage:src/);
-  assert.doesNotMatch(ciWorkflow, /bun run test:env/);
-});
-
-test('main docs deploy exists, serializes deploys, and uses Cloudflare credentials', () => {
-  assert.match(docsPagesWorkflow, /name: Docs Pages/);
-  assert.match(docsPagesWorkflow, /branches:\s*\n\s*-\s*main/);
-  assert.match(docsPagesWorkflow, /group:\s*docs-pages-production/);
-  assert.match(docsPagesWorkflow, /CLOUDFLARE_API_TOKEN/);
-  assert.match(docsPagesWorkflow, /CLOUDFLARE_ACCOUNT_ID/);
-  assert.match(docsPagesWorkflow, /CLOUDFLARE_PAGES_PROJECT_NAME/);
-  assert.match(docsPagesWorkflow, /pages deploy \.\.\/\.tmp\/docs-versioned-site/);
-  assert.match(docsPagesWorkflow, /--branch main/);
-});
-
-test('docs deploy syncs frozen archives to R2 and ships the archive Pages Function', () => {
-  assert.doesNotMatch(docsPagesWorkflow, /actions\/cache@/);
-  assert.match(docsPagesWorkflow, /DOCS_ARCHIVE_R2_ACCESS_KEY_ID/);
-  assert.match(docsPagesWorkflow, /DOCS_ARCHIVE_R2_SECRET_ACCESS_KEY/);
-  assert.match(docsPagesWorkflow, /--require-archives/);
-  assert.match(docsPagesWorkflow, /--rebuild-archives=\$\{REBUILD_ARCHIVES\}/);
-  assert.match(docsPagesWorkflow, /workingDirectory: docs-site/);
-});
-
-test('docs deploy skips invalid release tags without failing the workflow', () => {
-  assert.match(docsPagesWorkflow, /id:\s*tag_guard/);
-  assert.match(docsPagesWorkflow, /stable_tag=false/);
-  assert.doesNotMatch(docsPagesWorkflow, /exit 78/);
-  assert.match(docsPagesWorkflow, /if:\s*steps\.tag_guard\.outputs\.stable_tag != 'false'/);
-});
@@ -1,36 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { printHelp } from './help';
-
-test('printHelp includes configured texthooker port', () => {
-  const original = console.log;
-  let output = '';
-  console.log = (value?: unknown) => {
-    output += String(value);
-  };
-
-  try {
-    printHelp(7777);
-  } finally {
-    console.log = original;
-  }
-
-  assert.match(output, /--help\s+Show this help/);
-  assert.match(output, /default: 7777/);
-  assert.match(output, /--launch-mpv.*Launch mpv with SubMiner defaults and exit/);
-  assert.match(output, /--stats\s+Open the stats dashboard in your browser/);
-  assert.match(output, /--open-browser\s+Open texthooker in your default browser/);
-  assert.doesNotMatch(output, /--refresh-known-words/);
-  assert.match(output, /--setup\s+Open first-run setup window/);
-  assert.match(output, /--settings\s+Open SubMiner settings window/);
-  assert.match(output, /--yomitan\s+Open Yomitan settings window/);
-  assert.match(output, /--mark-watched\s+Mark current video watched and advance playlist/);
-  assert.match(output, /--anilist-status/);
-  assert.match(output, /--anilist-retry-queue/);
-  assert.match(output, /--dictionary/);
-  assert.match(output, /--dictionary-target/);
-  assert.match(output, /--jellyfin\s+Open Jellyfin setup window/);
-  assert.match(output, /--jellyfin-login/);
-  assert.match(output, /--jellyfin-subtitles/);
-  assert.match(output, /--jellyfin-play/);
-});
@@ -2,17 +2,7 @@ import assert from 'node:assert/strict';
 import test from 'node:test';

 import { ResolvedConfig } from '../../types/config';
-import {
-  CONFIG_OPTION_REGISTRY,
-  CONFIG_TEMPLATE_SECTIONS,
-  DEFAULT_CONFIG,
-  DEFAULT_KEYBINDINGS,
-  RUNTIME_OPTION_REGISTRY,
-} from '../definitions';
-import { buildCoreConfigOptionRegistry } from './options-core';
-import { buildImmersionConfigOptionRegistry } from './options-immersion';
-import { buildIntegrationConfigOptionRegistry } from './options-integrations';
-import { buildSubtitleConfigOptionRegistry } from './options-subtitle';
+import { CONFIG_OPTION_REGISTRY, CONFIG_TEMPLATE_SECTIONS, DEFAULT_CONFIG } from '../definitions';

 function collectConfigLeafPaths(config: ResolvedConfig): string[] {
  const leaves: string[] = [];
@@ -87,58 +77,6 @@ const UNDOCUMENTED_LEAVES: ReadonlySet<string> = new Set([
  'subtitleStyle.wordSpacing',
 ]);

-test('config option registry includes critical paths and has unique entries', () => {
-  const paths = CONFIG_OPTION_REGISTRY.map((entry) => entry.path);
-
-  for (const requiredPath of [
-    'logging.level',
-    'logging.files.mpv',
-    'annotationWebsocket.enabled',
-    'controller.enabled',
-    'controller.scrollPixelsPerSecond',
-    'startupWarmups.lowPowerMode',
-    'updates.channel',
-    'youtube.primarySubLanguages',
-    'subtitleStyle.enableJlpt',
-    'subtitleStyle.autoPauseVideoOnYomitanPopup',
-    'ankiConnect.enabled',
-    'subtitleStyle.nameMatchEnabled',
-    'ankiConnect.media.normalizeAudio',
-    'ankiConnect.media.mirrorMpvVolume',
-    'anilist.characterDictionary.collapsibleSections.description',
-    'mpv.executablePath',
-    'mpv.launchMode',
-    'mpv.profile',
-    'mpv.socketPath',
-    'mpv.backend',
-    'mpv.autoStartSubMiner',
-    'mpv.pauseUntilOverlayReady',
-    'mpv.subminerBinaryPath',
-    'mpv.aniskipEnabled',
-    'mpv.aniskipButtonKey',
-    'yomitan.externalProfilePath',
-    'immersionTracking.enabled',
-  ]) {
-    assert.ok(paths.includes(requiredPath), `missing config path: ${requiredPath}`);
-  }
-
-  assert.equal(new Set(paths).size, paths.length);
-});
-
-test('known-word annotation color has one public config path', () => {
-  const leaves = collectConfigLeafPaths(DEFAULT_CONFIG);
-
-  assert.ok(leaves.includes('subtitleStyle.knownWordColor'));
-  assert.ok(!leaves.includes('ankiConnect.knownWords.color'));
-});
-
-test('n+1 annotation color has one public config path', () => {
-  const leaves = collectConfigLeafPaths(DEFAULT_CONFIG);
-
-  assert.ok(leaves.includes('subtitleStyle.nPlusOneColor'));
-  assert.ok(!leaves.includes('ankiConnect.nPlusOne.color'));
-});
-
 test('every DEFAULT_CONFIG leaf is in CONFIG_OPTION_REGISTRY or UNDOCUMENTED_LEAVES', () => {
  const registryPaths = new Set(CONFIG_OPTION_REGISTRY.map((entry) => entry.path));
  const leaves = collectConfigLeafPaths(DEFAULT_CONFIG);
@@ -168,77 +106,10 @@ test('every DEFAULT_CONFIG leaf is in CONFIG_OPTION_REGISTRY or UNDOCUMENTED_LEA
  );
 });

-test('config template sections include expected domains and unique keys', () => {
+test('config option paths and template section keys are unique', () => {
+  const paths = CONFIG_OPTION_REGISTRY.map((entry) => entry.path);
+  assert.equal(new Set(paths).size, paths.length);
+
  const keys = CONFIG_TEMPLATE_SECTIONS.map((section) => section.key);
-  const requiredKeys: (typeof keys)[number][] = [
-    'websocket',
-    'annotationWebsocket',
-    'controller',
-    'startupWarmups',
-    'youtube',
-    'subtitleStyle',
-    'ankiConnect',
-    'yomitan',
-    'mpv',
-    'immersionTracking',
-  ];
-
-  for (const requiredKey of requiredKeys) {
-    assert.ok(keys.includes(requiredKey), `missing template section key: ${requiredKey}`);
-  }
-
  assert.equal(new Set(keys).size, keys.length);
 });
-
-test('domain registry builders each contribute entries to composed registry', () => {
-  const domainEntries = [
-    buildCoreConfigOptionRegistry(DEFAULT_CONFIG),
-    buildSubtitleConfigOptionRegistry(DEFAULT_CONFIG),
-    buildIntegrationConfigOptionRegistry(DEFAULT_CONFIG, RUNTIME_OPTION_REGISTRY),
-    buildImmersionConfigOptionRegistry(DEFAULT_CONFIG),
-  ];
-  const composedPaths = new Set(CONFIG_OPTION_REGISTRY.map((entry) => entry.path));
-
-  for (const entries of domainEntries) {
-    assert.ok(entries.length > 0);
-    assert.ok(entries.some((entry) => composedPaths.has(entry.path)));
-  }
-});
-
-test('default keybindings include primary and secondary subtitle track cycling on J keys', () => {
-  const keybindingMap = new Map(
-    DEFAULT_KEYBINDINGS.map((binding) => [binding.key, binding.command]),
-  );
-  assert.deepEqual(keybindingMap.get('KeyJ'), ['cycle', 'sid']);
-  assert.deepEqual(keybindingMap.get('Shift+KeyJ'), ['cycle', 'secondary-sid']);
-  assert.deepEqual(keybindingMap.get('Ctrl+Alt+KeyC'), ['__youtube-picker-open']);
-  assert.deepEqual(keybindingMap.get('Ctrl+Alt+KeyP'), ['__playlist-browser-open']);
-});
-
-test('default keybindings include fullscreen on F', () => {
-  const keybindingMap = new Map(
-    DEFAULT_KEYBINDINGS.map((binding) => [binding.key, binding.command]),
-  );
-  assert.deepEqual(keybindingMap.get('KeyF'), ['cycle', 'fullscreen']);
-});
-
-test('default keybindings include replay and next subtitle controls', () => {
-  const keybindingMap = new Map(
-    DEFAULT_KEYBINDINGS.map((binding) => [binding.key, binding.command]),
-  );
-  assert.deepEqual(keybindingMap.get('Ctrl+Shift+KeyH'), ['__replay-subtitle']);
-  assert.deepEqual(keybindingMap.get('Ctrl+Shift+KeyL'), ['__play-next-subtitle']);
-});
-
-test('default keybindings mirror mpv subtitle delay and sub-step keys', () => {
-  const keybindingMap = new Map(
-    DEFAULT_KEYBINDINGS.map((binding) => [binding.key, binding.command]),
-  );
-  assert.deepEqual(keybindingMap.get('KeyZ'), ['add', 'sub-delay', -0.1]);
-  assert.deepEqual(keybindingMap.get('Shift+KeyZ'), ['add', 'sub-delay', 0.1]);
-  assert.deepEqual(keybindingMap.get('KeyX'), ['add', 'sub-delay', 0.1]);
-  assert.deepEqual(keybindingMap.get('Ctrl+Shift+ArrowLeft'), ['sub-step', -1]);
-  assert.deepEqual(keybindingMap.get('Ctrl+Shift+ArrowRight'), ['sub-step', 1]);
-  assert.equal(keybindingMap.has('Shift+BracketLeft'), false);
-  assert.equal(keybindingMap.has('Shift+BracketRight'), false);
-});
Author	SHA1	Message	Date
sudacode	ea2b3a9507	fix(overlay): stop Hyprland/Sway tracker polls from blocking the main thread (#289 )	2026-10-11 01:01:36 -07:00
sudacode	a6d96e9966	fix(overlay): poll cheap playback state in the open subtitle sidebar (#290 )	2026-10-11 00:35:27 -07:00
sudacode	7108e086ba	fix(overlay): keep keyboard mode from swallowing modal and text-field keys (#291 )	2026-10-11 00:33:47 -07:00
sudacode	78a9b6346f	fix(jellyfin): make terminal play work with a running app and report progress (#288 )	2026-10-10 17:27:48 -07:00
sudacode	78eca52b7e	test: add headless end-to-end harness (#286 ) * test: add headless end-to-end harness and CI job Boot the built app against a real mpv, a synthetic clip, a fixture Yomitan dictionary, and a fake AnkiConnect inside a private Xvfb display, then assert on the overlay DOM and the AnkiConnect requests. Adds the test:e2e lane, an e2e session CLI for exploratory checks, and a three-platform CI job. * ci: set e2e temp dir from a step * test: make e2e session startup robust on slow machines Bun caps node:test hooks at 5s, so boot the session inside the first test. Keep pausing until the app's resume retries stop, read cue tokens in one round trip, and resolve Electron through its package entry so CI downloads the binary. * test: harden e2e harness for CI runners Fail fast when mpv cannot be spawned, read every Yomitan popup frame instead of trusting target order, and put the chocolatey mpv directory on PATH. * test: add e2e failure diagnostics and mark Windows job experimental Report what the overlay showed when a cue never renders, dispose the session when the overlay cannot be opened, skip popup frames that vanish mid-poll, and turn off AniSkip lookups in the harness config. * test: read the lookup popup entry from textContent * test: capture renderer console and main-side subtitle state in e2e failures * test: expose the Electron main-process inspector to the e2e harness Adds session.mainProcess() and 'e2e eval main', and reports main's window list alongside the overlay state when a cue never renders. * test: tap subtitle sends and receipts in e2e failure diagnostics * test: probe alternate main-to-renderer paths in e2e failure diagnostics * test: select the visible overlay layer, not the primed modal window Windows and macOS pre-create a hidden modal window that loads the same renderer document, and the harness could attach to it instead of the visible overlay. Drops the delivery taps that found this. * ci: run the Windows e2e job as a normal matrix entry * test: address review on e2e harness Slice the app log at a byte offset before decoding, create the session state file owner-only since it carries the inspector URL, and keep the cue failure when inspector diagnostics are unavailable. * test: create the e2e session state file exclusively	2026-10-05 22:00:58 -07:00
sudacode	b48083ddd8	test: cut low-value tests, rewrite the rest around behavior, parallelize lanes (#285 )	2026-10-05 00:07:44 -07:00
sudacode	4b6842d034	fix(setup): label missing launcher "Not set up" instead of "Not installed" (#284 )	2026-10-04 17:13:10 -07:00
sudacode	9ffa2bce94	chore(release): prepare v0.20.1	2026-10-04 00:01:18 -07:00
sudacode	88b73656a7	chore(release): prepare v0.20.1-beta.2	2026-10-03 21:22:19 -07:00
sudacode	e77aa5c3b3	fix(stats): count mined cards once and keep lexical stats exact after deletes (#280 )	2026-10-03 21:16:12 -07:00
sudacode	121b688afb	fix(deps): bump http-cache-semantics to 4.3.0 for GHSA-ch52-4w7c-c8xp (#283 )	2026-10-03 21:13:32 -07:00
sudacode	727be5683a	fix(youtube): keep mpv queue when advancing to a queued video on Windows (#281 )	2026-10-02 22:13:35 -07:00
sudacode	138bfe9759	fix(subtitles): allow Whisper generation during Windows YouTube stream playback (#282 )	2026-10-02 22:13:15 -07:00
sudacode	0aba17d95b	chore(release): generate concise release notes per feature or area - Rewrite polish prompt to default to inline items, nesting only for several distinct changes - Add length/density example and drop internal details from release bodies - Tell prerelease mode to shorten long baseline bullets - Update changes/README.md and prompt assertions in tests	2026-10-02 19:52:16 -07:00
sudacode	a5d0b63792	fix(storage): protect Yomitan profiles across Electron runtime changes (#211 )	2026-10-01 21:44:53 -07:00