fix(stats): repair legacy combined-season anime rows on startup (#116 )

feat(stats): speed up session maintenance and improve stats UI (#111 )
fix(anilist): mark entry completed when final episode is reached (#115 )
2026-06-09 15:13:32 -07:00 · 2026-06-09 12:41:07 -07:00 · 2026-06-08 02:20:52 -07:00 · 2026-06-07 23:45:09 -07:00 · 2026-06-06 11:52:16 -07:00 · 2026-06-06 01:25:01 -07:00
166 changed files with 9946 additions and 1144 deletions
@@ -31,6 +31,6 @@ If docs-site/ changed, also: bun run docs:test && bun run docs:build

 ## Checklist

- [ ] Added a changelog fragment, or this PR is labeled `skip-changelog` (see [`changes/README.md`](../changes/README.md))
+- [ ] Reconciled current-outcome changelog fragment(s), or this PR is labeled `skip-changelog` (see [`changes/README.md`](../changes/README.md))
 - [ ] Docs updated in the same PR if behavior, defaults, flags, shortcuts, ports, or APIs changed
 - [ ] Relevant checks pass locally (typecheck, tests, build)
@@ -68,7 +68,7 @@ Start here, then leave this file.

 ## Release / PR Notes

- User-visible PRs need one fragment in `changes/*.md` — format and rules in [`changes/README.md`](./changes/README.md) (`type` + `area` keys required; apply the `skip-changelog` label to opt out)
+- User-visible PRs need reconciled current-outcome fragment(s) in `changes/*.md` — format and rules in [`changes/README.md`](./changes/README.md) (`type` + `area` keys required; inspect existing same-PR fragments, then update/remove stale bullets or add only genuinely separate outcomes; apply the `skip-changelog` label to opt out)
 - User-visible docs changes get a `type: docs` fragment
 - CI enforces `bun run changelog:lint` and `bun run changelog:pr-check`
 - PR review helpers:
@@ -1,12 +1,23 @@
 # Changelog

+## v0.15.2 (2026-06-02)
+
+### Changed
+- Yomitan: Updated the bundled Yomitan build to the latest vendored revision.
+
+### Fixed
+- Anki - Animated AVIF: Clip timing no longer starts or ends early; word-audio lead-in and clip duration are now aligned to frame boundaries.
+- Overlay (Hyprland): Fixed fullscreen overlay alignment - modal, stats, and sidebar content no longer shift below the mpv window.
+- Overlay (macOS): Subtitle bars are now interactive immediately after autoplay starts with "wait for overlay to be ready" enabled, without requiring a manual click.
+- Overlay (macOS): Fixed overlay, subtitles, and subtitle sidebar staying hidden after a modal closes until the user clicked the mpv window; focus is now restored to mpv when the last modal closes, so playback shortcuts and the overlay reappear correctly - including in native fullscreen.
+
 ## v0.15.1 (2026-05-31)

 ### Fixed

 - **Linux Overlay Stacking**: Fixed the overlay intermittently dropping behind mpv on KDE Plasma and other non-Hyprland/Sway Wayland sessions; restored subtitle hover, pause-on-hover, and Yomitan lookups on X11/XWayland; the overlay now correctly layers above/below mpv based on fullscreen state, yields to foreground windows (Settings, Yomitan, AniList, etc.), and avoids startup flashes and fullscreen transition glitches.
 - **Linux Overlay (Hyprland Lua)**: Fixed overlay placement on Hyprland 0.55+ when using a Lua-based config.
- **Manual Overlay Startup**: Fixed manual visible-overlay startup from mpv — now correctly attaches to playback, keeps the window bounds synced with mpv, and primes current subtitles before showing.
+- **Manual Overlay Startup**: Fixed manual visible-overlay startup from mpv - now correctly attaches to playback, keeps the window bounds synced with mpv, and primes current subtitles before showing.
 - **Playlist Transitions**: Reused the warm overlay when mpv advances to the next playlist item, avoiding a redundant tokenization pause and preserving visible subtitles across tracks.
 - **macOS Overlay**: Fixed the visible subtitle overlay staying click-through after pause-until-ready releases playback; restored mpv focus after closing modal windows so subtitles and keybinds resume without clicking the player.
 - **Mouse Keybindings**: Fixed keybinding capture and runtime handling for mouse buttons, including side buttons like `MBTN_BACK` and `MBTN_FORWARD`.
@@ -25,7 +36,7 @@
  - Subsync now always opens the manual subtitle picker regardless of any previously set default mode
 - **N+1 Highlighting:**
  - N+1 highlighting now has its own dedicated `ankiConnect.nPlusOne.enabled` option, separate from known-word highlighting
-  - It is no longer enabled automatically when known-word highlighting is on — enable it explicitly to keep N+1 annotations
+  - It is no longer enabled automatically when known-word highlighting is on - enable it explicitly to keep N+1 annotations

 ### Added

@@ -172,7 +183,7 @@

 ### Added

- **Character Dictionary:** Added AniList-based character dictionary selection for resolving title mismatches — open it in-app with the new `Ctrl+Alt+A` shortcut or from the CLI with `subminer dictionary --candidates` / `--select`. Series-scoped overrides replace stale entries in the merged dictionary.
+- **Character Dictionary:** Added AniList-based character dictionary selection for resolving title mismatches - open it in-app with the new `Ctrl+Alt+A` shortcut or from the CLI with `subminer dictionary --candidates` / `--select`. Series-scoped overrides replace stale entries in the merged dictionary.
 - **Primary Subtitle Bar:** Added a `V` shortcut and mpv plugin binding to toggle the primary subtitle bar without affecting mpv's native subtitle visibility.
 - **Texthooker:** Added `subminer texthooker -o` and a tray menu item to open the local texthooker page in the default browser.

@@ -226,7 +237,7 @@
 ### Internal

 - Replaced the changelog renderer with an AI polish pass that merges related fragments and writes user-facing release notes. `CHANGELOG.md` keeps internal items in a collapsed `<details>` block; GitHub release notes omit them entirely.
- Release CI no longer auto-builds pending `changes/*.md` fragments on tag. Tagging now fails fast if fragments remain — run `bun run changelog:build` (requires the `claude` CLI) and commit before tagging.
+- Release CI no longer auto-builds pending `changes/*.md` fragments on tag. Tagging now fails fast if fragments remain - run `bun run changelog:build` (requires the `claude` CLI) and commit before tagging.

 </details>

@@ -245,8 +256,8 @@
 - Stats: Episode detail hides card events whose Anki notes have been deleted, instead of showing phantom mining activity.
 - Stats: Trend and watch-time charts share a unified theme with horizontal gridlines and larger ticks for legibility.
 - Stats: Overview, Library, Trends, Sessions, and Vocabulary now use generic "title" wording so YouTube videos and anime live comfortably side by side in the dashboard.
- Stats: Session timeline no longer plots seek-forward/seek-backward markers — they were too noisy on sessions with lots of rewinds.
- Stats: Replaced the "Library — Per Day" section on the Stats → Trends page with a "Library — Summary" section. The new section shows a top-10 watch-time leaderboard chart and a sortable per-title table (watch time, videos, sessions, cards, words, lookups, lookups/100w, date range), all scoped to the current date range selector.
+- Stats: Session timeline no longer plots seek-forward/seek-backward markers - they were too noisy on sessions with lots of rewinds.
+- Stats: Replaced the "Library - Per Day" section on the Stats → Trends page with a "Library - Summary" section. The new section shows a top-10 watch-time leaderboard chart and a sortable per-title table (watch time, videos, sessions, cards, words, lookups, lookups/100w, date range), all scoped to the current date range selector.

 ### Fixed

@@ -1,4 +1,4 @@
-.PHONY: help deps build build-launcher install build-linux build-macos build-macos-unsigned clean install-linux install-macos install-windows uninstall uninstall-linux uninstall-macos uninstall-windows print-dirs pretty lint ensure-bun generate-config generate-example-config dev-start dev-start-macos dev-watch dev-watch-macos dev-toggle dev-stop docs-test docs-build docs-build-versioned docs-dev
+.PHONY: help submodules deps build build-launcher install build-linux build-macos build-macos-unsigned clean install-linux install-macos install-windows uninstall uninstall-linux uninstall-macos uninstall-windows print-dirs pretty lint ensure-bun generate-config generate-example-config dev-start dev-start-macos dev-watch dev-watch-macos dev-toggle dev-stop docs-test docs-build docs-build-versioned docs-dev

 APP_NAME := subminer
 THEME_SOURCE := assets/themes/subminer.rasi
@@ -72,7 +72,8 @@ help:
 		"  generate-config  Generate ~/.config/SubMiner/config.jsonc from centralized defaults" \
 		"" \
 		"Other targets:" \
-		"  deps             Install JS dependencies (root + stats + texthooker-ui)" \
+		"  submodules       Initialize/update git submodules" \
+		"  deps             Initialize submodules and install JS dependencies (root + stats + texthooker-ui)" \
 		"  uninstall-linux  Remove Linux install artifacts" \
 		"  uninstall-macos  Remove macOS install artifacts" \
 		"  uninstall-windows Remove Windows mpv plugin artifacts" \
@@ -105,8 +106,10 @@ print-dirs:
 		"MACOS_APP_SRC=$(MACOS_APP_SRC)" \
 		"MACOS_ZIP_SRC=$(MACOS_ZIP_SRC)"

-deps:
-	@$(MAKE) --no-print-directory ensure-bun
+submodules:
+	@git submodule update --init --recursive
+
+deps: submodules ensure-bun
 	@bun install
 	@cd stats && bun install --frozen-lockfile
 	@cd vendor/texthooker-ui && bun install --frozen-lockfile
@@ -0,0 +1,4 @@
+type: added
+area: release
+
+- Release notes now credit contributors with a `What's Changed` list (`by @author in #pr`) and a `New Contributors` section for first-time authors, resolved from changelog fragments via git and the GitHub API.
@@ -31,6 +31,13 @@ Rules:
 - `README.md` is ignored by the generator
 - if a PR should not produce release notes, apply the `skip-changelog` label instead of adding a fragment

+PR branch workflow:
+
+- Before adding a fragment or bullet, inspect the `changes/*.md` files already changed in the PR
+- If the new work fixes, modifies, renames, or supersedes behavior introduced or referenced by that fragment, edit or remove the stale bullet instead of adding follow-up churn
+- Add a new bullet only when it describes a truly separate user-visible outcome
+- Multiple fragment files are allowed when one PR has genuinely separate release-note outcomes, but keep them minimized and current
+
 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.
@@ -0,0 +1,4 @@
+type: fixed
+area: anilist
+
+- Marked AniList entries completed when a post-watch update reaches the final known episode of the season.
@@ -0,0 +1,4 @@
+type: changed
+area: release
+
+- Changed PR changelog guidance to preserve multiple fragments for genuinely separate outcomes while directing contributors to update, remove, or merge same-PR fragment notes before adding follow-up churn.
@@ -0,0 +1,5 @@
+type: fixed
+area: jellyfin
+
+- Restarted the Jellyfin remote session after successful setup login so websocket reconnects use the freshly saved credentials.
+- Stopped the Jellyfin remote session on setup logout.
@@ -0,0 +1,6 @@
+type: changed
+area: stats
+
+- Split local and Jellyfin library entries by detected season, using season folders first and filename parsing as fallback.
+- Repaired older combined-series stats rows by moving parsed episodes into season-specific library entries, rebuilding summaries, and deleting now-empty legacy rows.
+- Refresh anime detail and library cover art immediately after manually changing an AniList entry.
@@ -0,0 +1,4 @@
+type: fixed
+area: build
+
+- Updated `make deps` so a fresh source checkout initializes submodules before installing root, stats, and texthooker-ui dependencies.
@@ -0,0 +1,9 @@
+type: changed
+area: stats
+
+- Added the Stats Search tab for realtime subtitle sentence search with media context, headword matching, and mining actions for source-backed sentence cards or exact-match word/audio cards.
+- Improved Stats mining from Search and vocabulary examples: empty `ankiConnect.deck` can use Yomitan's mining deck, sentence cards are created before slow media generation finishes, stored/requested secondary subtitles are preserved before falling back to sidecar files or temporary alass-retimed English sidecars for sentence Selection Text, invalid stored timings are blocked before FFmpeg runs, future out-of-order subtitle timing pairs are skipped until valid timings arrive, and partial media failures are shown.
+- Fixed Stats mining field/audio behavior so sentence clips update `SentenceAudio`, word audio uses the configured Yomitan sources, English subtitle text is not written onto word cards, and secondary subtitle auto-selection prefers regular English tracks over Signs/Songs tracks.
+- Improved vocabulary review with remembered Hide Known/Hide Kana filters, cross-title Hide Kana filtering, duplicate-collapsed exclusions across token variants, and Related Seen Words matching based on shared readings or kanji.
+- Reorganized the Stats Trends tab into clearer Activity, Cumulative Totals, Efficiency, Patterns, and Library sections, disambiguated per-period vs cumulative charts, and added Words/Min and Cards/Hour efficiency charts.
+- Improved Stats browsing reliability by remembering library card size, retrying stored cover art without extra AniList lookups, preserving PNG/WebP cover MIME types, honoring custom AnkiConnect URLs for Browse, showing progress during session deletes, and making session deletes refresh faster.
@@ -496,7 +496,7 @@
    "tags": [
      "SubMiner"
    ], // Tags to add to cards mined or updated by SubMiner. Provide an empty array to disable automatic tagging.
-    "deck": "", // Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to search all decks.
+    "deck": "", // Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to use the Yomitan mining deck when available.
    "fields": {
      "word": "Expression", // Card field for the mined word or expression text.
      "audio": "ExpressionAudio", // Card field that receives generated sentence audio.
@@ -4,7 +4,7 @@ SubMiner can sync your watch progress to [AniList](https://anilist.co) automatic

 AniList data also powers two additional features: [cover art](#cover-art) for the stats dashboard and the [Character Dictionary](/character-dictionary) for in-overlay name lookup.

-[AniList](https://anilist.co) is a free website for tracking which anime you have watched. An **access token** is a private key SubMiner stores so it can update your list on your behalf — you approve it once during setup, and you never paste a password into SubMiner.
+[AniList](https://anilist.co) is a free website for tracking which anime you have watched. An **access token** is a private key SubMiner stores so it can update your list on your behalf - you approve it once during setup, and you never paste a password into SubMiner.

 ## Setup

@@ -38,7 +38,7 @@ SubMiner monitors playback and triggers an AniList progress update when an episo

 The update flow:

-1. **Title detection** -- SubMiner extracts the anime title, season, and episode number from the media filename. It tries [`guessit`](https://github.com/guessit-io/guessit) first for accurate parsing, then falls back to an internal filename parser if guessit is unavailable.
+1. **Title detection** -- SubMiner extracts the anime title, season, and episode number from the media filename and path. Season folders such as `Season 2` are treated as a strong season signal. SubMiner tries [`guessit`](https://github.com/guessit-io/guessit) first for accurate parsing, then falls back to an internal filename parser if guessit is unavailable.
 2. **AniList search** -- The detected title is searched against the AniList GraphQL API. For season 2 and later files, SubMiner searches the season-specific title first, then falls back to the base title. SubMiner picks the best match by comparing titles (romaji, English, native) and filtering by episode count.
 3. **Progress check** -- SubMiner fetches your current list entry for the matched media. The media must already be in Planning or Watching; otherwise SubMiner shows an MPV message explaining that the update is not possible. If your recorded progress already meets or exceeds the detected episode, the update is skipped.
 4. **Mutation** -- A `SaveMediaListEntry` mutation sets the new progress and marks the entry as `CURRENT`.
@@ -4,9 +4,10 @@ SubMiner uses the [AnkiConnect](https://ankiweb.net/shared/info/2055492159) add-
 This project is built primarily for [Kiku](https://kiku.youyoumu.my.id/) and [Lapis](https://github.com/donkuri/lapis) note types, including sentence-card and field-grouping behavior.

 ::: tip New to these terms?
+
 - **Anki** is the flashcard app where your study cards live.
 - **AnkiConnect** is a free add-on that lets other programs (like SubMiner) talk to Anki over a local connection. SubMiner needs it installed to add or edit cards.
- A **note type** (also called a "model") is the template that defines what a card looks like — for example the Kiku or Lapis templates many Japanese learners use.
+- A **note type** (also called a "model") is the template that defines what a card looks like - for example the Kiku or Lapis templates many Japanese learners use.
 - A **field** is one labeled slot in that template, such as `Sentence`, `Expression`, or `Picture`. SubMiner fills these fields when it mines a card.
  :::

@@ -22,9 +23,9 @@ AnkiConnect listens on `http://127.0.0.1:8765` by default. If you changed the po

 When you add a word via Yomitan, SubMiner detects the new card and fills in the sentence, audio, image, and translation fields automatically. Two detection methods are available:

-**Proxy mode** (default) — SubMiner runs a local *proxy*: a small middleman server that sits between Yomitan and Anki. Yomitan sends new cards to SubMiner, SubMiner enriches them, then passes them along to Anki. This makes enrichment instant.
+**Proxy mode** (default) - SubMiner runs a local _proxy_: a small middleman server that sits between Yomitan and Anki. Yomitan sends new cards to SubMiner, SubMiner enriches them, then passes them along to Anki. This makes enrichment instant.

-**Polling mode** (fallback, when the proxy is disabled) — SubMiner asks AnkiConnect every few seconds whether any new cards were added, then enriches them. Simpler setup, but with a short delay (~3 seconds).
+**Polling mode** (fallback, when the proxy is disabled) - SubMiner asks AnkiConnect every few seconds whether any new cards were added, then enriches them. Simpler setup, but with a short delay (~3 seconds).

 Use proxy mode if you want immediate enrichment. Use polling mode if your Yomitan instance is external (browser-based) or you prefer minimal configuration.

@@ -36,7 +37,7 @@ In both modes, the enrichment workflow is the same:
 4. Fills the translation field from the secondary subtitle or AI.
 5. Writes metadata to the miscInfo field.

-Polling mode uses the query `"deck:<ankiConnect.deck>" added:1` to find recently added cards. If no deck is configured, it searches all decks. In Settings, the AnkiConnect deck dropdown auto-fills from Yomitan's current mining deck when available, then falls back to the decks reported by AnkiConnect.
+Polling mode uses the query `"deck:<ankiConnect.deck>" added:1` to find recently added cards. If no deck is configured, it uses Yomitan's current mining deck when available; otherwise it searches all decks. In Settings, the AnkiConnect deck dropdown auto-fills and persists Yomitan's current mining deck when available, then falls back to the decks reported by AnkiConnect.
 Known-word sync scope is controlled by `ankiConnect.knownWords.decks`.

 ### Proxy Mode Setup (Yomitan / Texthooker)
@@ -34,7 +34,7 @@ plugin/
 src/
  ai/                      # AI translation provider utilities (client, config)
  main-entry.ts           # Background-mode bootstrap wrapper before loading main.js
-  main.ts                  # Entry point — delegates to runtime composers/domain modules
+  main.ts                  # Entry point - delegates to runtime composers/domain modules
  preload.ts               # Electron preload bridge
  types.ts                 # Shared type definitions
  main/                    # Main-process composition/runtime adapters
@@ -226,17 +226,17 @@ Most runtime code follows a dependency-injection pattern:

 The composition root (`src/main.ts`) delegates to focused modules in `src/main/` and `src/main/runtime/composers/`:

- `startup.ts` — argv/env processing and bootstrap flow
- `app-lifecycle.ts` — Electron lifecycle event registration
- `startup-lifecycle.ts` — app-ready initialization sequence
- `state.ts` — centralized application runtime state container
- `ipc-runtime.ts` — IPC channel registration and handler wiring
- `cli-runtime.ts` — CLI command parsing and dispatch
- `overlay-runtime.ts` — overlay window selection and modal state management
- `subsync-runtime.ts` — subsync command orchestration
- `runtime/composers/anilist-tracking-composer.ts` — AniList media tracking/probe/retry wiring
- `runtime/composers/jellyfin-runtime-composer.ts` — Jellyfin config/client/playback/command/setup composition wiring
- `runtime/composers/mpv-runtime-composer.ts` — MPV event/factory/tokenizer/warmup wiring
+- `startup.ts` - argv/env processing and bootstrap flow
+- `app-lifecycle.ts` - Electron lifecycle event registration
+- `startup-lifecycle.ts` - app-ready initialization sequence
+- `state.ts` - centralized application runtime state container
+- `ipc-runtime.ts` - IPC channel registration and handler wiring
+- `cli-runtime.ts` - CLI command parsing and dispatch
+- `overlay-runtime.ts` - overlay window selection and modal state management
+- `subsync-runtime.ts` - subsync command orchestration
+- `runtime/composers/anilist-tracking-composer.ts` - AniList media tracking/probe/retry wiring
+- `runtime/composers/jellyfin-runtime-composer.ts` - Jellyfin config/client/playback/command/setup composition wiring
+- `runtime/composers/mpv-runtime-composer.ts` - MPV event/factory/tokenizer/warmup wiring

 Composer modules share contract conventions via `src/main/runtime/composers/contracts.ts`:

@@ -271,9 +271,9 @@ For domains migrated to reducer-style transitions (for example AniList token/que

 ## Playback Startup Flow

-Before the app boots, something has to launch mpv, inject the plugin, and bring the overlay up. SubMiner-managed launches own this step — the `subminer` launcher, the app's own playback, and the packaged Windows shortcut all follow the same path. The launcher reads `config.jsonc`, spawns mpv with the IPC socket and the bundled plugin, and passes runtime settings as `--script-opts`. The plugin never reads a config file: the shipped `subminer.conf` is intentionally empty so command-line opts always win.
+Before the app boots, something has to launch mpv, inject the plugin, and bring the overlay up. SubMiner-managed launches own this step - the `subminer` launcher, the app's own playback, and the packaged Windows shortcut all follow the same path. The launcher reads `config.jsonc`, spawns mpv with the IPC socket and the bundled plugin, and passes runtime settings as `--script-opts`. The plugin never reads a config file: the shipped `subminer.conf` is intentionally empty so command-line opts always win.

-Once mpv is up, exactly one of two triggers brings up the overlay. On a first launch the plugin's `file-loaded` hook self-starts the app once the socket is ready (because the launcher injected `auto_start=yes`). When the app is already running — or for explicit `--start-overlay` and YouTube flows — the launcher instead attaches over the control socket and suppresses the plugin's auto-start, so the two never fire together. Both converge on the same app bring-up, which then runs the Program Lifecycle below.
+Once mpv is up, exactly one of two triggers brings up the overlay. On a first launch the plugin's `file-loaded` hook self-starts the app once the socket is ready (because the launcher injected `auto_start=yes`). When the app is already running - or for explicit `--start-overlay` and YouTube flows - the launcher instead attaches over the control socket and suppresses the plugin's auto-start, so the two never fire together. Both converge on the same app bring-up, which then runs the Program Lifecycle below.

 ```mermaid
 flowchart TB
@@ -1,12 +1,23 @@
 # Changelog

+## v0.15.2 (2026-06-02)
+
+**Changed**
+- Yomitan: Updated the bundled Yomitan build to the latest vendored revision.
+
+**Fixed**
+- Anki - Animated AVIF: Clip timing no longer starts or ends early; word-audio lead-in and clip duration are now aligned to frame boundaries.
+- Overlay (Hyprland): Fixed fullscreen overlay alignment - modal, stats, and sidebar content no longer shift below the mpv window.
+- Overlay (macOS): Subtitle bars are now interactive immediately after autoplay starts with "wait for overlay to be ready" enabled, without requiring a manual click.
+- Overlay (macOS): Fixed overlay, subtitles, and subtitle sidebar staying hidden after a modal closes until the user clicked the mpv window; focus is now restored to mpv when the last modal closes, so playback shortcuts and the overlay reappear correctly - including in native fullscreen.
+
 ## v0.15.1 (2026-05-31)

 **Fixed**

 - **Linux Overlay Stacking**: Fixed the overlay intermittently dropping behind mpv on KDE Plasma and other non-Hyprland/Sway Wayland sessions; restored subtitle hover, pause-on-hover, and Yomitan lookups on X11/XWayland; the overlay now correctly layers above/below mpv based on fullscreen state, yields to foreground windows (Settings, Yomitan, AniList, etc.), and avoids startup flashes and fullscreen transition glitches.
 - **Linux Overlay (Hyprland Lua)**: Fixed overlay placement on Hyprland 0.55+ when using a Lua-based config.
- **Manual Overlay Startup**: Fixed manual visible-overlay startup from mpv — now correctly attaches to playback, keeps the window bounds synced with mpv, and primes current subtitles before showing.
+- **Manual Overlay Startup**: Fixed manual visible-overlay startup from mpv - now correctly attaches to playback, keeps the window bounds synced with mpv, and primes current subtitles before showing.
 - **Playlist Transitions**: Reused the warm overlay when mpv advances to the next playlist item, avoiding a redundant tokenization pause and preserving visible subtitles across tracks.
 - **macOS Overlay**: Fixed the visible subtitle overlay staying click-through after pause-until-ready releases playback; restored mpv focus after closing modal windows so subtitles and keybinds resume without clicking the player.
 - **Mouse Keybindings**: Fixed keybinding capture and runtime handling for mouse buttons, including side buttons like `MBTN_BACK` and `MBTN_FORWARD`.
@@ -25,7 +36,7 @@
  - Subsync now always opens the manual subtitle picker regardless of any previously set default mode
 - **N+1 Highlighting:**
  - N+1 highlighting now has its own dedicated `ankiConnect.nPlusOne.enabled` option, separate from known-word highlighting
-  - It is no longer enabled automatically when known-word highlighting is on — enable it explicitly to keep N+1 annotations
+  - It is no longer enabled automatically when known-word highlighting is on - enable it explicitly to keep N+1 annotations

 **Added**

@@ -177,7 +188,7 @@

 **Added**

- **Character Dictionary:** Added AniList-based character dictionary selection for resolving title mismatches — open it in-app with the new `Ctrl+Alt+A` shortcut or from the CLI with `subminer dictionary --candidates` / `--select`. Series-scoped overrides replace stale entries in the merged dictionary.
+- **Character Dictionary:** Added AniList-based character dictionary selection for resolving title mismatches - open it in-app with the new `Ctrl+Alt+A` shortcut or from the CLI with `subminer dictionary --candidates` / `--select`. Series-scoped overrides replace stale entries in the merged dictionary.
 - **Primary Subtitle Bar:** Added a `V` shortcut and mpv plugin binding to toggle the primary subtitle bar without affecting mpv's native subtitle visibility.
 - **Texthooker:** Added `subminer texthooker -o` and a tray menu item to open the local texthooker page in the default browser.

@@ -231,7 +242,7 @@
 **Internal**

 - Replaced the changelog renderer with an AI polish pass that merges related fragments and writes user-facing release notes. `CHANGELOG.md` keeps internal items in a collapsed `<details>` block; GitHub release notes omit them entirely.
- Release CI no longer auto-builds pending `changes/*.md` fragments on tag. Tagging now fails fast if fragments remain — run `bun run changelog:build` (requires the `claude` CLI) and commit before tagging.
+- Release CI no longer auto-builds pending `changes/*.md` fragments on tag. Tagging now fails fast if fragments remain - run `bun run changelog:build` (requires the `claude` CLI) and commit before tagging.

 </details>

@@ -255,8 +266,8 @@
 - Stats: Episode detail hides card events whose Anki notes have been deleted, instead of showing phantom mining activity.
 - Stats: Trend and watch-time charts share a unified theme with horizontal gridlines and larger ticks for legibility.
 - Stats: Overview, Library, Trends, Sessions, and Vocabulary now use generic "title" wording so YouTube videos and anime live comfortably side by side in the dashboard.
- Stats: Session timeline no longer plots seek-forward/seek-backward markers — they were too noisy on sessions with lots of rewinds.
- Stats: Replaced the "Library — Per Day" section on the Stats → Trends page with a "Library — Summary" section. The new section shows a top-10 watch-time leaderboard chart and a sortable per-title table (watch time, videos, sessions, cards, words, lookups, lookups/100w, date range), all scoped to the current date range selector.
+- Stats: Session timeline no longer plots seek-forward/seek-backward markers - they were too noisy on sessions with lots of rewinds.
+- Stats: Replaced the "Library - Per Day" section on the Stats → Trends page with a "Library - Summary" section. The new section shows a top-10 watch-time leaderboard chart and a sortable per-title table (watch time, videos, sessions, cards, words, lookups, lookups/100w, date range), all scoped to the current date range selector.

 **Fixed**

@@ -1,6 +1,6 @@
 # Character Dictionary

-SubMiner can build a Yomitan-compatible character dictionary from [AniList](https://anilist.co) metadata so that character names in subtitles are recognized, highlighted, and enrichable with context — portraits, roles, voice actors, and biographical detail — without leaving the overlay. (AniList is an online anime/manga database; SubMiner pulls each show's character list from it.)
+SubMiner can build a Yomitan-compatible character dictionary from [AniList](https://anilist.co) metadata so that character names in subtitles are recognized, highlighted, and enrichable with context - portraits, roles, voice actors, and biographical detail - without leaving the overlay. (AniList is an online anime/manga database; SubMiner pulls each show's character list from it.)

 This is helpful because proper names rarely appear in normal dictionaries, so character names would otherwise be flagged as "unknown" words and clutter your mining. Recognizing them keeps your N+1 highlighting focused on real vocabulary.

@@ -10,25 +10,25 @@ The dictionary is generated per-media, merged across your recently-watched title

 The feature has three stages: **snapshot**, **merge**, and **match**.

-1. **Snapshot** — When you start watching a new title, SubMiner queries the AniList GraphQL API for the media's character list. Each character's names, reading, role, description, birthday, voice actors, and portrait are fetched and saved as a local JSON snapshot in `character-dictionaries/snapshots/anilist-{mediaId}.json`. Images are downloaded and base64-encoded into the snapshot.
+1. **Snapshot** - When you start watching a new title, SubMiner queries the AniList GraphQL API for the media's character list. Each character's names, reading, role, description, birthday, voice actors, and portrait are fetched and saved as a local JSON snapshot in `character-dictionaries/snapshots/anilist-{mediaId}.json`. Images are downloaded and base64-encoded into the snapshot.

-2. **Merge** — SubMiner maintains a most-recently-used list of media IDs (default: 3). Snapshots from those titles are merged into a single Yomitan ZIP — `character-dictionaries/merged.zip` — which is always named "SubMiner Character Dictionary" so Yomitan treats it as a single stable dictionary across rebuilds.
+2. **Merge** - SubMiner maintains a most-recently-used list of media IDs (default: 3). Snapshots from those titles are merged into a single Yomitan ZIP - `character-dictionaries/merged.zip` - which is always named "SubMiner Character Dictionary" so Yomitan treats it as a single stable dictionary across rebuilds.

-3. **Match** — During subtitle rendering, Yomitan scans subtitle text against all loaded dictionaries including the character dictionary. SubMiner only accepts character entries for the current AniList media when that media ID is known, then flags matching tokens with `isNameMatch` and highlights them in the overlay with a distinct color.
+3. **Match** - During subtitle rendering, Yomitan scans subtitle text against all loaded dictionaries including the character dictionary. SubMiner only accepts character entries for the current AniList media when that media ID is known, then flags matching tokens with `isNameMatch` and highlights them in the overlay with a distinct color.

 ## Enabling the Feature

 Character dictionary sync is disabled by default. To turn it on:

 1. Enable **Name Match** in Settings → Subtitle Style, or set `subtitleStyle.nameMatchEnabled: true` in your config.
-2. Start watching — SubMiner queries AniList's public GraphQL API (no authentication required) and imports the merged dictionary into Yomitan automatically.
+2. Start watching - SubMiner queries AniList's public GraphQL API (no authentication required) and imports the merged dictionary into Yomitan automatically.
 3. Optionally enable **Name Match Images** (Settings → Subtitle Style) to show inline circular character portraits next to matched names in subtitles.

 ```jsonc
 {
  "subtitleStyle": {
    "nameMatchEnabled": true,
-    "nameMatchImagesEnabled": true, // optional — inline portraits
+    "nameMatchImagesEnabled": true, // optional - inline portraits
  },
 }
 ```
@@ -38,7 +38,7 @@ The first sync for a media title takes a few seconds while character data and po
 :::

 ::: info
-AniList character data is fetched via public GraphQL queries — no account or access token is needed. AniList authentication is only required for the separate [watch-progress sync](/anilist-integration) feature.
+AniList character data is fetched via public GraphQL queries - no account or access token is needed. AniList authentication is only required for the separate [watch-progress sync](/anilist-integration) feature.
 :::

 ::: warning
@@ -60,7 +60,7 @@ A single character produces many searchable terms so that names are recognized r

 - ア・リ・ス → アリス (combined), plus individual segments

-**Honorific suffixes** — each base name is expanded with 15 common suffixes:
+**Honorific suffixes** - each base name is expanded with 15 common suffixes:

 | Honorific | Reading    |
 | --------- | ---------- |
@@ -80,16 +80,16 @@ A single character produces many searchable terms so that names are recognized r
 | 社長      | しゃちょう |
 | 部長      | ぶちょう   |

-**Romanized names** — names stored in romaji on AniList are converted to kana aliases so they can match against Japanese subtitle text.
+**Romanized names** - names stored in romaji on AniList are converted to kana aliases so they can match against Japanese subtitle text.

-This means a character like "太郎" generates entries for 太郎, 太郎さん, 太郎先生, 太郎君, 太郎ちゃん, and so on — all with correct readings.
+This means a character like "太郎" generates entries for 太郎, 太郎さん, 太郎先生, 太郎君, 太郎ちゃん, and so on - all with correct readings.

 ## Name Matching

 Name matching runs inside Yomitan's scanning pipeline during subtitle tokenization.

 1. Yomitan receives subtitle text and scans for dictionary matches.
-2. Entries from "SubMiner Character Dictionary" are checked with exact primary-source matching — the token must match the entry's `originalText` with `isPrimary: true` and `matchType: 'exact'`.
+2. Entries from "SubMiner Character Dictionary" are checked with exact primary-source matching - the token must match the entry's `originalText` with `isPrimary: true` and `matchType: 'exact'`.
 3. When the current AniList media ID is known, entries whose embedded media ID belongs to a different title are ignored for name matching and inline portraits.
 4. Matched tokens are flagged `isNameMatch: true` and forwarded to the renderer.
 5. If `subtitleStyle.nameMatchEnabled` is enabled, the renderer applies the name-match highlight color (default: `#f5bde6`).
@@ -111,7 +111,7 @@ Name matches are visually distinct from [N+1 targeting, frequency highlighting,

 When `subtitleStyle.nameMatchImagesEnabled` is enabled, SubMiner injects a small circular portrait image directly into the subtitle line next to each matched character name.

-Portraits are sourced from the local snapshot — they are embedded at snapshot-generation time and served from the cached ZIP, so no network request happens during playback. Images are downloaded from AniList CDN once per character and stored in `character-dictionaries/img/`.
+Portraits are sourced from the local snapshot - they are embedded at snapshot-generation time and served from the cached ZIP, so no network request happens during playback. Images are downloaded from AniList CDN once per character and stored in `character-dictionaries/img/`.

 If a snapshot was generated before portrait data was available (e.g. during an earlier version or offline sync), SubMiner detects the missing image data on the next media match and automatically refreshes the snapshot so portraits are included in the next merged dictionary build.

@@ -123,20 +123,20 @@ If a snapshot was generated before portrait data was available (e.g. during an e
 The portrait size is controlled by the surrounding subtitle font size and renders as a circle clipped from the character's AniList cover image.

 ::: tip
-Inline portraits help you quickly associate names with faces while building vocabulary — especially useful for shows with large casts where you're still learning who's who.
+Inline portraits help you quickly associate names with faces while building vocabulary - especially useful for shows with large casts where you're still learning who's who.
 :::

 ## Dictionary Entries

 Each character entry in the Yomitan dictionary includes structured content:

- **Name** — the matched Japanese name form
- **Known names** — generated non-honorific Japanese aliases for that character, excluding raw romanized/English aliases from lookup results
- **Role badge** — color-coded by role: main (score 100), supporting (90), side (80), background (70)
- **Portrait** — character image from AniList, embedded in the ZIP
- **Description** — biography text from AniList (collapsible)
- **Character information** — age, birthday, gender, blood type (collapsible)
- **Voiced by** — voice actor name and portrait (collapsible)
+- **Name** - the matched Japanese name form
+- **Known names** - generated non-honorific Japanese aliases for that character, excluding raw romanized/English aliases from lookup results
+- **Role badge** - color-coded by role: main (score 100), supporting (90), side (80), background (70)
+- **Portrait** - character image from AniList, embedded in the ZIP
+- **Description** - biography text from AniList (collapsible)
+- **Character information** - age, birthday, gender, blood type (collapsible)
+- **Voiced by** - voice actor name and portrait (collapsible)

 The three collapsible sections can be configured to start open or closed:

@@ -160,12 +160,12 @@ When `subtitleStyle.nameMatchEnabled` is `true`, SubMiner runs an auto-sync rout

 **Phases:**

-1. **checking** — Is there already a cached snapshot for this media ID?
-2. **generating** — No cache hit: fetch characters from AniList GraphQL, download portraits (250ms throttle between image requests), save snapshot JSON.
-3. **syncing** — Add the media ID to the most-recently-used list. Evict old entries beyond `maxLoaded`.
-4. **building** — Merge active snapshots into a single Yomitan ZIP. A SHA-1 revision hash is computed from the media set — if it matches the previously imported revision, the import is skipped.
-5. **importing** — Push the ZIP into Yomitan. Waits for Yomitan mutation readiness (7-second timeout per operation).
-6. **ready** — Dictionary is live. Character names will match on the next subtitle line.
+1. **checking** - Is there already a cached snapshot for this media ID?
+2. **generating** - No cache hit: fetch characters from AniList GraphQL, download portraits (250ms throttle between image requests), save snapshot JSON.
+3. **syncing** - Add the media ID to the most-recently-used list. Evict old entries beyond `maxLoaded`.
+4. **building** - Merge active snapshots into a single Yomitan ZIP. A SHA-1 revision hash is computed from the media set - if it matches the previously imported revision, the import is skipped.
+5. **importing** - Push the ZIP into Yomitan. Waits for Yomitan mutation readiness (7-second timeout per operation).
+6. **ready** - Dictionary is live. Character names will match on the next subtitle line.

 **State tracking** is persisted in `character-dictionaries/auto-sync-state.json`. AniList media matches are cached separately in `character-dictionaries/anilist-resolution-cache.json` so snapshot hits do not need another AniList search.

@@ -274,9 +274,9 @@ merged.zip

 ## Reference Implementation

-SubMiner's character dictionary builder is inspired by the [Japanese Character Name Dictionary](https://github.com/bee-san/Japanese_Character_Name_Dictionary) project — a standalone Rust web service that generates Yomitan character dictionaries from AniList and VNDB data.
+SubMiner's character dictionary builder is inspired by the [Japanese Character Name Dictionary](https://github.com/bee-san/Japanese_Character_Name_Dictionary) project - a standalone Rust web service that generates Yomitan character dictionaries from AniList and VNDB data.

-The reference implementation covers similar ground — name variant generation, honorific expansion, structured Yomitan content, portrait embedding — and additionally supports VNDB as a data source for visual novel characters. Key differences:
+The reference implementation covers similar ground - name variant generation, honorific expansion, structured Yomitan content, portrait embedding - and additionally supports VNDB as a data source for visual novel characters. Key differences:

 |                        | SubMiner                                     | Reference Implementation              |
 | ---------------------- | -------------------------------------------- | ------------------------------------- |
@@ -291,7 +291,7 @@ If you work with visual novels or want a standalone dictionary generator indepen

 ## Troubleshooting

- **Names not highlighting:** Confirm `subtitleStyle.nameMatchEnabled` is `true`. Check that the current media has an AniList entry — SubMiner needs a media ID to fetch characters.
+- **Names not highlighting:** Confirm `subtitleStyle.nameMatchEnabled` is `true`. Check that the current media has an AniList entry - SubMiner needs a media ID to fetch characters.
 - **Inline portraits missing:** Confirm `subtitleStyle.nameMatchImagesEnabled` is `true`. On the next character dictionary sync, SubMiner refreshes current-version snapshots that do not contain usable cached character portrait data. Portraits still require AniList to return an image and the image download to succeed.
 - **Sync seems stuck:** The auto-sync debounces for 800ms after media changes and throttles image downloads at 250ms per image. Large casts (50+ characters) take longer. Check the status bar for the current sync phase.
 - **Wrong characters showing:** Open the in-app character dictionary manager (`Ctrl/Cmd+D`) to remove/reorder loaded titles, then use **Override** to correct the active AniList match. You can also run `--dictionary-candidates`, then save the correct media with `--dictionary-select --dictionary-anilist-id <id>`. SubMiner ignores character entries from other loaded titles for subtitle name matching and inline portraits once the current media ID is known.
@@ -300,6 +300,6 @@ If you work with visual novels or want a standalone dictionary generator indepen

 ## Related

- [Subtitle Annotations](/subtitle-annotations) — how name matches interact with N+1, frequency, and JLPT layers
- [AniList Integration](/anilist-integration) — watch-progress sync and AniList authentication (separate from character dictionary)
- [Configuration Reference](/configuration) — full config options
+- [Subtitle Annotations](/subtitle-annotations) - how name matches interact with N+1, frequency, and JLPT layers
+- [AniList Integration](/anilist-integration) - watch-progress sync and AniList authentication (separate from character dictionary)
+- [Configuration Reference](/configuration) - full config options
@@ -8,7 +8,7 @@ outline: [2, 3]
 import { withBase } from 'vitepress';
 </script>

-SubMiner is configured through a single file (`config.jsonc`). Most settings are also editable from the in-app **Settings** window — you rarely need to edit the file by hand. This page is the full reference: it explains the Settings window, where the config file lives, and documents every option grouped by topic. New to SubMiner? The Quick Start below plus the [Settings window](#settings) cover everything most users need.
+SubMiner is configured through a single file (`config.jsonc`). Most settings are also editable from the in-app **Settings** window - you rarely need to edit the file by hand. This page is the full reference: it explains the Settings window, where the config file lives, and documents every option grouped by topic. New to SubMiner? The Quick Start below plus the [Settings window](#settings) cover everything most users need.

 ## Quick Start

@@ -39,7 +39,7 @@ Then customize as needed using the sections below.

 ## Settings

-SubMiner includes a dedicated **Settings** window accessible from the tray menu, the app `--settings` flag, or launcher commands such as `subminer --settings` and `subminer settings`. It is the primary way to configure SubMiner — all changes are written directly to `config.jsonc`, so manual file editing is not required for most users.
+SubMiner includes a dedicated **Settings** window accessible from the tray menu, the app `--settings` flag, or launcher commands such as `subminer --settings` and `subminer settings`. It is the primary way to configure SubMiner - all changes are written directly to `config.jsonc`, so manual file editing is not required for most users.

 The Settings window groups options by workflow instead of mirroring the raw config-file shape:

@@ -52,7 +52,7 @@ The Settings window groups options by workflow instead of mirroring the raw conf
 - Tracking & App
 - Advanced

-Each field still writes to its current `config.jsonc` path. For example, subtitle hover pause appears under **Behavior** / playback behavior, but saves to `subtitleStyle.autoPauseVideoOnHover`. Anki-aware fields can query AnkiConnect for deck names, note types, and field names. The AnkiConnect deck field also reads Yomitan's current mining deck and auto-fills an empty setting when one is found. Keybinding fields use click-to-learn controls instead of raw text boxes.
+Each field still writes to its current `config.jsonc` path. For example, subtitle hover pause appears under **Behavior** / playback behavior, but saves to `subtitleStyle.autoPauseVideoOnHover`. Anki-aware fields can query AnkiConnect for deck names, note types, and field names. The AnkiConnect deck field also reads Yomitan's current mining deck and persists it into an empty setting when one is found. Stats mining also uses Yomitan's current mining deck when `ankiConnect.deck` is empty. Keybinding fields use click-to-learn controls instead of raw text boxes.

 The Settings window preserves existing JSONC comments, trailing commas, and unrelated keys. Resetting a field removes the explicit config path so the built-in default applies.

@@ -223,7 +223,7 @@ Control whether the overlay automatically becomes visible when it connects to mp
 | -------------------- | --------------- | ----------------------------------------------------- |
 | `auto_start_overlay` | `true`, `false` | Auto-show overlay on mpv connection (default: `true`) |

-When you launch through the SubMiner app or the `subminer` wrapper, the launcher reads these settings from this config and injects them into the mpv plugin at runtime — there is no separate plugin config file to edit. `auto_start_overlay` controls whether the visible overlay shows on auto-start. Two related keys in the `mpv` block tune startup behavior: `mpv.autoStartSubMiner` starts the overlay automatically when a file loads, and `mpv.pauseUntilOverlayReady` pauses mpv on visible auto-start until SubMiner signals overlay/tokenization readiness.
+When you launch through the SubMiner app or the `subminer` wrapper, the launcher reads these settings from this config and injects them into the mpv plugin at runtime - there is no separate plugin config file to edit. `auto_start_overlay` controls whether the visible overlay shows on auto-start. Two related keys in the `mpv` block tune startup behavior: `mpv.autoStartSubMiner` starts the overlay automatically when a file loads, and `mpv.pauseUntilOverlayReady` pauses mpv on visible auto-start until SubMiner signals overlay/tokenization readiness.

 On Windows, packaged plugin installs also rewrite the plugin socket path to `\\.\pipe\subminer-socket`.

@@ -517,8 +517,8 @@ See `config.example.jsonc` for detailed configuration options.
 ```

 | Option                  | Values                             | Description                                                                                                         |
-| ----------------------- | ---------------------------------- | ------------------------------------------------------ |
-| `secondarySubLanguages` | string[]                           | Language codes to auto-load (e.g., `["eng", "en"]`)    |
+| ----------------------- | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| `secondarySubLanguages` | string[]                           | Language codes to auto-load (e.g., `["eng", "en"]`); non-Signs/Songs tracks are preferred when several tracks match |
 | `autoLoadSecondarySub`  | `true`, `false`                    | Auto-detect and load matching secondary subtitle track                                                              |
 | `defaultMode`           | `"hidden"`, `"visible"`, `"hover"` | Initial display mode (default: `"hover"`)                                                                           |

@@ -526,9 +526,9 @@ The secondary-subtitle language list also acts as the fallback secondary-languag

 **Display modes:**

- **hidden** — Secondary subtitles not shown
- **visible** — Always visible at top of overlay
- **hover** — Only visible when hovering over the subtitle area (default)
+- **hidden** - Secondary subtitles not shown
+- **visible** - Always visible at top of overlay
+- **hover** - Only visible when hovering over the subtitle area (default)

 **See `config.example.jsonc`** for additional secondary subtitle configuration options.

@@ -944,7 +944,7 @@ This example is intentionally compact. The option table below documents availabl
 **Requirements:** [AnkiConnect](https://github.com/FooSoft/anki-connect) plugin must be installed and running in Anki. ffmpeg must be installed for media generation.

 | Option                                            | Values                                  | Description                                                                                                                                                                                                                     |
-| ------------------------------------------------- | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ------------------------------------------------- | --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `ankiConnect.enabled`                             | `true`, `false`                         | Enable AnkiConnect integration (default: `true`)                                                                                                                                                                                |
 | `url`                                             | string (URL)                            | AnkiConnect API URL (default: `http://127.0.0.1:8765`)                                                                                                                                                                          |
 | `pollingRate`                                     | number (ms)                             | How often to check for new cards in polling mode (default: `3000`; ignored for direct proxy `addNote`/`addNotes` updates)                                                                                                       |
@@ -953,7 +953,7 @@ This example is intentionally compact. The option table below documents availabl
 | `proxy.port`                                      | number                                  | Bind port for local AnkiConnect proxy (default: `8766`)                                                                                                                                                                         |
 | `proxy.upstreamUrl`                               | string (URL)                            | Upstream AnkiConnect URL that proxy forwards to (default: `http://127.0.0.1:8765`)                                                                                                                                              |
 | `tags`                                            | array of strings                        | Tags automatically added to cards mined/updated by SubMiner (default: `['SubMiner']`; set `[]` to disable automatic tagging).                                                                                                   |
-| `ankiConnect.deck`                                | string                                  | Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to search all decks. In Settings, this dropdown auto-fills from Yomitan's current mining deck when available.               |
+| `ankiConnect.deck`                                | string                                  | Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to use the Yomitan mining deck when available. In Settings, this dropdown auto-fills and persists Yomitan's current mining deck when available. |
 | `fields.word`                                     | string                                  | Card field for mined word / expression text (default: `Expression`)                                                                                                                                                             |
 | `fields.audio`                                    | string                                  | Card field for audio files (default: `ExpressionAudio`)                                                                                                                                                                         |
 | `fields.image`                                    | string                                  | Card field for images (default: `Picture`)                                                                                                                                                                                      |
@@ -1101,8 +1101,8 @@ Set `openBrowser` to `false` to only print the URL without opening a browser.

 Sync the active subtitle track from the overlay picker using `alass` or `ffsubsync`. Both are **optional external tools** that must be installed separately and available on your `PATH` (or configured via the path options below).

- [`alass`](https://github.com/kaegi/alass) — fast, audio-independent sync using a secondary subtitle as reference
- [`ffsubsync`](https://github.com/smacke/ffsubsync) — audio-based sync using the video file as reference
+- [`alass`](https://github.com/kaegi/alass) - fast, audio-independent sync using a secondary subtitle as reference
+- [`ffsubsync`](https://github.com/smacke/ffsubsync) - audio-based sync using the video file as reference

 ```json
 {
@@ -1122,6 +1122,8 @@ Sync the active subtitle track from the overlay picker using `alass` or `ffsubsy
 | `ffmpeg_path`    | string path     | Path to `ffmpeg` (used for internal subtitle extraction). Empty or `null` falls back to `/usr/bin/ffmpeg`.                |
 | `replace`        | `true`, `false` | When `true` (default), overwrite the active subtitle file on successful sync. When `false`, write `<name>_retimed.<ext>`. |

+Stats dashboard sentence mining also uses `alass_path` when available to align a local English sidecar against the local Japanese sidecar before filling the card translation field. This stats-only retime writes a temporary cached copy and never edits the original subtitle files.
+
 Default trigger is `Ctrl+Alt+S` via `shortcuts.triggerSubsync`.
 Customize it there, or set it to `null` to disable.

@@ -1433,7 +1435,7 @@ Usage notes:
 - The browser UI is served at `http://127.0.0.1:<serverPort>`.
 - The overlay toggle is local to the focused visible overlay window; it is not registered as a global OS shortcut.
 - The dashboard reads from the same immersion-tracking database, so keep `immersionTracking.enabled` on if you want data to appear.
- The UI includes Overview, Library, Trends, Vocabulary, and Sessions tabs.
+- The UI includes Overview, Library, Trends, Vocabulary, Search, and Sessions tabs.

 ### MPV Launcher

@@ -1457,7 +1459,7 @@ Configure the mpv executable, profile, and window state for SubMiner-managed mpv
 ```

 | Option                   | Values                                                                      | Description                                                                                                                         |
-| ----------------------- | ------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| ------------------------ | --------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
 | `executablePath`         | string                                                                      | Absolute path to `mpv.exe` for Windows launch flows. Leave empty to auto-discover from `SUBMINER_MPV_PATH` or `PATH` (default `""`) |
 | `profile`                | string                                                                      | mpv profile name passed as `--profile=<name>`. Leave empty to pass no profile (default `""`)                                        |
 | `launchMode`             | `"normal"` \| `"maximized"` \| `"fullscreen"`                               | Window state when SubMiner spawns mpv (default `"normal"`)                                                                          |
@@ -1473,9 +1475,9 @@ If `mpv.profile` is configured and the launcher also receives `--profile`, SubMi

 Launch mode behavior:

- **`normal`** — mpv opens at its default window size with no extra flags.
- **`maximized`** — mpv starts maximized via `--window-maximized=yes`, keeping taskbar access.
- **`fullscreen`** — mpv starts in true fullscreen via `--fullscreen`.
+- **`normal`** - mpv opens at its default window size with no extra flags.
+- **`maximized`** - mpv starts maximized via `--window-maximized=yes`, keeping taskbar access.
+- **`fullscreen`** - mpv starts in true fullscreen via `--fullscreen`.

 ### YouTube Playback Settings

@@ -25,7 +25,7 @@ Mine vocabulary cards from Yomitan or directly from subtitle lines. SubMiner aut

 ## Subtitle Download & Sync

-Search and download subtitles from Jimaku, then retime them with alass or ffsubsync — all from within SubMiner.
+Search and download subtitles from Jimaku, then retime them with alass or ffsubsync - all from within SubMiner.

 <!-- <video controls playsinline preload="metadata" :poster="withBase(`/assets/demos/subtitle-sync-poster.jpg?v=${v}`)">
  <source :src="withBase(`/assets/demos/subtitle-sync.webm?v=${v}`)" type="video/webm" />
@@ -11,15 +11,10 @@ For internal architecture/workflow guidance, use `docs/README.md` at the repo ro
 ```bash
 git clone --recurse-submodules https://github.com/ksyasuda/SubMiner.git
 cd SubMiner
-# if you cloned without --recurse-submodules:
-git submodule update --init --recursive
-
-bun install
-(cd stats && bun install --frozen-lockfile)
-(cd vendor/texthooker-ui && bun install --frozen-lockfile)
+make deps
 ```

-`make deps` is still available as a convenience wrapper around the same dependency install flow.
+`make deps` initializes submodules and installs root, `stats/`, and `vendor/texthooker-ui` dependencies. The Yomitan submodule installs its own dependencies on demand during `bun run build`.

 ## Building

@@ -216,7 +211,7 @@ Run `make help` for a full list of targets. Key ones:
 | `make build`                | Build platform package for detected OS                            |
 | `make build-launcher`       | Generate Bun launcher wrapper at `dist/launcher/subminer`         |
 | `make install`              | Install platform artifacts (wrapper, theme, AppImage/app bundle)  |
-| `make deps`                 | Install JS dependencies (root + stats + texthooker-ui)            |
+| `make deps`                 | Init submodules and install root/stats/texthooker-ui deps         |
 | `make pretty`               | Run scoped Prettier formatting for maintained source/config files |
 | `make generate-config`      | Generate default config from centralized registry                 |
 | `make build-linux`          | Convenience wrapper for Linux packaging                           |
@@ -2,12 +2,12 @@

 SubMiner can log your watching and mining activity to a local SQLite database, then surface it in the built-in stats dashboard. Tracking is enabled by default and can be turned off if you do not want local analytics.

-"Immersion" here means time spent watching and reading native Japanese content. **All data stays on your computer** — nothing is uploaded anywhere. (SQLite is just a single-file database; you do not need to install or manage anything.)
+"Immersion" here means time spent watching and reading native Japanese content. **All data stays on your computer** - nothing is uploaded anywhere. (SQLite is just a single-file database; you do not need to install or manage anything.)

 When enabled, SubMiner records per-session statistics (watch time, subtitle lines seen, words encountered, cards mined) and maintains exact lifetime summary tables plus daily/monthly rollups. You can view that data in SubMiner's stats UI or query the database directly with any SQLite tool.

 ::: tip For most users
-Just leave tracking on and use the built-in [Stats Dashboard](#stats-dashboard). The retention, performance, SQL, and schema sections further down are reference material for advanced users who want to inspect or tune the database — you can safely skip them.
+Just leave tracking on and use the built-in [Stats Dashboard](#stats-dashboard). The retention, performance, SQL, and schema sections further down are reference material for advanced users who want to inspect or tune the database - you can safely skip them.
 :::

 Episode completion for local `watched` state uses the shared `DEFAULT_MIN_WATCH_RATIO` (`85%`) value from `src/shared/watch-threshold.ts`.
@@ -18,8 +18,8 @@ Episode completion for local `watched` state uses the shared `DEFAULT_MIN_WATCH_
 {
  "immersionTracking": {
    "enabled": true,
-    "dbPath": ""
-  }
+    "dbPath": "",
+  },
 }
 ```

@@ -48,13 +48,19 @@ Recent sessions, streak calendar, watch-time history, and a tracking snapshot wi

 Cover-art library with search and sorting, per-series progress, episode drill-down, and direct links into mined cards.

+Local files and Jellyfin items with detected season numbers are split into season-specific library entries, so `Season 1` and `Season 2` folders do not merge into one show card.
+
+When older stats already grouped multiple seasons under one series entry, SubMiner moves parsed episodes into the season-specific entries on startup and rebuilds the affected summaries.
+
+Jellyfin stream URLs are normalized to stable item links before stats titles are shown, so playback query parameters are not displayed in the dashboard.
+
 When YouTube channel metadata is available, the Library tab groups videos by creator/channel and treats each tracked video as an episode-like entry inside that channel section.

 ![Stats Library](/screenshots/stats-library.png)

 #### Trends

-Watch time, sessions, words seen, and per-anime progress/pattern charts with configurable date ranges and grouping.
+Grouped into Activity (per-day/month watch time, cards, words, sessions), Cumulative Totals (running totals incl. new words seen and episodes), Efficiency (words/min, cards/hour, lookups per 100 words), Patterns (watch time by day of week and hour), and per-anime Library charts — all with configurable date ranges and grouping.

 ![Stats Trends](/screenshots/stats-trends.png)

@@ -66,10 +72,14 @@ Expandable session history with new-word activity, cumulative totals, and pause/

 #### Vocabulary

-Top repeated words (click a bar to open the word), new-word timeline, frequency rank table with full readings, kanji breakdown, word exclusion list, and click-through occurrence drilldown with Mine Word / Mine Sentence / Mine Audio buttons.
+Top repeated words (click a bar to open the word), new-word timeline, cross-title and frequency rank tables with Hide Known / Hide Kana filters, kanji breakdown, word exclusion list, and click-through occurrence drilldown with Mine Word / Mine Sentence / Mine Audio buttons.

 ![Stats Vocabulary](/screenshots/stats-vocabulary.png)

+#### Search
+
+Realtime search across tracked primary subtitle lines and media titles. Results show the source media, session, line number, timing, and sentence text. Secondary subtitle text is not shown or searched here because separate subtitle tracks may not line up sentence-for-sentence. Sentence cards can be mined from any result with a valid local source and timing. Word and audio card buttons appear only when the searched word exactly appears in the primary sentence text; matching text is highlighted in the result.
+
 Stats server config lives under `stats`:

 ```jsonc
@@ -78,8 +88,8 @@ Stats server config lives under `stats`:
    "toggleKey": "Backquote",
    "serverPort": 6969,
    "autoStartServer": true,
-    "autoOpenBrowser": false
-  }
+    "autoOpenBrowser": false,
+  },
 }
 ```

@@ -96,15 +106,15 @@ Stats server config lives under `stats`:

 ## Mining Cards from the Stats Page

-The Vocabulary tab's word detail panel shows example lines from your viewing history. Each example line with a valid source file offers three mining buttons:
+The Search tab and the Vocabulary tab's word detail panel both mine from subtitle lines in your viewing history. Search matches sentence text and media titles, and **Search by headword** is enabled by default so dictionary-form searches such as `知らない` can find tracked subtitle lines with inflected variants. Turn that toggle off for exact text/title matching only. Each line with a valid source file offers sentence-card mining; word/audio mining is available when the selected word or searched word appears in the sentence:

- **Mine Word** — performs a full Yomitan dictionary lookup for the word (definition, reading, pitch accent, etc.) via a short-lived hidden helper, then enriches the card with sentence audio, a screenshot or animated AVIF clip, the highlighted sentence, and metadata extracted from the source video file. Requires Anki and Yomitan dictionaries to be loaded.
- **Mine Sentence** — creates a sentence card directly with the `IsSentenceCard` flag set (for Lapis/Kiku workflows), along with audio, image, and translation from the secondary subtitle if available.
- **Mine Audio** — creates an audio-only card with the `IsAudioCard` flag, attaching only the sentence audio clip.
+- **Mine Word** - performs a full Yomitan dictionary lookup for the word (definition, reading, pitch accent, etc.) via a short-lived hidden helper, then enriches the card with sentence audio, a screenshot or animated AVIF clip, the highlighted sentence, and metadata extracted from the source video file. Requires Anki and Yomitan dictionaries to be loaded.
+- **Mine Sentence** - creates a sentence card directly with the `IsSentenceCard` flag set (for Lapis/Kiku workflows), along with audio and image from the source video.
+- **Mine Audio** - creates an audio-only card with the `IsAudioCard` flag, attaching only the sentence audio clip.

 All three modes respect your `ankiConnect` config: deck, model, field mappings, media settings (static vs AVIF, quality, dimensions), audio padding, metadata pattern, and tags. Media generation runs in parallel for faster card creation.

-Secondary subtitle text (typically English translations) is stored alongside primary subtitles during playback and used as the translation field when mining from the stats page.
+Secondary subtitle text (typically English translations) is stored alongside primary subtitles during playback and can be used as the translation field when mining sentence cards from Search or vocabulary occurrences. The Search tab does not use that text for display or matching.

 ### Word Exclusion List

@@ -115,7 +125,7 @@ The Vocabulary tab toolbar includes an **Exclusions** button for hiding words fr
 By default, SubMiner keeps all retention tables and raw data (`0` means keep all) while continuing daily/monthly rollup maintenance:

 | Data type       | Retention    |
-| -------------- | --------- |
+| --------------- | ------------ |
 | Raw events      | 0 (keep all) |
 | Telemetry       | 0 (keep all) |
 | Sessions        | 0 (keep all) |
@@ -147,7 +157,7 @@ The tracker is optimized for "keep everything" defaults:
 All policy options live under `immersionTracking` in your config:

 | Option                         | Description                                                        |
-| ------ | ----------- |
+| ------------------------------ | ------------------------------------------------------------------ |
 | `batchSize`                    | Writes per flush batch                                             |
 | `flushIntervalMs`              | Max delay between flushes (default: 500ms)                         |
 | `queueCap`                     | Max queued writes before oldest are dropped                        |
@@ -281,11 +291,11 @@ LIMIT ?;

 Core tables:

- `imm_videos` — video key/title/source metadata
- `imm_sessions` — session UUID, video reference, timing/status, final denormalized totals
- `imm_session_telemetry` — high-frequency session aggregates over time
- `imm_session_events` — event stream with compact numeric event types
- `imm_subtitle_lines` — persisted subtitle text and timing per session/video
+- `imm_videos` - video key/title/source metadata
+- `imm_sessions` - session UUID, video reference, timing/status, final denormalized totals
+- `imm_session_telemetry` - high-frequency session aggregates over time
+- `imm_session_events` - event stream with compact numeric event types
+- `imm_subtitle_lines` - persisted subtitle text and timing per session/video

 Lifetime summary tables:

@@ -306,5 +316,5 @@ Vocabulary tables:

 Media-art tables:

- `imm_media_art` — per-video cover metadata plus shared blob reference
- `imm_cover_art_blobs` — deduplicated image bytes keyed by blob hash
+- `imm_media_art` - per-video cover metadata plus shared blob reference
+- `imm_cover_art_blobs` - deduplicated image bytes keyed by blob hash
@@ -24,7 +24,7 @@ features:
      src: /assets/mpv.svg
      alt: mpv icon
    title: Built for mpv
-    details: Tracks subtitles via mpv IPC in real time. Launch with the wrapper script or the mpv plugin — no external bridge needed.
+    details: Tracks subtitles via mpv IPC in real time. Launch with the wrapper script or the mpv plugin - no external bridge needed.
    link: /usage
    linkText: How it works
  - icon:
@@ -45,14 +45,14 @@ features:
      src: /assets/highlight.svg
      alt: Highlight icon
    title: Reading Annotations
-    details: N+1 targeting, character-name matching, frequency highlighting, and JLPT tagging — all layered on subtitle text in real time.
+    details: N+1 targeting, character-name matching, frequency highlighting, and JLPT tagging - all layered on subtitle text in real time.
    link: /subtitle-annotations
    linkText: Annotation details
  - icon:
      src: /assets/video.svg
      alt: Video playback icon
    title: YouTube Playback
-    details: Play YouTube URLs or ytsearch targets directly — SubMiner automatically selects and loads subtitles for the video.
+    details: Play YouTube URLs or ytsearch targets directly - SubMiner automatically selects and loads subtitles for the video.
    link: /usage#youtube-playback
    linkText: YouTube playback
  - icon:
@@ -66,14 +66,14 @@ features:
      src: /assets/subtitle-download.svg
      alt: Subtitle download icon
    title: Subtitle Download & Sync
-    details: Search and pull subtitles from Jimaku, then retime subtitles with alass or ffsubsync — all from the overlay.
+    details: Search and pull subtitles from Jimaku, then retime subtitles with alass or ffsubsync - all from the overlay.
    link: /jimaku-integration
    linkText: Jimaku integration
  - icon:
      src: /assets/tokenization.svg
      alt: Tracking chart icon
    title: Stats Dashboard
-    details: Browse session history, streak calendars, vocabulary frequency, and per-series progress in a local dashboard — then mine cards straight from your viewing history.
+    details: Browse session history, streak calendars, vocabulary frequency, and per-series progress in a local dashboard - then mine cards straight from your viewing history.
    link: /immersion-tracking
    linkText: Dashboard & tracking
  - icon:
@@ -1,12 +1,12 @@
 # Installation

-SubMiner is a desktop app that draws an interactive layer — an **overlay** — on top of the [mpv](https://mpv.io) video player. As you watch native Japanese media, you can click or hover any word in the subtitles to look it up, then turn it into an Anki flashcard without pausing to switch apps. Building flashcards from real content you're watching is called **sentence mining**, and it's what SubMiner is built for. It bundles its own copy of **Yomitan** (a pop-up dictionary) and talks to **AnkiConnect** (an add-on that lets other programs add cards to Anki) so cards get filled in automatically.
+SubMiner is a desktop app that draws an interactive layer - an **overlay** - on top of the [mpv](https://mpv.io) video player. As you watch native Japanese media, you can click or hover any word in the subtitles to look it up, then turn it into an Anki flashcard without pausing to switch apps. Building flashcards from real content you're watching is called **sentence mining**, and it's what SubMiner is built for. It bundles its own copy of **Yomitan** (a pop-up dictionary) and talks to **AnkiConnect** (an add-on that lets other programs add cards to Anki) so cards get filled in automatically.

 Three steps to get started:

-1. **Install requirements** — mpv and a few optional extras
-2. **Install SubMiner** — from the AUR, or download from GitHub Releases
-3. **Launch the app** — first-run setup walks you through dictionaries, the launcher, and everything else
+1. **Install requirements** - mpv and a few optional extras
+2. **Install SubMiner** - from the AUR, or download from GitHub Releases
+3. **Launch the app** - first-run setup walks you through dictionaries, the launcher, and everything else

 ## 1. Install Requirements

@@ -29,14 +29,14 @@ Only **mpv** is strictly required to run SubMiner. Everything else enhances the

 ### Linux

-**Window backend** — you need one of these depending on your compositor:
+**Window backend** - you need one of these depending on your compositor:

- **Hyprland** — native Wayland support (uses `hyprctl`)
- **Sway** — native Wayland support (uses `swaymsg`)
- **X11 / Xwayland** — for X11 sessions or any other Wayland compositor (uses `xdotool` and `xwininfo`)
+- **Hyprland** - native Wayland support (uses `hyprctl`)
+- **Sway** - native Wayland support (uses `swaymsg`)
+- **X11 / Xwayland** - for X11 sessions or any other Wayland compositor (uses `xdotool` and `xwininfo`)

 ::: warning Wayland support is compositor-specific
-Wayland has no universal API for window positioning — each compositor exposes its own IPC, so SubMiner needs a dedicated backend per compositor. Only Hyprland and Sway have native Wayland backends. If you run a different Wayland compositor (GNOME, KDE Plasma, river, etc.), both mpv **and** SubMiner must run under X11 or Xwayland. The `subminer` launcher handles this automatically when `--backend x11` is set or the X11 backend is auto-detected.
+Wayland has no universal API for window positioning - each compositor exposes its own IPC, so SubMiner needs a dedicated backend per compositor. Only Hyprland and Sway have native Wayland backends. If you run a different Wayland compositor (GNOME, KDE Plasma, river, etc.), both mpv **and** SubMiner must run under X11 or Xwayland. The `subminer` launcher handles this automatically when `--backend x11` is set or the X11 backend is auto-detected.
 :::

 <details>
@@ -69,7 +69,7 @@ sudo apt install yt-dlp fzf rofi chafa ffmpegthumbnailer
 sudo apt install xdotool x11-utils
 # Optional: subtitle sync
 pip install ffsubsync
-# alass is not in apt — install via cargo: cargo install alass-cli
+# alass is not in apt - install via cargo: cargo install alass-cli
 ```

 </details>
@@ -94,7 +94,7 @@ pip install ffsubsync

 ### macOS

-macOS 11 (Big Sur) or later. Accessibility permission — the macOS setting that lets one app observe and position another app's windows — is required so the overlay can follow the mpv window (see [step 2](#macos-dmg)).
+macOS 11 (Big Sur) or later. Accessibility permission - the macOS setting that lets one app observe and position another app's windows - is required so the overlay can follow the mpv window (see [step 2](#macos-dmg)).

 ```bash
 brew install mpv ffmpeg
@@ -111,7 +111,7 @@ pip install ffsubsync

 Windows 10 or later. Install [`mpv`](https://mpv.io/installation/) and [`ffmpeg`](https://ffmpeg.org/download.html) and ensure both are on `PATH`. Optionally install [MeCab for Windows](https://taku910.github.io/mecab/#download) with the UTF-8 dictionary.

-No compositor tools or window helpers are needed — native window tracking is built in.
+No compositor tools or window helpers are needed - native window tracking is built in.

 ## 2. Install SubMiner

@@ -172,8 +172,8 @@ If you prefer to install it manually, see [manual launcher install](#manual-laun

 Download the latest installer from [GitHub Releases](https://github.com/ksyasuda/SubMiner/releases/latest):

- `SubMiner-<version>.exe` — installer (recommended)
- `SubMiner-<version>-win.zip` — portable fallback
+- `SubMiner-<version>.exe` - installer (recommended)
+- `SubMiner-<version>-win.zip` - portable fallback

 Make sure `mpv.exe` is on your `PATH`, or set `mpv.executablePath` in the config during first-run setup.

@@ -185,7 +185,7 @@ Make sure `mpv.exe` is on your `PATH`, or set `mpv.executablePath` in the config
 ```bash
 git clone --recurse-submodules https://github.com/ksyasuda/SubMiner.git
 cd SubMiner
-bun install
+make deps
 bun run build

 # Optional: build AppImage
@@ -202,7 +202,7 @@ Bundled Yomitan is built during `bun run build`.
 ```bash
 git clone --recurse-submodules https://github.com/ksyasuda/SubMiner.git
 cd SubMiner
-git submodule update --init --recursive
+make deps
 make build-macos
 ```

@@ -216,14 +216,14 @@ The built app will be in the `release` directory (`.dmg` and `.zip`). For unsign
 ```powershell
 git clone https://github.com/ksyasuda/SubMiner.git
 cd SubMiner
+git submodule update --init --recursive
 bun install
-
-# Windows requires building texthooker-ui manually before the main build
-Set-Location vendor/texthooker-ui
+Set-Location stats
+bun install --frozen-lockfile
+Set-Location ../vendor/texthooker-ui
 bun install --frozen-lockfile
 bun run build
 Set-Location ../..
-
 bun run build:win
 ```

@@ -240,18 +240,18 @@ subminer app --setup
 # Linux (AppImage directly)
 ~/.local/bin/SubMiner.AppImage --setup

-# macOS — launch SubMiner.app from /Applications, or:
+# macOS - launch SubMiner.app from /Applications, or:
 subminer app --setup
 ```

-On **Windows**, just run `SubMiner.exe` — the setup wizard opens automatically on first launch.
+On **Windows**, just run `SubMiner.exe` - the setup wizard opens automatically on first launch.

 The setup wizard walks you through:

- **Config file** — auto-created at `~/.config/SubMiner/config.jsonc` (Linux/macOS) or `%APPDATA%\SubMiner\config.jsonc` (Windows)
- **Yomitan dictionaries** — import at least one dictionary so word lookups work
- **Bun + `subminer` launcher** _(optional)_ — installs the command-line launcher into a writable PATH directory
- **Windows shortcut** _(Windows only)_ — create a `SubMiner mpv` Start Menu/Desktop shortcut
+- **Config file** - auto-created at `~/.config/SubMiner/config.jsonc` (Linux/macOS) or `%APPDATA%\SubMiner\config.jsonc` (Windows)
+- **Yomitan dictionaries** - import at least one dictionary so word lookups work
+- **Bun + `subminer` launcher** _(optional)_ - installs the command-line launcher into a writable PATH directory
+- **Windows shortcut** _(Windows only)_ - create a `SubMiner mpv` Start Menu/Desktop shortcut

 The `Finish setup` button requires a config file and at least one Yomitan dictionary. Bun and the launcher are optional and never block setup completion.

@@ -268,7 +268,7 @@ subminer video.mkv

 You should see the overlay appear over mpv. If subtitles are loaded, they will appear as interactive text in the overlay.

-On **Windows**, the recommended way to play video is with the **SubMiner mpv** shortcut created during setup — double-click it, or drag a video file onto it.
+On **Windows**, the recommended way to play video is with the **SubMiner mpv** shortcut created during setup - double-click it, or drag a video file onto it.

 ### Verify Setup

@@ -285,7 +285,7 @@ This checks for the app binary, mpv, ffmpeg, config file, and socket path. Fix a
 If you plan to mine Anki cards:

 1. Install [Anki](https://apps.ankiweb.net/)
-2. Install [AnkiConnect](https://ankiweb.net/shared/info/2055492159) — open Anki → **Tools → Add-ons → Get Add-ons** → enter code `2055492159`
+2. Install [AnkiConnect](https://ankiweb.net/shared/info/2055492159) - open Anki → **Tools → Add-ons → Get Add-ons** → enter code `2055492159`
 3. Restart Anki and keep it running while using SubMiner

 AnkiConnect listens on `http://127.0.0.1:8765` by default. SubMiner connects automatically with no extra config needed.
@@ -310,9 +310,9 @@ The tray "Check for Updates" entry installs the new app automatically on Linux,

 SubMiner is an overlay that sits on top of mpv. It connects to mpv through an IPC socket, renders subtitles as interactive text using a bundled Yomitan dictionary engine, and optionally creates Anki flashcards via AnkiConnect.

-The `subminer` launcher handles mpv IPC socket setup automatically. If you launch mpv yourself or from another tool, you must pass `--input-ipc-server=/tmp/subminer-socket` (or `\\.\pipe\subminer-socket` on Windows) — without it the overlay starts but subtitles won't appear.
+The `subminer` launcher handles mpv IPC socket setup automatically. If you launch mpv yourself or from another tool, you must pass `--input-ipc-server=/tmp/subminer-socket` (or `\\.\pipe\subminer-socket` on Windows) - without it the overlay starts but subtitles won't appear.

-The bundled mpv plugin is injected at runtime automatically — you don't need to install it separately. It provides in-player keybindings (the `y` chord) for controlling the overlay from within mpv. See [MPV Plugin](/mpv-plugin) for the full keybinding and configuration reference.
+The bundled mpv plugin is injected at runtime automatically - you don't need to install it separately. It provides in-player keybindings (the `y` chord) for controlling the overlay from within mpv. See [MPV Plugin](/mpv-plugin) for the full keybinding and configuration reference.

 ## Platform Notes

@@ -330,7 +330,7 @@ Ensure `mecab` is available on your PATH when launching SubMiner.

 - The **SubMiner mpv** shortcut is the recommended way to launch playback. It starts `mpv.exe` with the right IPC socket and subtitle defaults.
 - First-run setup adds only `%LOCALAPPDATA%\SubMiner\bin` to the HKCU user PATH. It does not add `SubMiner.exe` to PATH.
- IPC socket on Windows is `\\.\pipe\subminer-socket` — do not use `/tmp/subminer-socket`.
+- IPC socket on Windows is `\\.\pipe\subminer-socket` - do not use `/tmp/subminer-socket`.
 - Config is stored at `%APPDATA%\SubMiner\config.jsonc`.

 ## Manual Launcher Install
@@ -374,4 +374,4 @@ cp /tmp/assets/themes/subminer.rasi ~/.local/share/SubMiner/themes/subminer.rasi

 Override with `SUBMINER_ROFI_THEME=/absolute/path/to/theme.rasi`.

-Next: [Usage](/usage) — learn about the `subminer` wrapper, keybindings, and YouTube playback.
+Next: [Usage](/usage) - learn about the `subminer` wrapper, keybindings, and YouTube playback.
@@ -1,8 +1,8 @@
 # IPC + Runtime Contracts

-SubMiner's Electron app runs two isolated processes — main and renderer — that can only communicate through IPC channels. This boundary is intentional: the renderer is an untrusted surface (it loads Yomitan, renders user-controlled subtitle text, and runs in a Chromium sandbox), so every message crossing the bridge passes through a validation layer before it can reach domain logic.
+SubMiner's Electron app runs two isolated processes - main and renderer - that can only communicate through IPC channels. This boundary is intentional: the renderer is an untrusted surface (it loads Yomitan, renders user-controlled subtitle text, and runs in a Chromium sandbox), so every message crossing the bridge passes through a validation layer before it can reach domain logic.

-The contract system enforces this by making channel names, payload shapes, and validators co-located and co-evolved. A change to any IPC surface touches the contract, the validator, the preload bridge, and the handler in the same commit — drift between any of those layers is treated as a bug.
+The contract system enforces this by making channel names, payload shapes, and validators co-located and co-evolved. A change to any IPC surface touches the contract, the validator, the preload bridge, and the handler in the same commit - drift between any of those layers is treated as a bug.

 ## Message Flow

@@ -38,7 +38,7 @@ flowchart TB

 ## Runtime Sockets

-The renderer↔main bridge above lives *inside* the Electron app. A separate set of OS sockets connects the app to the other runtimes — mpv and the launcher/plugin. These carry no renderer payloads and bypass the contract/validator layer; they are command and property channels between processes.
+The renderer↔main bridge above lives *inside* the Electron app. A separate set of OS sockets connects the app to the other runtimes - mpv and the launcher/plugin. These carry no renderer payloads and bypass the contract/validator layer; they are command and property channels between processes.

 - **mpv IPC socket** (`/tmp/subminer-socket`, or `\\.\pipe\subminer-socket` on Windows): the `MpvIpcClient` in the main process connects here to send JSON commands and subscribe to playback/subtitle properties via `observe_property`. Created by mpv's `--input-ipc-server`.
 - **App control socket** (`/tmp/subminer-control-<uid>-<hash>.sock`, or a named pipe on Windows): the launcher and the mpv plugin send CLI-style commands (`--start`, `--show-visible-overlay`, `--texthooker`) to a running app here. It also dedupes a second `subminer` invocation into the existing instance instead of launching twice.
@@ -73,7 +73,7 @@ How these sockets are established during launch is covered in [Playback Startup
 | --- | --- |
 | `src/shared/ipc/contracts.ts` | Canonical channel names and payload type contracts. Single source of truth for both processes. |
 | `src/shared/ipc/validators.ts` | Runtime payload parsers and type guards. Every `invoke` payload is validated here before the handler runs. |
-| `src/preload.ts` | Renderer-side bridge. Exposes a typed API surface to the renderer — only approved channels are accessible. |
+| `src/preload.ts` | Renderer-side bridge. Exposes a typed API surface to the renderer - only approved channels are accessible. |
 | `src/main/ipc-runtime.ts` | Main-process handler registration and routing. Wires validated channels to domain handlers. |
 | `src/core/services/ipc.ts` | Service-level invoke handling. Applies guardrails (validation, error wrapping) before calling domain logic. |
 | `src/core/services/anki-jimaku-ipc.ts` | Integration-specific IPC boundary for Anki and Jimaku operations. |
@@ -81,19 +81,19 @@ How these sockets are established during launch is covered in [Playback Startup

 ## Contract Rules

-These rules exist to prevent a class of bugs where the renderer and main process silently disagree about message shapes — which surfaces as undefined fields, swallowed errors, or state corruption.
+These rules exist to prevent a class of bugs where the renderer and main process silently disagree about message shapes - which surfaces as undefined fields, swallowed errors, or state corruption.

 - **Use shared constants.** Channel names come from `contracts.ts`, never ad-hoc literal strings. This makes channels greppable and refactor-safe.
 - **Validate before handling.** Every `invoke` payload passes through `validators.ts` before reaching domain logic. This catches shape drift at the boundary instead of deep inside a service.
 - **Return structured failures.** Handlers return `{ ok: false, error: string }` on failure rather than throwing. The renderer can always distinguish success from failure without try/catch.
- **Keep payloads narrow.** Send only what the handler needs. Avoid passing entire state objects across the bridge — it couples the renderer to internal main-process structure.
+- **Keep payloads narrow.** Send only what the handler needs. Avoid passing entire state objects across the bridge - it couples the renderer to internal main-process structure.
 - **Co-evolve all layers.** When a payload shape changes, update `contracts.ts`, `validators.ts`, `preload.ts`, and the handler in the same commit. Partial updates are treated as bugs.

 ## Two Message Patterns

-**Invoke (request/response):** The renderer calls a typed bridge method and awaits a result. The main process validates the payload, runs the handler, and returns a structured response. Used for operations where the renderer needs a result — lookups, config reads, mining actions.
+**Invoke (request/response):** The renderer calls a typed bridge method and awaits a result. The main process validates the payload, runs the handler, and returns a structured response. Used for operations where the renderer needs a result - lookups, config reads, mining actions.

-**Fire-and-forget (send):** The renderer sends a message with no response. The main process validates and handles it silently. Malformed payloads are dropped. Used for notifications where the renderer doesn't need confirmation — UI state hints, focus events, position updates.
+**Fire-and-forget (send):** The renderer sends a message with no response. The main process validates and handles it silently. Malformed payloads are dropped. Used for notifications where the renderer doesn't need confirmation - UI state hints, focus events, position updates.

 ## Add a New IPC Action

@@ -108,7 +108,7 @@ These rules exist to prevent a class of bugs where the renderer and main process

 - Prefer runtime/domain composition via `src/main/runtime/composers/*` and `src/main/runtime/domains/*`. IPC handlers should delegate to composers rather than containing orchestration logic.
 - Route shared mutable state updates through transition helpers in `src/main/state.ts` for migrated domains. Direct mutation from IPC handlers bypasses invariant checks.
- Keep IPC handlers thin — they validate, delegate, and return. Business logic belongs in services.
+- Keep IPC handlers thin - they validate, delegate, and return. Business logic belongs in services.

 ## Troubleshooting

@@ -1,12 +1,12 @@
 # Jellyfin Integration

-[Jellyfin](https://jellyfin.org) is a free, self-hosted media server — think of it as your own private streaming service for video you own. If you keep your anime on a Jellyfin server, SubMiner can play episodes through mpv with the full mining overlay.
+[Jellyfin](https://jellyfin.org) is a free, self-hosted media server - think of it as your own private streaming service for video you own. If you keep your anime on a Jellyfin server, SubMiner can play episodes through mpv with the full mining overlay.

 ::: tip Who needs this?
 This page is only relevant if you already run (or have access to) a Jellyfin server. If you watch local files or YouTube, you can skip it. The in-app setup window (`subminer jellyfin`) is the easiest starting point.
 :::

-SubMiner can act as a **cast-to-device target** for Jellyfin (similar to jellyfin-mpv-shim). Sign in once, turn on discovery, and SubMiner shows up in the "Play on…" / cast menu of any Jellyfin app — web, phone, or TV. Pick an episode, cast it to SubMiner, and it plays in SubMiner's mpv window with the full overlay and Yomitan click-to-lookup.
+SubMiner can act as a **cast-to-device target** for Jellyfin (similar to jellyfin-mpv-shim). Sign in once, turn on discovery, and SubMiner shows up in the "Play on…" / cast menu of any Jellyfin app - web, phone, or TV. Pick an episode, cast it to SubMiner, and it plays in SubMiner's mpv window with the full overlay and Yomitan click-to-lookup.

 This is the recommended way to use Jellyfin with SubMiner. A terminal-only option is covered in [Launcher playback](#launcher-playback) at the end.

@@ -28,7 +28,7 @@ Open the tray menu and click **Configure Jellyfin**. In the window that opens, e

 On success, SubMiner:

- saves an encrypted session token — your password is never stored,
+- saves an encrypted session token - your password is never stored,
 - turns the Jellyfin integration on, and
 - remembers the server and username for next time.

@@ -38,12 +38,12 @@ Reopen this window any time to switch servers or **Logout**.

 Discovery is what makes SubMiner appear as a cast target. Two ways to enable it:

- **For the current session** — open the tray menu and tick **Jellyfin Discovery**. (This item appears once you've signed in.)
- **Automatically on every launch** — already on by default. After your first sign-in, SubMiner auto-connects to Jellyfin at startup, so the cast target is ready without touching the tray. You can change this under [Settings](#settings).
+- **For the current session** - open the tray menu and tick **Jellyfin Discovery**. (This item appears once you've signed in.)
+- **Automatically on every launch** - already on by default. After your first sign-in, SubMiner auto-connects to Jellyfin at startup, so the cast target is ready without touching the tray. You can change this under [Settings](#settings).

 ### 4. Cast from any Jellyfin app

-In the Jellyfin web UI or mobile app, start playing something, open the **cast / "Play on"** menu, and pick your device — SubMiner appears there named after your computer's hostname. Playback opens in SubMiner.
+In the Jellyfin web UI or mobile app, start playing something, open the **cast / "Play on"** menu, and pick your device - SubMiner appears there named after your computer's hostname. Playback opens in SubMiner.

 From then on, pause / resume / seek / stop and audio or subtitle track changes you make in the Jellyfin app are mirrored in SubMiner, and your watch progress syncs back to Jellyfin (now-playing and resume position).

@@ -63,7 +63,7 @@ All Jellyfin options live under **Settings → Integrations → Jellyfin** (open
 | Setting                         | Default | What it does                                                                                                          |
 | ------------------------------- | ------- | --------------------------------------------------------------------------------------------------------------------- |
 | **Enabled**                     | Off     | Turns the Jellyfin integration on. Switched on for you when you sign in.                                              |
-| **Server Url**                  | —       | Your Jellyfin server. Filled in when you sign in.                                                                     |
+| **Server Url**                  | -       | Your Jellyfin server. Filled in when you sign in.                                                                     |
 | **Remote Control Enabled**      | On      | Lets SubMiner act as a cast target.                                                                                   |
 | **Remote Control Auto Connect** | On      | Connects to Jellyfin at startup so discovery is automatic. Turn off if you'd rather start it from the tray each time. |
 | **Auto Announce**               | Off     | Re-broadcasts visibility on connect. Enable if your device is slow to appear in the cast menu.                        |
@@ -88,14 +88,14 @@ See [Configuration](/configuration) for the full list (transcode codec, direct-p
 **SubMiner doesn't appear in the cast menu**

 - Make sure SubMiner is running.
- Make sure you're signed in — reopen **Configure Jellyfin** and log in again if your token expired.
+- Make sure you're signed in - reopen **Configure Jellyfin** and log in again if your token expired.
 - Make sure discovery is on (tray **Jellyfin Discovery**, or **Remote Control Auto Connect** in settings).
 - Make sure SubMiner and the Jellyfin client point at the same server.

 **Casting starts but nothing plays**

 - Confirm the item plays normally in another Jellyfin client.
- If mpv was closed, give it a moment — SubMiner launches it on demand and retries.
+- If mpv was closed, give it a moment - SubMiner launches it on demand and retries.

 **SubMiner keeps disconnecting**

@@ -104,7 +104,7 @@ See [Configuration](/configuration) for the full list (transcode codec, direct-p
 ## Security notes

 - The Jellyfin session (access token + user ID) is kept in SubMiner's local encrypted token storage. Your password is used only to log in and is never saved.
- Treat the token storage and your `config.jsonc` as secrets — don't commit them.
+- Treat the token storage and your `config.jsonc` as secrets - don't commit them.
 - Advanced/headless: the `SUBMINER_JELLYFIN_ACCESS_TOKEN` and `SUBMINER_JELLYFIN_USER_ID` environment variables can supply a session without the sign-in window.

 ## Launcher playback
@@ -1,6 +1,6 @@
 # Jimaku Integration

-[Jimaku](https://jimaku.cc) is a community-driven subtitle repository for anime — a shared online library of subtitle files contributed by other learners. SubMiner integrates with the Jimaku API so you can search, browse, and download Japanese subtitle files directly from the overlay — no alt-tabbing or manual file management required. Downloaded subtitles are loaded into mpv immediately.
+[Jimaku](https://jimaku.cc) is a community-driven subtitle repository for anime - a shared online library of subtitle files contributed by other learners. SubMiner integrates with the Jimaku API so you can search, browse, and download Japanese subtitle files directly from the overlay - no alt-tabbing or manual file management required. Downloaded subtitles are loaded into mpv immediately.

 ::: tip Prerequisite: a free API key
 You need a Jimaku account and an API key (a personal access string) before this feature works. Create an account at [jimaku.cc](https://jimaku.cc), copy your key, and add it to your config as shown under [Configuration](#configuration) below. Without a key, the search modal will report "Jimaku API key not set."
@@ -10,14 +10,14 @@ You need a Jimaku account and an API key (a personal access string) before this

 The Jimaku integration runs through an in-overlay modal accessible via a keyboard shortcut (`Ctrl+Shift+J` by default).

-When you open the modal, SubMiner parses the current video filename to extract a title, season, and episode number. Common naming conventions are supported — `S01E03`, `1x03`, `E03`, and dash-separated episode numbers all work. If the filename yields a high-confidence match (title + episode), SubMiner auto-searches immediately.
+When you open the modal, SubMiner parses the current video filename to extract a title, season, and episode number. Common naming conventions are supported - `S01E03`, `1x03`, `E03`, and dash-separated episode numbers all work. If the filename yields a high-confidence match (title + episode), SubMiner auto-searches immediately.

 From there:

-1. **Search** — SubMiner queries the Jimaku API with the parsed title. Results appear as a list of anime entries (Japanese and English names).
-2. **Browse entries** — Select an entry to load its available subtitle files, filtered by episode if one was detected.
-3. **Browse files** — Files show name, size, and last-modified date. If a language preference is configured, files are sorted accordingly (e.g., Japanese-tagged files first).
-4. **Download** — Selecting a file downloads it to the same directory as the video (or a temp directory for remote/streamed media) and loads it into mpv as a new subtitle track.
+1. **Search** - SubMiner queries the Jimaku API with the parsed title. Results appear as a list of anime entries (Japanese and English names).
+2. **Browse entries** - Select an entry to load its available subtitle files, filtered by episode if one was detected.
+3. **Browse files** - Files show name, size, and last-modified date. If a language preference is configured, files are sorted accordingly (e.g., Japanese-tagged files first).
+4. **Download** - Selecting a file downloads it to the same directory as the video (or a temp directory for remote/streamed media) and loads it into mpv as a new subtitle track.

 If no files match the current episode filter, a "Show all files" button lets you broaden the search to all episodes for that entry.

@@ -48,8 +48,8 @@ Add a `jimaku` section to your `config.jsonc`:

 | Option | Type | Default | Description |
 | --- | --- | --- | --- |
-| `jimaku.apiKey` | `string` | — | Jimaku API key (plaintext). Mutually exclusive with `apiKeyCommand`. |
-| `jimaku.apiKeyCommand` | `string` | — | Shell command that prints the API key to stdout. Useful for secret managers (e.g., `pass jimaku/api-key`). |
+| `jimaku.apiKey` | `string` | - | Jimaku API key (plaintext). Mutually exclusive with `apiKeyCommand`. |
+| `jimaku.apiKeyCommand` | `string` | - | Shell command that prints the API key to stdout. Useful for secret managers (e.g., `pass jimaku/api-key`). |
 | `jimaku.apiBaseUrl` | `string` | `"https://jimaku.cc"` | Base URL for the Jimaku API. Only change this if using a mirror or local instance. |
 | `jimaku.languagePreference` | `"ja"` \| `"en"` \| `"none"` | `"ja"` | Sort subtitle files by language tag. `"ja"` pushes Japanese-tagged files to the top; `"en"` does the same for English. `"none"` preserves the API order. |
 | `jimaku.maxEntryResults` | `number` | `10` | Maximum number of anime entries returned per search. |
@@ -68,8 +68,8 @@ The keyboard shortcut is configured separately under `shortcuts`:

 An API key is required to use the Jimaku integration. You can get one from [jimaku.cc](https://jimaku.cc). There are two ways to provide it:

- **`apiKey`** — set the key directly in config. Simple, but the key is stored in plaintext.
- **`apiKeyCommand`** — a shell command that outputs the key. Runs with a 10-second timeout. Preferred if you use a secret manager like `pass`, `gpg`, or a keychain tool.
+- **`apiKey`** - set the key directly in config. Simple, but the key is stored in plaintext.
+- **`apiKeyCommand`** - a shell command that outputs the key. Runs with a 10-second timeout. Preferred if you use a secret manager like `pass`, `gpg`, or a keychain tool.

 If both are set, `apiKey` takes priority.

@@ -79,8 +79,8 @@ SubMiner extracts media info from the current video path to pre-fill the search

 - **Season + episode patterns:** `S01E03`, `1x03`
 - **Episode-only patterns:** `E03`, `EP03`, or dash-separated numbers like `Title - 03 -`
- **Bracket tags:** `[SubGroup]`, `[1080p]`, `[HEVC]` — stripped before title extraction
- **Year tags:** `(2024)` — stripped
+- **Bracket tags:** `[SubGroup]`, `[1080p]`, `[HEVC]` - stripped before title extraction
+- **Year tags:** `(2024)` - stripped
 - **Dots and underscores:** treated as spaces
 - **Remote/streamed URLs:** SubMiner checks URL query parameters (`title`, `name`, `q`) and path segments to extract a meaningful title

@@ -98,7 +98,7 @@ The Jimaku API has rate limits. If you see 429 errors, wait for the retry durati

 **No entries found**

-Try simplifying the title — remove season/episode qualifiers and search with just the anime name. Jimaku's search matches against its own database of anime titles, so the exact spelling matters.
+Try simplifying the title - remove season/episode qualifiers and search with just the anime name. Jimaku's search matches against its own database of anime titles, so the exact spelling matters.

 **No files found for this episode**

@@ -110,6 +110,6 @@ Verify mpv is running and connected via IPC. SubMiner loads the subtitle by issu

 ## Related

- [Configuration Reference](/configuration#jimaku) — full config options
- [Mining Workflow](/mining-workflow#jimaku-subtitle-search) — how Jimaku fits into the sentence mining loop
- [Troubleshooting](/troubleshooting#jimaku) — additional error guidance
+- [Configuration Reference](/configuration#jimaku) - full config options
+- [Mining Workflow](/mining-workflow#jimaku-subtitle-search) - how Jimaku fits into the sentence mining loop
+- [Troubleshooting](/troubleshooting#jimaku) - additional error guidance
@@ -3,7 +3,7 @@
 The `subminer` launcher is an all-in-one script that handles video selection, mpv startup, and overlay management. It is the recommended way to use SubMiner on Linux and macOS because it guarantees mpv is launched with the correct IPC socket and SubMiner defaults. It's a Bun script distributed as a release asset alongside the AppImage and DMG.

 ::: tip Windows users
-On Windows, the recommended way to launch playback is the **SubMiner mpv** shortcut created during first-run setup — double-click it, drag a file onto it, or run `SubMiner.exe --launch-mpv` from a terminal. See [Windows mpv Shortcut](/usage#windows-mpv-shortcut) for details.
+On Windows, the recommended way to launch playback is the **SubMiner mpv** shortcut created during first-run setup - double-click it, drag a file onto it, or run `SubMiner.exe --launch-mpv` from a terminal. See [Windows mpv Shortcut](/usage#windows-mpv-shortcut) for details.
 :::

 ## Video Picker
@@ -121,4 +121,4 @@ With default plugin settings (`auto_start=yes`, `auto_start_visible_overlay=yes`

 - Default log level is `info`
 - `--background` mode defaults to `warn` unless `--log-level` is explicitly set
- `--dev` / `--debug` control app behavior, not logging verbosity — use `--log-level` for that
+- `--dev` / `--debug` control app behavior, not logging verbosity - use `--log-level` for that
@@ -1,14 +1,14 @@
 # Mining Workflow

-This guide walks through the sentence mining loop — from watching a video to creating Anki cards with audio, screenshots, and context.
+This guide walks through the sentence mining loop - from watching a video to creating Anki cards with audio, screenshots, and context.

 ## Overview

-*Sentence mining* means turning real sentences you encounter while watching native video into Anki flashcards, so you learn vocabulary in the context where you actually met it. SubMiner automates the tedious parts of that loop.
+_Sentence mining_ means turning real sentences you encounter while watching native video into Anki flashcards, so you learn vocabulary in the context where you actually met it. SubMiner automates the tedious parts of that loop.

-SubMiner runs as a transparent overlay on top of mpv (the video player). As subtitles play, the overlay displays them as interactive text. You hover a word, trigger a Yomitan dictionary lookup with your configured lookup key/modifier, then create an Anki card with a single action. SubMiner automatically attaches the sentence, an audio clip, and a screenshot to that card — no manual copy-pasting or screen capturing.
+SubMiner runs as a transparent overlay on top of mpv (the video player). As subtitles play, the overlay displays them as interactive text. You hover a word, trigger a Yomitan dictionary lookup with your configured lookup key/modifier, then create an Anki card with a single action. SubMiner automatically attaches the sentence, an audio clip, and a screenshot to that card - no manual copy-pasting or screen capturing.

-> **Yomitan** is the popup dictionary that shows definitions when you hover or scan a word. **AnkiConnect** is the add-on that lets SubMiner talk to Anki. Both are set up during installation — see [Anki Integration](/anki-integration) if you have not configured them yet.
+> **Yomitan** is the popup dictionary that shows definitions when you hover or scan a word. **AnkiConnect** is the add-on that lets SubMiner talk to Anki. Both are set up during installation - see [Anki Integration](/anki-integration) if you have not configured them yet.

 ## Creating Anki Cards

@@ -39,7 +39,7 @@ If you prefer a hands-on approach (animecards-style), you can copy the current s
 1. Add a word via Yomitan as usual.
 2. Press `Ctrl/Cmd+C` to copy the current subtitle line to the clipboard.
   - For multiple lines: press `Ctrl/Cmd+Shift+C`, then a digit `1`–`9` to select how many recent subtitle lines to combine. The combined text is copied to the clipboard.
-3. Press `Ctrl/Cmd+V` to update the last-added card with the clipboard contents plus audio, image, and translation — the same fields auto-update would fill.
+3. Press `Ctrl/Cmd+V` to update the last-added card with the clipboard contents plus audio, image, and translation - the same fields auto-update would fill.

 Manual clipboard updates always replace generated sentence audio, even when `ankiConnect.behavior.overwriteAudio` is disabled. The word audio field is left unchanged because the word itself does not change in this flow.

@@ -61,7 +61,7 @@ Create a standalone sentence card without going through Yomitan:
 The sentence card uses the note type configured in `isLapis.sentenceCardModel` and always maps sentence/audio to `Sentence` and `SentenceAudio`.

 ::: warning Requires Lapis/Kiku note type
-Sentence card creation requires a [Lapis](https://github.com/donkuri/lapis) or [Kiku](https://github.com/youyoumu/kiku) compatible note type and `ankiConnect.isLapis.enabled: true` in your config. See [Anki Integration — Sentence Cards](/anki-integration#sentence-cards-lapis) for setup.
+Sentence card creation requires a [Lapis](https://github.com/donkuri/lapis) or [Kiku](https://github.com/youyoumu/kiku) compatible note type and `ankiConnect.isLapis.enabled: true` in your config. See [Anki Integration - Sentence Cards](/anki-integration#sentence-cards-lapis) for setup.
 :::

 ### 4. Mark as Audio Card
@@ -69,7 +69,7 @@ Sentence card creation requires a [Lapis](https://github.com/donkuri/lapis) or [
 After adding a word via Yomitan, press the audio card shortcut to overwrite the audio with a longer clip spanning the full subtitle timing.

 ::: warning Requires Lapis/Kiku note type
-Audio card marking requires a [Lapis](https://github.com/donkuri/lapis) or [Kiku](https://github.com/youyoumu/kiku) compatible note type and `ankiConnect.isLapis.enabled: true` in your config. See [Anki Integration — Sentence Cards](/anki-integration#sentence-cards-lapis) for setup.
+Audio card marking requires a [Lapis](https://github.com/donkuri/lapis) or [Kiku](https://github.com/youyoumu/kiku) compatible note type and `ankiConnect.isLapis.enabled: true` in your config. See [Anki Integration - Sentence Cards](/anki-integration#sentence-cards-lapis) for setup.
 :::

 ### Field Grouping (Kiku)
@@ -82,11 +82,11 @@ If you mine the same word from different sentences, SubMiner can merge the cards
   - **Auto mode** (`ankiConnect.isKiku.fieldGrouping: "auto"`): Merges automatically. Both sentences, audio clips, and images are combined into the existing card. The duplicate is optionally deleted.
   - **Manual mode** (`ankiConnect.isKiku.fieldGrouping: "manual"`): A modal appears showing both cards side by side. You choose which card to keep and preview the merged result before confirming.

-See [Anki Integration — Field Grouping](/anki-integration#field-grouping-kiku) for configuration options, merge behavior, and modal keyboard shortcuts.
+See [Anki Integration - Field Grouping](/anki-integration#field-grouping-kiku) for configuration options, merge behavior, and modal keyboard shortcuts.

 ## Overlay Model

-SubMiner uses one overlay window with modal surfaces. It carries two subtitle bars — a primary reading bar and a secondary translation/context bar — plus modal dialogs that open on top.
+SubMiner uses one overlay window with modal surfaces. It carries two subtitle bars - a primary reading bar and a secondary translation/context bar - plus modal dialogs that open on top.

 Toggle the entire overlay window with `Alt+Shift+O` (global) or `y-t` (mpv plugin).

@@ -99,14 +99,14 @@ The primary bar renders subtitles as tokenized hoverable word spans. Each word i
 - Auto pause/resume while the Yomitan popup is open (enabled by default via `subtitleStyle.autoPauseVideoOnYomitanPopup`)
 - Right-click to pause/resume
 - Right-click + drag to reposition subtitles
- **Reading annotations** — known words, N+1 targets, character-name matches, JLPT levels, and frequency hits can all be visually highlighted
+- **Reading annotations** - known words, N+1 targets, character-name matches, JLPT levels, and frequency hits can all be visually highlighted

 ### Secondary Subtitle Bar

 The secondary bar is a compact top-strip region in the same overlay window. It shows a secondary subtitle track (typically English) for translation/context while keeping the primary reading flow below. It is useful for:

 - Quick comprehension checks without leaving the mining flow.
- Auto-populating the translation field on mined cards — when a card is created, SubMiner uses the secondary subtitle text as the translation field value (unless AI translation is configured to override it).
+- Auto-populating the translation field on mined cards - when a card is created, SubMiner uses the secondary subtitle text as the translation field value (unless AI translation is configured to override it).

 It is controlled by `secondarySub` configuration and shares its lifecycle with the main overlay window. Cycle which track feeds it with `Shift+J`.

@@ -114,16 +114,16 @@ It is controlled by `secondarySub` configuration and shares its lifecycle with t

 Both the primary and secondary subtitle bars share the same three visibility modes, and each can be changed independently at runtime:

- **Hidden** — the bar is not shown.
- **Visible** — the bar is always shown.
- **Hover** — the bar is revealed only while you hover over the overlay.
+- **Hidden** - the bar is not shown.
+- **Visible** - the bar is always shown.
+- **Hover** - the bar is revealed only while you hover over the overlay.

 By default the **primary** bar is `visible` (`subtitleStyle.primaryDefaultMode`) and the **secondary** bar is `hover` (`secondarySub.defaultMode`).

 Cycle each bar's mode at runtime with its own shortcut:

 | Shortcut           | Action                                                   | Config key                     |
-| -------------------- | -------------------------------------------------------- | ------------------------------ |
+| ------------------ | -------------------------------------------------------- | ------------------------------ |
 | `V`                | Cycle primary subtitle mode (hidden → visible → hover)   | overlay-local                  |
 | `Ctrl/Cmd+Shift+V` | Cycle secondary subtitle mode (hidden → visible → hover) | `shortcuts.toggleSecondarySub` |

@@ -133,7 +133,7 @@ Jimaku search, field-grouping, runtime options, and manual subsync open as modal

 ## Looking Up Words

-1. Hover over the subtitle area — the overlay activates pointer events.
+1. Hover over the subtitle area - the overlay activates pointer events.
 2. Hover the word you want. SubMiner keeps per-token boundaries so Yomitan can target that token cleanly.
 3. Trigger Yomitan lookup with your configured lookup key/modifier (for example `Shift` if that is how your Yomitan profile is set up).
 4. Yomitan opens its lookup popup for the hovered token.
@@ -143,17 +143,17 @@ Jimaku search, field-grouping, runtime options, and manual subsync open as modal

 With a gamepad connected and keyboard-only mode enabled, the full mining loop works without a mouse or keyboard:

-1. **Navigate** — push the left stick left/right to move the token highlight across subtitle words.
-2. **Look up** — press `A` to trigger Yomitan lookup on the highlighted word.
-3. **Browse the popup** — push the left stick up/down to smooth-scroll through the Yomitan popup, or use the right stick for larger jumps.
-4. **Cycle audio** — press `R1` to move to the next dictionary audio entry, `L1` to play the current one.
-5. **Mine** — press `X` to create an Anki card for the current sentence (same as `Ctrl+S`).
-6. **Close** — press `B` to dismiss the Yomitan popup and return to subtitle navigation.
-7. **Pause/resume** — press `L3` (left stick click) to toggle mpv pause at any time.
+1. **Navigate** - push the left stick left/right to move the token highlight across subtitle words.
+2. **Look up** - press `A` to trigger Yomitan lookup on the highlighted word.
+3. **Browse the popup** - push the left stick up/down to smooth-scroll through the Yomitan popup, or use the right stick for larger jumps.
+4. **Cycle audio** - press `R1` to move to the next dictionary audio entry, `L1` to play the current one.
+5. **Mine** - press `X` to create an Anki card for the current sentence (same as `Ctrl+S`).
+6. **Close** - press `B` to dismiss the Yomitan popup and return to subtitle navigation.
+7. **Pause/resume** - press `L3` (left stick click) to toggle mpv pause at any time.

-After controller support is enabled, the controller and keyboard can be used interchangeably — switching mid-session is seamless. Toggle keyboard-only mode on or off with `Y` on the controller.
+After controller support is enabled, the controller and keyboard can be used interchangeably - switching mid-session is seamless. Toggle keyboard-only mode on or off with `Y` on the controller.

-See [Usage — Controller Support](/usage#controller-support) for setup details and [Configuration — Controller Support](/configuration#controller-support) for the full mapping and tuning options.
+See [Usage - Controller Support](/usage#controller-support) for setup details and [Configuration - Controller Support](/configuration#controller-support) for the full mapping and tuning options.

 ## Subtitle Sync (Subsync)

@@ -166,11 +166,13 @@ If your subtitle file is out of sync with the audio, SubMiner can resynchronize

 For remote streams, including Jellyfin playback, the modal only offers alass. Jellyfin subtitle URLs are cached as temporary subtitle files so alass can read them, but the video stream is not downloaded. ffsubsync needs direct access to the local media file and is unavailable for stream URLs.

-Install the sync tools separately — see [Troubleshooting](/troubleshooting#subtitle-sync-subsync) if the tools are not found.
+When you mine a sentence card from the stats dashboard, SubMiner can also use `alass` automatically to align a local English sidecar against the matching local Japanese sidecar before filling the card translation field. The source subtitle files are not modified; SubMiner writes a temporary retimed copy and reuses it while the stats server is running.
+
+Install the sync tools separately - see [Troubleshooting](/troubleshooting#subtitle-sync-subsync) if the tools are not found.

 ## Texthooker

-SubMiner runs a local HTTP server at `http://127.0.0.1:5174` (configurable port) that serves a texthooker UI. This allows external tools — such as a browser-based Yomitan instance — to receive subtitle text in real time.
+SubMiner runs a local HTTP server at `http://127.0.0.1:5174` (configurable port) that serves a texthooker UI. This allows external tools - such as a browser-based Yomitan instance - to receive subtitle text in real time.

 The texthooker page displays the current subtitle and updates as new lines arrive. This is useful if you prefer to do lookups in a browser rather than through the overlay's built-in Yomitan.

@@ -180,8 +182,8 @@ If you want to build your own browser client, websocket consumer, or automation

 These features support the mining loop but have their own dedicated pages:

- **[Jimaku subtitle search](/jimaku-integration)** — search and download anime subtitle files directly from the overlay (`Ctrl+Shift+J` by default), then load them into mpv.
- **[N+1 word highlighting](/subtitle-annotations#n1-word-highlighting)** — cross-reference your Anki decks to highlight known words, making true N+1 sentences (exactly one unknown word) easy to spot during immersion.
- **[Immersion tracking](/immersion-tracking)** — log watching and mining activity to a local database and view session times, words seen, and cards mined in the built-in stats dashboard.
+- **[Jimaku subtitle search](/jimaku-integration)** - search and download anime subtitle files directly from the overlay (`Ctrl+Shift+J` by default), then load them into mpv.
+- **[N+1 word highlighting](/subtitle-annotations#n1-word-highlighting)** - cross-reference your Anki decks to highlight known words, making true N+1 sentences (exactly one unknown word) easy to spot during immersion.
+- **[Immersion tracking](/immersion-tracking)** - log watching and mining activity to a local database and view session times, words seen, and cards mined in the built-in stats dashboard.

-Next: [Anki Integration](/anki-integration) — field mapping, media generation, and card enrichment configuration.
+Next: [Anki Integration](/anki-integration) - field mapping, media generation, and card enrichment configuration.
@@ -2,7 +2,7 @@

 **What this is:** mpv is the video player SubMiner overlays subtitles on. The SubMiner mpv plugin is a small Lua script that runs *inside* mpv and gives you in-player keybindings to control the SubMiner overlay (start/stop/toggle, skip intro, etc.) without leaving the player window.

-**Who needs this page:** Most users never touch the plugin directly — SubMiner-managed launches (the app, the `subminer` launcher, or the Windows shortcut) inject the bundled plugin automatically for that session, so there is nothing to install into mpv's global `scripts` directory. Read on if you launch mpv from another tool and want SubMiner's in-player controls, or you want to script mpv against SubMiner.
+**Who needs this page:** Most users never touch the plugin directly - SubMiner-managed launches (the app, the `subminer` launcher, or the Windows shortcut) inject the bundled plugin automatically for that session, so there is nothing to install into mpv's global `scripts` directory. Read on if you launch mpv from another tool and want SubMiner's in-player controls, or you want to script mpv against SubMiner.

 The plugin ships as a modular Lua package under `plugin/subminer/` (entry point `init.lua`, which loads `main.lua` and sibling modules). Earlier releases shipped a single global `main.lua`; runtime loading replaces it.

@@ -27,7 +27,7 @@ input-ipc-server=\\.\pipe\subminer-socket

 ## Keybindings

-Most plugin actions use a `y` chord prefix — press `y`, then the second key (a "chord"):
+Most plugin actions use a `y` chord prefix - press `y`, then the second key (a "chord"):

 | Chord            | Action                                 |
 | ---------------- | -------------------------------------- |
@@ -48,7 +48,7 @@ The bare `v` binding is a forced mpv binding. It overrides mpv's default primary

 ## Shared Shortcuts (Session Bindings)

-The `y-*` chords above are built into the plugin. Everything else you configure under [`shortcuts.*`](/shortcuts) — plus any custom [`keybindings`](/configuration) and the stats toggle/mark-watched keys — is **injected into mpv at runtime**, so the same shortcut works both inside mpv and in the SubMiner overlay. You do not edit any mpv config to enable them.
+The `y-*` chords above are built into the plugin. Everything else you configure under [`shortcuts.*`](/shortcuts) - plus any custom [`keybindings`](/configuration) and the stats toggle/mark-watched keys - is **injected into mpv at runtime**, so the same shortcut works both inside mpv and in the SubMiner overlay. You do not edit any mpv config to enable them.

 How it works:

@@ -58,11 +58,11 @@ How it works:

 Because the bindings come from the same configuration the overlay uses, you maintain one set of shortcuts for both surfaces.

-Live updates: changing a shortcut in the app rewrites `session-bindings.json` and sends the plugin a `subminer-reload-session-bindings` script message, so mpv re-registers the bindings immediately — no mpv restart required.
+Live updates: changing a shortcut in the app rewrites `session-bindings.json` and sends the plugin a `subminer-reload-session-bindings` script message, so mpv re-registers the bindings immediately - no mpv restart required.

 Notes:

- Accelerators are normalized per platform — `CommandOrControl` resolves to `Cmd` on macOS and `Ctrl` elsewhere.
+- Accelerators are normalized per platform - `CommandOrControl` resolves to `Cmd` on macOS and `Ctrl` elsewhere.
 - Multi-line actions (`copySubtitleMultiple`, `mineSentenceMultiple`) register temporary `1`–`9` digit follow-up bindings after the trigger key, with `Esc` to cancel.
 - If two shortcuts compile to the same key, or an accelerator can't be mapped to an mpv key, the app logs a warning and skips that binding instead of registering a broken one.

@@ -110,14 +110,14 @@ Packaged Windows plugin installs also rewrite `socket_path` to `\\.\pipe\submine

 When `backend=auto`, the plugin detects the window manager:

-1. **macOS** — detected via platform or `OSTYPE`.
-2. **Hyprland** — detected via `HYPRLAND_INSTANCE_SIGNATURE`.
-3. **Sway** — detected via `SWAYSOCK`.
-4. **X11** — detected via `XDG_SESSION_TYPE=x11` or `DISPLAY`.
-5. **Fallback** — defaults to X11 with a warning.
+1. **macOS** - detected via platform or `OSTYPE`.
+2. **Hyprland** - detected via `HYPRLAND_INSTANCE_SIGNATURE`.
+3. **Sway** - detected via `SWAYSOCK`.
+4. **X11** - detected via `XDG_SESSION_TYPE=x11` or `DISPLAY`.
+5. **Fallback** - defaults to X11 with a warning.

 ::: tip Wayland is compositor-specific
-Native Wayland support is only available for Hyprland and Sway. If you use a different Wayland compositor, auto-detection will fall back to X11 — both mpv and SubMiner must be running under Xwayland, and `xdotool` and `xwininfo` must be installed.
+Native Wayland support is only available for Hyprland and Sway. If you use a different Wayland compositor, auto-detection will fall back to X11 - both mpv and SubMiner must be running under Xwayland, and `xdotool` and `xwininfo` must be installed.
 :::

 ## Script Messages
@@ -163,7 +163,7 @@ script-message subminer-start backend=hyprland socket=/custom/path texthooker=no

 ## Lifecycle

-For how the plugin's auto-start fits into the full launch sequence — including when the launcher starts the overlay instead of the plugin — see [Playback Startup Flow](./architecture#playback-startup-flow).
+For how the plugin's auto-start fits into the full launch sequence - including when the launcher starts the overlay instead of the plugin - see [Playback Startup Flow](./architecture#playback-startup-flow).

 - **File loaded**: If `auto_start=yes`, the plugin starts the overlay, then defers AniSkip lookup until after startup delay.
 - **Auto-start pause gate**: If `auto_start_visible_overlay=yes` and `auto_start_pause_until_ready=yes`, launcher starts mpv paused and the plugin resumes playback after SubMiner reports tokenization-ready (with timeout fallback).
@@ -181,4 +181,4 @@ The plugin is useful when you:
 - Want on-demand overlay control without the wrapper.
 - Use mpv's built-in file browser or playlist features.

-You can install both — the plugin provides chord keybindings for convenience, while the wrapper handles the full lifecycle.
+You can install both - the plugin provides chord keybindings for convenience, while the wrapper handles the full lifecycle.
@@ -496,7 +496,7 @@
    "tags": [
      "SubMiner"
    ], // Tags to add to cards mined or updated by SubMiner. Provide an empty array to disable automatic tagging.
-    "deck": "", // Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to search all decks.
+    "deck": "", // Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to use the Yomitan mining deck when available.
    "fields": {
      "word": "Expression", // Card field for the mined word or expression text.
      "audio": "ExpressionAudio", // Card field that receives generated sentence audio.
@@ -1,12 +1,12 @@
 # Keyboard Shortcuts

-This page is the complete reference for every keystroke SubMiner responds to. If you are just getting started, focus on the **Mining Shortcuts** and **Overlay Controls** sections — those cover the day-to-day mining loop. The rest can wait until you need them.
+This page is the complete reference for every keystroke SubMiner responds to. If you are just getting started, focus on the **Mining Shortcuts** and **Overlay Controls** sections - those cover the day-to-day mining loop. The rest can wait until you need them.

 A few terms used throughout:

- **Overlay** — the transparent SubMiner window that sits on top of mpv and shows the interactive subtitles. Most shortcuts only work while this window has focus (click the video once if a shortcut seems to do nothing).
- **`Ctrl/Cmd`** — use `Ctrl` on Windows/Linux and `Cmd` (⌘) on macOS. In the config file this is written as `CommandOrControl`.
- **Accelerator** — Electron's name for a shortcut string like `Alt+Shift+O`.
+- **Overlay** - the transparent SubMiner window that sits on top of mpv and shows the interactive subtitles. Most shortcuts only work while this window has focus (click the video once if a shortcut seems to do nothing).
+- **`Ctrl/Cmd`** - use `Ctrl` on Windows/Linux and `Cmd` (⌘) on macOS. In the config file this is written as `CommandOrControl`.
+- **Accelerator** - Electron's name for a shortcut string like `Alt+Shift+O`.

 All shortcuts are configurable in `config.jsonc` under `shortcuts` and `keybindings`. Set any shortcut to `null` to disable it.

@@ -105,7 +105,7 @@ Controller input only drives the overlay while keyboard-only mode is enabled. Th

 ## MPV Plugin Chords

-When the mpv plugin is installed, all commands use a `y` chord prefix — press `y`, then the second key within 1 second.
+When the mpv plugin is installed, all commands use a `y` chord prefix - press `y`, then the second key within 1 second.

 | Chord | Action                                 |
 | ----- | -------------------------------------- |
@@ -161,4 +161,4 @@ The `keybindings` array overrides or extends the overlay's built-in key handling

 Mouse keybinding names are `MBTN_LEFT`, `MBTN_MID`, `MBTN_RIGHT`, `MBTN_BACK`, and `MBTN_FORWARD`.

-Both `shortcuts`, `keybindings`, and `subtitleSidebar` are [hot-reloadable](/configuration#hot-reload-behavior) — changes take effect without restarting SubMiner.
+Both `shortcuts`, `keybindings`, and `subtitleSidebar` are [hot-reloadable](/configuration#hot-reload-behavior) - changes take effect without restarting SubMiner.
@@ -2,7 +2,11 @@

 SubMiner annotates subtitle tokens in real time as they appear in the overlay. Four annotation layers work together to surface useful context while you watch: **N+1 highlighting**, **character-name highlighting**, **frequency highlighting**, and **JLPT tagging**.

-All four are opt-in and configured under `subtitleStyle`, `ankiConnect.knownWords`, and `ankiConnect.nPlusOne` in your config. They apply independently — you can enable any combination.
+All four are opt-in and configured under `subtitleStyle`, `ankiConnect.knownWords`, and `ankiConnect.nPlusOne` in your config. They apply independently - you can enable any combination.
+
+::: tip Tokenization
+SubMiner's primary tokenizer is Yomitan itself - subtitle text is tokenized based entirely on the dictionaries you have installed in Yomitan. Installing many large dictionaries can increase noise and slow down lookups, so be selective about which dictionaries you install and their priority order.
+:::

 Before any of those layers render, SubMiner strips annotation metadata from tokens that are usually just subtitle glue or annotation noise. Standalone particles, auxiliaries, adnominals, common explanatory endings like `んです` / `のだ`, merged trailing quote-particle forms like `...って`, auxiliary-stem grammar tails like `そうだ` (MeCab POS3 `助動詞語幹`), repeated kana interjections, and similar non-lexical helper tokens remain hoverable in the subtitle text, but they render as plain tokens without known-word, N+1, frequency, JLPT, or name-match annotation styling.

@@ -39,7 +43,7 @@ Set `refreshMinutes` to `1440` (24 hours) for daily sync if your Anki collection

 ## Character-Name Highlighting

-Character-name matches are built from the active merged SubMiner character dictionary, which auto-syncs character data from AniList for your recently-watched titles. When the current AniList media ID is known, SubMiner ignores loaded entries from other titles for subtitle name matching and inline portraits. Matching names are highlighted in subtitles and become available for hover-driven Yomitan character profiles — portraits, roles, voice actors, and biographical detail.
+Character-name matches are built from the active merged SubMiner character dictionary, which auto-syncs character data from AniList for your recently-watched titles. When the current AniList media ID is known, SubMiner ignores loaded entries from other titles for subtitle name matching and inline portraits. Matching names are highlighted in subtitles and become available for hover-driven Yomitan character profiles - portraits, roles, voice actors, and biographical detail.

 **How it works:**

@@ -60,12 +64,12 @@ For full details on dictionary generation, name variant expansion, auto-sync lif

 ## Frequency Highlighting

-Frequency highlighting colors tokens based on how common they are, using dictionary frequency rank data. This helps you spot high-value vocabulary at a glance.
+Frequency highlighting colors tokens based on how common they are, using dictionary frequency rank data. This helps you spot high-value vocabulary at a glance. Frequency ranks are sourced from the **highest-ranked frequency dictionary** installed in Yomitan - other frequency dictionaries are not consulted.

 **Modes:**

- **Single** — all highlighted tokens share one color (`singleColor`).
- **Banded** — tokens are assigned to five color bands from most common to least common within the `topX` window.
+- **Single** - all highlighted tokens share one color (`singleColor`).
+- **Banded** - tokens are assigned to five color bands from most common to least common within the `topX` window.

 SubMiner looks up each token's `frequencyRank` from `term_meta_bank_*.json` files. Only tokens with a positive rank at or below `topX` are highlighted.

@@ -130,14 +134,14 @@ All annotation layers can be toggled at runtime via the mpv command menu without
 - `subtitleStyle.enableJlpt` (`On` / `Off`)
 - `subtitleStyle.frequencyDictionary.enabled` (`On` / `Off`)

-Toggles only apply to new subtitle lines after the change — the currently displayed line is not re-tokenized in place.
+Toggles only apply to new subtitle lines after the change - the currently displayed line is not re-tokenized in place.

 ## Rendering Priority

 When multiple annotations apply to the same token, the visual priority is:

-1. **N+1 target** (highest) — the single unknown word in an N+1 sentence
-2. **Character-name match** — dictionary-driven character-name token styling
-3. **Known-word color** — already-learned token tint
-4. **Frequency highlight** — common-word coloring (not applied when N+1/character-name/known-word already matched)
-5. **JLPT underline** — level-based underline (stacks with the above since it uses underline rather than text color)
+1. **N+1 target** (highest) - the single unknown word in an N+1 sentence
+2. **Character-name match** - dictionary-driven character-name token styling
+3. **Known-word color** - already-learned token tint
+4. **Frequency highlight** - common-word coloring (not applied when N+1/character-name/known-word already matched)
+5. **JLPT underline** - level-based underline (stacks with the above since it uses underline rather than text color)
@@ -10,7 +10,7 @@ When SubMiner parses the active subtitle source into a cue list, the sidebar bec

 - The active cue is highlighted and kept in view as playback advances (when `autoScroll` is `true`).
 - Clicking any cue seeks mpv to that timestamp.
- The sidebar stays synchronized with the overlay — media transitions and subtitle source changes update both simultaneously.
+- The sidebar stays synchronized with the overlay - media transitions and subtitle source changes update both simultaneously.

 The sidebar only appears when a parsed cue list is available. External subtitle sources that SubMiner cannot parse (for example, embedded ASS tracks rendered directly by mpv) will not populate the sidebar.

@@ -18,9 +18,9 @@ The sidebar only appears when a parsed cue list is available. External subtitle

 Two layout modes are available via `subtitleSidebar.layout`:

-**`overlay`** (default) — The sidebar floats over mpv as a panel. It does not affect the player window size or position.
+**`overlay`** (default) - The sidebar floats over mpv as a panel. It does not affect the player window size or position.

-**`embedded`** — Reserves space on the right side of the player and shifts the video area to mimic a split-pane layout. Useful if you want the cue list visible without it covering the video. If you see unexpected positioning in your environment, switch back to `overlay` to isolate the issue.
+**`embedded`** - Reserves space on the right side of the player and shifts the video area to mimic a split-pane layout. Useful if you want the cue list visible without it covering the video. If you see unexpected positioning in your environment, switch back to `overlay` to isolate the issue.

 ## Configuration

@@ -1,6 +1,6 @@
 # Troubleshooting

-Common issues and how to resolve them. Most problems fall into one of a few buckets — the overlay shows but subtitles don't (see [MPV Connection](#mpv-connection)), cards aren't being created or come out empty (see [AnkiConnect](#ankiconnect)), or word lookups don't appear (see [Yomitan](#yomitan)). If an error message popped up on screen, search this page for the exact text — most headings below are quoted error strings.
+Common issues and how to resolve them. Most problems fall into one of a few buckets - the overlay shows but subtitles don't (see [MPV Connection](#mpv-connection)), cards aren't being created or come out empty (see [AnkiConnect](#ankiconnect)), or word lookups don't appear (see [Yomitan](#yomitan)). If an error message popped up on screen, search this page for the exact text - most headings below are quoted error strings.

 ## MPV Connection

@@ -102,7 +102,7 @@ If the overlay never appears at all, see [Playback Startup Flow](./architecture#

 **"Failed to parse MPV message"**

-Logged when a malformed JSON line arrives from the mpv socket. Usually harmless — SubMiner skips the bad line and continues. If it happens constantly, check that nothing else is writing to the same socket path.
+Logged when a malformed JSON line arrives from the mpv socket. Usually harmless - SubMiner skips the bad line and continues. If it happens constantly, check that nothing else is writing to the same socket path.

 ## Updates

@@ -132,7 +132,7 @@ The detected launcher is installed in a protected path such as `/usr/local/bin/s

 **"AnkiConnect: unable to connect"**

-First confirm you've completed the [Anki Integration prerequisites](/anki-integration#prerequisites) — Anki must be running with the AnkiConnect add-on installed.
+First confirm you've completed the [Anki Integration prerequisites](/anki-integration#prerequisites) - Anki must be running with the AnkiConnect add-on installed.

 SubMiner connects to the active Anki endpoint:

@@ -148,7 +148,7 @@ SubMiner retries with exponential backoff (up to 5 s) and suppresses repeated er

 **Cards are created but fields are empty**

-Field names in your config must match your Anki note type exactly (case-sensitive). Check `ankiConnect.fields` — for example, if your note type uses `SentenceAudio` but your config says `Audio`, the field will not be populated.
+Field names in your config must match your Anki note type exactly (case-sensitive). Check `ankiConnect.fields` - for example, if your note type uses `SentenceAudio` but your config says `Audio`, the field will not be populated.

 See [Anki Integration](/anki-integration) for the full field mapping reference.

@@ -169,7 +169,7 @@ Shown when SubMiner tries to update a card that no longer exists, or when AnkiCo

 **Overlay appears but clicks pass through / cannot interact**

- Make sure you are hovering over subtitle text — the overlay only becomes interactive when the cursor is over a subtitle.
+- Make sure you are hovering over subtitle text - the overlay only becomes interactive when the cursor is over a subtitle.
 - On macOS/Windows: toggle the overlay off and back on (`Alt+Shift+O`) to re-enable pointer events.
 - On Linux: mouse event handling is unreliable in some Electron/compositor combinations. If clicks consistently fail, toggle the overlay off, click the underlying mpv window, then toggle it back on.

@@ -208,7 +208,7 @@ If you installed from the AppImage and see this error, the package may be incomp

 **Yomitan lookup popup does not appear when hovering words or triggering lookup**

- Verify Yomitan loaded successfully — check the terminal output for "Loaded Yomitan extension".
+- Verify Yomitan loaded successfully - check the terminal output for "Loaded Yomitan extension".
 - Yomitan requires dictionaries to be installed. Open Yomitan settings (`Alt+Shift+Y` or `SubMiner.AppImage --yomitan`) and confirm at least one dictionary is imported.
 - If `yomitan.externalProfilePath` is set, import/check dictionaries in the external app/profile instead. SubMiner treats that profile as read-only and does not open its own Yomitan settings window.
 - If the overlay shows subtitles but hover lookup never resolves on tokens, the tokenizer may have failed. See the MeCab section below.
@@ -234,9 +234,9 @@ Japanese word boundaries depend on Yomitan parser output. If segmentation seems

 ## Character Dictionary

-Character names from AniList are matched and highlighted in subtitles via the bundled Yomitan. See [Character Dictionary](/character-dictionary) for setup and the full troubleshooting list — the most common issues:
+Character names from AniList are matched and highlighted in subtitles via the bundled Yomitan. See [Character Dictionary](/character-dictionary) for setup and the full troubleshooting list - the most common issues:

- **Names not highlighting:** Confirm `subtitleStyle.nameMatchEnabled` is `true`, and that the current media resolved to an AniList entry (SubMiner needs a media ID to fetch characters). No AniList account or token is required — character data uses public GraphQL queries.
+- **Names not highlighting:** Confirm `subtitleStyle.nameMatchEnabled` is `true`, and that the current media resolved to an AniList entry (SubMiner needs a media ID to fetch characters). No AniList account or token is required - character data uses public GraphQL queries.
 - **Inline portraits missing:** Confirm `subtitleStyle.nameMatchImagesEnabled` is `true`. Portraits also require AniList to return an image and the download to succeed during snapshot generation.
 - **Wrong characters showing:** Open the in-app manager (`Ctrl/Cmd+D`) and use **Override** to pin the correct AniList match for the series.
 - **Feature unavailable:** If `yomitan.externalProfilePath` is set, SubMiner runs in read-only external-profile mode and its character-dictionary features are disabled.
@@ -269,7 +269,7 @@ Global shortcuts (`Alt+Shift+O`, `Alt+Shift+Y`) may conflict with other applicat

 - Check your DE/WM keybinding settings for conflicts.
 - Change the shortcut in your config under `shortcuts.toggleVisibleOverlayGlobal`.
- On Wayland, global shortcut registration has limitations depending on the compositor. Only Hyprland and Sway are supported natively — see the [Hyprland](#hyprland) section below for shortcut passthrough rules. Other Wayland compositors require X11/Xwayland.
+- On Wayland, global shortcut registration has limitations depending on the compositor. Only Hyprland and Sway are supported natively - see the [Hyprland](#hyprland) section below for shortcut passthrough rules. Other Wayland compositors require X11/Xwayland.

 **Overlay keybindings not working**

@@ -326,14 +326,14 @@ The Jimaku API has rate limits. If you see 429 errors, wait for the retry durati

 ### Linux

- **Wayland (Hyprland/Sway only)**: Native Wayland support is limited to Hyprland and Sway. Window tracking uses compositor-specific commands (`hyprctl` / `swaymsg`). If these are not on `PATH`, tracking will fail silently. Other Wayland compositors (KDE Plasma, GNOME, …) are not supported natively — both mpv and SubMiner must run under X11 or Xwayland instead. On those sessions SubMiner forces XWayland automatically for itself and for every mpv it launches (see [KDE Plasma & other Wayland compositors](#kde-plasma--other-wayland-compositors)).
- **X11 / Xwayland**: Requires `xdotool`, `xprop`, and `xwininfo`. If missing, the overlay cannot track the mpv window position. This is the required backend for any Wayland compositor other than Hyprland or Sway — both mpv and SubMiner must be running under X11/Xwayland for window tracking _and_ for the overlay to stay above mpv (Wayland forbids clients from controlling window stacking). SubMiner uses a managed X11 overlay while mpv is windowed, switches to an override-redirect X11 overlay while tracked mpv is fullscreen, and hides/releases that overlay when another X11/Xwayland app takes focus. The visible overlay stays hidden until SubMiner has tracked mpv geometry, so startup should not create a display-sized fallback overlay while tokenization warms up.
+- **Wayland (Hyprland/Sway only)**: Native Wayland support is limited to Hyprland and Sway. Window tracking uses compositor-specific commands (`hyprctl` / `swaymsg`). If these are not on `PATH`, tracking will fail silently. Other Wayland compositors (KDE Plasma, GNOME, …) are not supported natively - both mpv and SubMiner must run under X11 or Xwayland instead. On those sessions SubMiner forces XWayland automatically for itself and for every mpv it launches (see [KDE Plasma & other Wayland compositors](#kde-plasma--other-wayland-compositors)).
+- **X11 / Xwayland**: Requires `xdotool`, `xprop`, and `xwininfo`. If missing, the overlay cannot track the mpv window position. This is the required backend for any Wayland compositor other than Hyprland or Sway - both mpv and SubMiner must be running under X11/Xwayland for window tracking _and_ for the overlay to stay above mpv (Wayland forbids clients from controlling window stacking). SubMiner uses a managed X11 overlay while mpv is windowed, switches to an override-redirect X11 overlay while tracked mpv is fullscreen, and hides/releases that overlay when another X11/Xwayland app takes focus. The visible overlay stays hidden until SubMiner has tracked mpv geometry, so startup should not create a display-sized fallback overlay while tokenization warms up.
 - **Tray icon missing**: SubMiner creates an Electron tray icon in `--background` mode, but Linux trays require a StatusNotifier/AppIndicator host. Hyprland does not provide one by itself; enable a tray in Waybar, Hyprpanel, or another panel. If Electron cannot register the tray, SubMiner logs a warning that mentions the missing tray host.
 - **Mouse passthrough**: On Linux X11/Xwayland, SubMiner uses `xdotool` to poll the cursor and only enables overlay input while the cursor is over subtitle or popup regions. Outside those regions, pointer input passes through to mpv. Native Wayland compositors other than Hyprland/Sway cannot provide the stacking control SubMiner needs.

 ### Hyprland

-SubMiner's overlay is a transparent, frameless Electron window that must be kept above mpv. SubMiner tries to apply the floating, borderless, no-shadow, and no-blur properties itself each time it places the overlay. It detects Hyprland's active config provider and uses Lua `hl.dsp.window.*` dispatchers for recent Hyprland Lua configs, or the legacy dispatcher syntax for older hyprlang configs. On many configurations that is enough, but if your Hyprland version doesn't honor those runtime dispatches — or a broad rule in your config forces opacity/blur on every window — add explicit window rules so the overlay is exempt. You also need `pass` bindings to forward global shortcuts to SubMiner (see below).
+SubMiner's overlay is a transparent, frameless Electron window that must be kept above mpv. SubMiner tries to apply the floating, borderless, no-shadow, and no-blur properties itself each time it places the overlay. It detects Hyprland's active config provider and uses Lua `hl.dsp.window.*` dispatchers for recent Hyprland Lua configs, or the legacy dispatcher syntax for older hyprlang configs. On many configurations that is enough, but if your Hyprland version doesn't honor those runtime dispatches - or a broad rule in your config forces opacity/blur on every window - add explicit window rules so the overlay is exempt. You also need `pass` bindings to forward global shortcuts to SubMiner (see below).

 **Overlay is not transparent or has a visible border**

@@ -364,7 +364,7 @@ windowrule = no_shadow on, match:class SubMiner
 windowrule = no_blur on, match:class SubMiner
 ```

-If you still see a solid background or visual artifacts instead of the mpv video underneath, the culprit is almost always a global opacity/blur rule applying to the overlay — the `opaque`/`opacity` and `no_blur` fields above override it.
+If you still see a solid background or visual artifacts instead of the mpv video underneath, the culprit is almost always a global opacity/blur rule applying to the overlay - the `opaque`/`opacity` and `no_blur` fields above override it.

 **Global shortcuts not working**

@@ -387,12 +387,12 @@ For more details, see the Hyprland docs on [global keybinds](https://wiki.hypr.l

 ### KDE Plasma & other Wayland compositors

-On any Wayland session that is not Hyprland or Sway (KDE Plasma, GNOME, and others), the overlay can only stay above mpv when both processes run under **XWayland** — the Wayland protocol forbids clients from controlling window stacking, so the overlay's "always on top" becomes a no-op on a native Wayland surface.
+On any Wayland session that is not Hyprland or Sway (KDE Plasma, GNOME, and others), the overlay can only stay above mpv when both processes run under **XWayland** - the Wayland protocol forbids clients from controlling window stacking, so the overlay's "always on top" becomes a no-op on a native Wayland surface.

 SubMiner handles this automatically:

 - It launches its own window under XWayland (it sets `--ozone-platform-hint=x11`).
- Every mpv it launches (via the `subminer` launcher, Jellyfin, or YouTube) is pinned to XWayland too — Wayland environment hints are stripped and an X11 GPU context (`--gpu-context=x11egl,x11`) is applied.
+- Every mpv it launches (via the `subminer` launcher, Jellyfin, or YouTube) is pinned to XWayland too - Wayland environment hints are stripped and an X11 GPU context (`--gpu-context=x11egl,x11`) is applied.
 - While mpv is windowed, the overlay is a managed X11 window owned by the tracked mpv window (`WM_TRANSIENT_FOR`), so it stays above mpv while other foreground X11/Xwayland apps can still cover both windows.
 - While tracked mpv is fullscreen, SubMiner swaps the visible overlay to a focusable-false X11 override-redirect window. That path can stay above the active fullscreen mpv window without requiring a KDE/KWin-specific rule, and SubMiner hides/releases it when mpv is no longer the active X11/Xwayland window.
 - The visible overlay is shown inactive on Linux, so normal hover should not steal keyboard focus from mpv.
@@ -423,15 +423,15 @@ SubMiner can only detect focus for X11/Xwayland windows in this mode. If a nativ

 Feature-specific issues are covered in each feature's own page:

- [Anki Integration](/anki-integration) — card creation, field mapping, and AnkiConnect setup
- [AniList Integration](/anilist-integration) — watch-progress sync and authentication
- [Character Dictionary](/character-dictionary) — AniList character name matching and inline portraits
- [Jellyfin Integration](/jellyfin-integration) — remote playback and library connection
- [Jimaku Integration](/jimaku-integration) — subtitle fetching and API rate limits
- [YouTube Integration](/youtube-integration) — subtitle generation and playback
- [Immersion Tracking](/immersion-tracking) — telemetry and session logging
- [WebSocket / Texthooker API](/websocket-texthooker-api) — external texthooker clients
- [Subtitle Annotations](/subtitle-annotations) — N+1, frequency, JLPT, and name-match layers
- [Subtitle Sidebar](/subtitle-sidebar) — sidebar navigation and behavior
- [Configuration Reference](/configuration) — full config options
- [Shortcuts](/shortcuts) — keybinding reference
+- [Anki Integration](/anki-integration) - card creation, field mapping, and AnkiConnect setup
+- [AniList Integration](/anilist-integration) - watch-progress sync and authentication
+- [Character Dictionary](/character-dictionary) - AniList character name matching and inline portraits
+- [Jellyfin Integration](/jellyfin-integration) - remote playback and library connection
+- [Jimaku Integration](/jimaku-integration) - subtitle fetching and API rate limits
+- [YouTube Integration](/youtube-integration) - subtitle generation and playback
+- [Immersion Tracking](/immersion-tracking) - telemetry and session logging
+- [WebSocket / Texthooker API](/websocket-texthooker-api) - external texthooker clients
+- [Subtitle Annotations](/subtitle-annotations) - N+1, frequency, JLPT, and name-match layers
+- [Subtitle Sidebar](/subtitle-sidebar) - sidebar navigation and behavior
+- [Configuration Reference](/configuration) - full config options
+- [Shortcuts](/shortcuts) - keybinding reference
@@ -8,7 +8,7 @@ Play a video with SubMiner:
 subminer video.mkv
 ```

-On **Windows**, use the **SubMiner mpv** shortcut created during first-run setup — double-click it, or drag a video file onto it.
+On **Windows**, use the **SubMiner mpv** shortcut created during first-run setup - double-click it, or drag a video file onto it.

 That's the simplest way to get started. The `subminer` launcher handles mpv, the IPC socket, and the overlay automatically.

@@ -41,20 +41,20 @@ Field names must match your Anki note type exactly (case-sensitive). See [Anki I
 When you launch SubMiner, it wires up mpv and the overlay for you:

 1. SubMiner starts the overlay app in the background
-2. mpv runs with an **IPC socket** at `/tmp/subminer-socket` — a small local channel two programs use to talk to each other, so the overlay can ask mpv what subtitle is on screen right now
+2. mpv runs with an **IPC socket** at `/tmp/subminer-socket` - a small local channel two programs use to talk to each other, so the overlay can ask mpv what subtitle is on screen right now
 3. The overlay connects and subscribes to subtitle changes

-From there, subtitles render as interactive, hoverable word spans and you mine cards directly from the overlay. For the overlay anatomy and the full mining loop — word lookup, card creation, annotations — see [Mining Workflow](/mining-workflow).
+From there, subtitles render as interactive, hoverable word spans and you mine cards directly from the overlay. For the overlay anatomy and the full mining loop - word lookup, card creation, annotations - see [Mining Workflow](/mining-workflow).

 ### Ways to Launch

 | Approach                            | Use when                                                                                                                               | How                                                                   |
 | ----------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| **`subminer` launcher**             | You want SubMiner to handle everything — launch mpv, set up the socket, start the overlay. **Recommended for most users.**             | `subminer video.mkv`                                                  |
+| **`subminer` launcher**             | You want SubMiner to handle everything - launch mpv, set up the socket, start the overlay. **Recommended for most users.**             | `subminer video.mkv`                                                  |
 | **SubMiner mpv shortcut** (Windows) | The recommended Windows entry point. Created during first-run setup, launches mpv with SubMiner's defaults.                            | Double-click, drag a file onto it, or run `SubMiner.exe --launch-mpv` |
 | **mpv plugin** (all platforms)      | Bundled and injected at runtime. Provides `y` chord keybindings for controlling the overlay from within mpv. No manual install needed. | Automatic when using the launcher or shortcut                         |

-The mpv plugin is always available — it's bundled with SubMiner and injected at runtime. If you launch mpv yourself (without the launcher), pass `--input-ipc-server=/tmp/subminer-socket` in your mpv config for the overlay to connect.
+The mpv plugin is always available - it's bundled with SubMiner and injected at runtime. If you launch mpv yourself (without the launcher), pass `--input-ipc-server=/tmp/subminer-socket` in your mpv config for the overlay to connect.

 ## Live Config Reload

@@ -287,7 +287,7 @@ Notes:
 - For YouTube URLs, `subminer` probes available YouTube subtitle tracks, reuses existing authoritative tracks when available, and downloads only missing sides.
 - Native mpv secondary subtitle rendering stays hidden so the overlay remains the visible secondary subtitle surface.
 - Primary subtitle target languages come from `youtube.primarySubLanguages` (defaults to `["ja","jpn"]`).
- Secondary target languages come from `secondarySub.secondarySubLanguages` (empty by default; when empty, no language-based secondary track is auto-selected, though mpv's `--slang` list above still prefers English variants).
+- Secondary target languages come from `secondarySub.secondarySubLanguages` (empty by default; when empty, no language-based secondary track is auto-selected, though mpv's `--slang` list above still prefers English variants). When multiple matching secondary tracks exist, SubMiner prefers a non-Signs/Songs track.
 - Configure defaults in `$XDG_CONFIG_HOME/SubMiner/config.jsonc` (or `~/.config/SubMiner/config.jsonc`) under `youtube` and `secondarySub`.

 For local video files, SubMiner uses the same config-driven language priorities to auto-select the primary and secondary subtitle tracks from internal and external subtitle sources.
@@ -301,7 +301,7 @@ SubMiner supports gamepad/controller input for couch-friendly usage via the Chro
 1. Connect a controller before or after launching SubMiner.
 2. Set `controller.enabled` to `true` in your config.
 3. Press `Alt+C` in the overlay by default to pick the controller you want to save and remap any action inline.
-4. Enable keyboard-only mode — press `Y` on the controller (default binding) or use the overlay keybinding.
+4. Enable keyboard-only mode - press `Y` on the controller (default binding) or use the overlay keybinding.
 5. Click the binding badge, edit pencil, or `Learn` on the overlay action you want, then press the matching button, trigger, or stick direction on the controller.
 6. Use the left stick to navigate subtitle tokens and scroll the popup; use the right stick vertically for popup page jumps.
 7. Press `A` to look up the selected word, `X` to mine a card, `B` to close the popup.
@@ -333,7 +333,7 @@ By default SubMiner uses the first connected controller after controller support

 Learn mode ignores already-held inputs and waits for the next fresh button press or axis direction, which avoids accidental captures when you open the modal mid-input.

-All button and axis mappings are configurable under the `controller` config block. Learned remaps are saved under `controller.profiles` for the selected controller id. See [Configuration — Controller Support](/configuration#controller-support) for the full options.
+All button and axis mappings are configurable under the `controller` config block. Learned remaps are saved under `controller.profiles` for the selected controller id. See [Configuration - Controller Support](/configuration#controller-support) for the full options.

 ## Keybindings

@@ -361,4 +361,4 @@ Hovering over subtitle text pauses mpv by default; leaving resumes it. Yomitan p
 - Drop video files onto the overlay to replace current playback.
 - Hold `Shift` while dropping to append to the playlist instead.

-Next: [Mining Workflow](/mining-workflow) — word lookup, card creation, and the full mining loop.
+Next: [Mining Workflow](/mining-workflow) - word lookup, card creation, and the full mining loop.
@@ -1,6 +1,6 @@
 # WebSocket / Texthooker API & Integration

-**Who this page is for:** developers and tinkerers who want to consume SubMiner's live subtitle stream from their own tools — a browser tab, an automation script, or another mpv plugin. If you just want subtitles in a browser tab for Yomitan, skip to [Texthooker Integration Guide](#texthooker-integration-guide); the rest is reference for building custom clients.
+**Who this page is for:** developers and tinkerers who want to consume SubMiner's live subtitle stream from their own tools - a browser tab, an automation script, or another mpv plugin. If you just want subtitles in a browser tab for Yomitan, skip to [Texthooker Integration Guide](#texthooker-integration-guide); the rest is reference for building custom clients.

 A *texthooker* is a page/tool that receives the text currently on screen so a dictionary extension (like Yomitan) can look words up. SubMiner ships its own texthooker UI and also broadcasts subtitle text over local WebSockets that any client can connect to.

@@ -24,7 +24,7 @@ This page documents those integration points and shows how to build custom consu

 ## Enable and Configure the Services

-SubMiner's integration ports are configured in `config.jsonc`. All three services are **off by default** — the block below shows the values to set to turn them on.
+SubMiner's integration ports are configured in `config.jsonc`. All three services are **off by default** - the block below shows the values to set to turn them on.

 ```jsonc
 {
@@ -50,7 +50,7 @@ SubMiner's integration ports are configured in `config.jsonc`. All three service
 - `texthooker.launchAtStartup` defaults to `false`. Set it to `true` to start the local HTTP UI automatically.
 - `texthooker.openBrowser` controls whether SubMiner opens the texthooker page in your browser when it starts.

-If you use the [mpv plugin](/mpv-plugin), it can also start a texthooker-only helper process. The launcher derives the plugin's texthooker setting from your SubMiner config (`texthooker.launchAtStartup`) and injects it at runtime — there is no plugin config file to edit.
+If you use the [mpv plugin](/mpv-plugin), it can also start a texthooker-only helper process. The launcher derives the plugin's texthooker setting from your SubMiner config (`texthooker.launchAtStartup`) and injects it at runtime - there is no plugin config file to edit.

 ## Developer API Documentation

@@ -368,7 +368,7 @@ ws.on('message', async (raw) => {
 ## Related Pages

 - [Configuration](/configuration#websocket-server)
- [Mining Workflow — Texthooker](/mining-workflow#texthooker)
+- [Mining Workflow - Texthooker](/mining-workflow#texthooker)
 - [MPV Plugin](/mpv-plugin)
 - [Launcher Script](/launcher-script)
 - [Anki Integration](/anki-integration#proxy-mode-setup-yomitan--texthooker)
@@ -4,8 +4,8 @@ SubMiner auto-loads Japanese subtitles when you play a YouTube URL, giving you t

 ## Requirements

- **[yt-dlp](https://github.com/yt-dlp/yt-dlp)** must be installed and on your `PATH`. yt-dlp is a free command-line tool that reads YouTube video and subtitle info; SubMiner calls it behind the scenes. (`PATH` is the list of folders your system searches for programs — most installers add yt-dlp to it automatically. If yours did not, set `SUBMINER_YTDLP_BIN` to the full path of the yt-dlp binary.)
- mpv with `--input-ipc-server` configured (handled automatically when you launch playback through the `subminer` launcher — no manual setup needed).
+- **[yt-dlp](https://github.com/yt-dlp/yt-dlp)** must be installed and on your `PATH`. yt-dlp is a free command-line tool that reads YouTube video and subtitle info; SubMiner calls it behind the scenes. (`PATH` is the list of folders your system searches for programs - most installers add yt-dlp to it automatically. If yours did not, set `SUBMINER_YTDLP_BIN` to the full path of the yt-dlp binary.)
+- mpv with `--input-ipc-server` configured (handled automatically when you launch playback through the `subminer` launcher - no manual setup needed).

 ## How It Works

@@ -32,7 +32,7 @@ flowchart TD
    C[Track discovery]:::action
    D{Auto or manual selection?}:::step
    E[Auto-select best tracks]:::action
-    F[Manual picker — Ctrl+Alt+C]:::action
+    F[Manual picker - Ctrl+Alt+C]:::action
    G[Download subtitle files]:::action
    H[Convert TimedText to VTT]:::enrich
    I[Normalize auto-caption duplicates]:::enrich
@@ -77,6 +77,7 @@ Notes:
 - `changelog:check` now rejects tag/package version mismatches.
 - `changelog:prerelease-notes` also rejects tag/package version mismatches and writes `release/prerelease-notes.md` without mutating tracked changelog files. When that file already exists, the generator includes it in the Claude prompt so later beta/RC notes reuse the reviewed text instead of starting over.
 - `changelog:build` generates `CHANGELOG.md` + `release/release-notes.md` (both polished by `claude -p`) and removes the released `changes/*.md` fragments. The CHANGELOG keeps internal notes inside a `<details><summary>Internal changes</summary>` collapse; the release notes drop them entirely.
+- `release/release-notes.md` (and `release/prerelease-notes.md`) end with GitHub-style attribution: a `## What’s Changed` list crediting each released fragment as `by @<author> in #<pr>`, plus a `## New Contributors` section for first-time authors. Attribution is resolved per fragment via `git log` (the commit that added the fragment) + `gh api .../commits/<sha>/pulls`, with one `gh` search per author for the first-contribution check. It needs `gh` installed and authenticated; if `gh` is unavailable or a lookup fails, the generator warns and emits notes without the attribution sections rather than failing. The CHANGELOG itself stays attribution-free.
 - The release workflow no longer auto-runs `changelog:build`. If pending `changes/*.md` fragments are present on a tag-based run, CI exits with a clear `::error::` pointing at the local fix. Run `bun run changelog:build --version <version>` locally, commit the polished output, then tag.
 - Do not tag while `changes/*.md` fragments still exist.
 - Prerelease tags intentionally keep `changes/*.md` fragments in place so multiple prereleases can reuse the same cumulative pending notes until the final stable cut. `make clean` preserves `release/prerelease-notes.md` while deleting generated build artifacts.
@@ -2,7 +2,7 @@
  "name": "subminer",
  "productName": "SubMiner",
  "desktopName": "SubMiner.desktop",
-  "version": "0.15.1",
+  "version": "0.15.2",
  "description": "All-in-one sentence mining overlay with AnkiConnect and dictionary integration",
  "packageManager": "bun@1.3.5",
  "main": "dist/main-entry.js",
@@ -1,47 +0,0 @@
-## Highlights
-### Fixed
-
- **Linux Overlay Stacking (XWayland / Wayland)**
-  - The overlay no longer drops behind mpv on KDE Plasma and other non-Hyprland/Sway Wayland sessions; subtitle hover, pause-on-hover, and Yomitan lookups now work correctly on those desktops.
-  - Stacking is now focus-sensitive: overlay stays managed while mpv is windowed, switches to non-interactive mode in fullscreen, and automatically yields to foreground windows (Settings, Yomitan, other apps) rather than covering them.
-  - Startup glitches are resolved — no more display-sized overlay flash or black screen before playback begins.
-
- **Hyprland Overlay Placement (0.55+ / Lua configs)**
-  - Overlay placement now works on Hyprland 0.55+ installations that use the new Lua config format; SubMiner detects Lua mode and uses the correct `hl.window_rule` dispatcher automatically.
-
- **macOS Overlay**
-  - Fixed the subtitle overlay remaining click-through after pause-until-ready releases playback; hovering and Yomitan lookups resume normally.
-  - Restored automatic mpv focus after closing Settings, AniList setup, and other modal windows so subtitles and playback keybinds work without clicking the player.
-
- **Manual Overlay Startup**
-  - Starting the visible overlay manually from mpv now correctly attaches to playback, syncs the overlay window to mpv bounds on Linux/X11, and loads the current primary and secondary subtitles before revealing.
-
- **Playlist Transitions**
-  - Advancing to the next mpv playlist item no longer triggers a second startup and tokenization delay; the overlay stays warm and visible subtitles are preserved across the transition.
-
- **Windows Launcher**
-  - The `SubMiner mpv` shortcut on Windows now attaches the video to an already-running background app instead of spawning a duplicate warmup process.
-
- **Mouse Keybindings**
-  - Side mouse buttons (`MBTN_BACK`, `MBTN_FORWARD`) and other mouse buttons can now be captured in the keybinding settings and work correctly at runtime.
-
-### Docs
-
- **Troubleshooting Guides**
-  - Hyprland overlay guide updated with both Lua (`hl.window_rule`) and legacy `hyprland.conf` window rule syntax, plus a note on automatic placement via `hyprctl`.
-  - New KDE Plasma / Wayland section covering XWayland workarounds when launching mpv manually.
-  - New Character Dictionary section covering name matching, inline portraits, and external-profile mode (no AniList login required).
-  - Added a "See Also" index linking each feature to its own troubleshooting page.
-
-## Installation
-
-See the README and docs/installation guide for full setup steps.
-
-## Assets
-
- Linux: `SubMiner.AppImage`
- macOS: `SubMiner-*.dmg` and `SubMiner-*.zip`
- Windows: `SubMiner-*.exe` and `SubMiner-*-win.zip`
- Optional extras: `subminer-assets.tar.gz` and the `subminer` launcher
-
-Note: the `subminer` wrapper script uses Bun (`#!/usr/bin/env bun`), so `bun` must be installed and on `PATH`.
@@ -488,7 +488,7 @@ test('verifyPullRequestChangelog requires fragments for user-facing changes and
        changedEntries: [{ path: 'src/main-entry.ts', status: 'M' }],
        changedLabels: [],
      }),
-    /requires a changelog fragment/,
+    /requires a reconciled changelog fragment/,
  );

  assert.doesNotThrow(() =>
@@ -514,7 +514,7 @@ test('verifyPullRequestChangelog requires fragments for user-facing changes and
        ],
        changedLabels: [],
      }),
-    /requires a changelog fragment/,
+    /requires a reconciled changelog fragment/,
  );

  assert.doesNotThrow(() =>
@@ -526,6 +526,27 @@ test('verifyPullRequestChangelog requires fragments for user-facing changes and
      changedLabels: [],
    }),
  );
+
+  assert.doesNotThrow(() =>
+    verifyPullRequestChangelog({
+      changedEntries: [
+        { path: 'src/main-entry.ts', status: 'M' },
+        { path: 'changes/001.md', status: 'M' },
+      ],
+      changedLabels: [],
+    }),
+  );
+
+  assert.doesNotThrow(() =>
+    verifyPullRequestChangelog({
+      changedEntries: [
+        { path: 'src/main-entry.ts', status: 'M' },
+        { path: 'changes/001.md', status: 'A' },
+        { path: 'changes/002.md', status: 'A' },
+      ],
+      changedLabels: [],
+    }),
+  );
 });

 test('writePrereleaseNotesForVersion writes cumulative beta notes without mutating stable changelog artifacts', async () => {
@@ -1044,6 +1065,85 @@ test('writeChangelogArtifacts filters internal fragments from the release-notes
  }
 });

+test('writeChangelogArtifacts appends contributor attribution and a new-contributors section to release notes', async () => {
+  const { writeChangelogArtifacts } = await loadModule();
+  const workspace = createWorkspace('release-notes-contributors');
+  const projectRoot = path.join(workspace, 'SubMiner');
+
+  fs.mkdirSync(path.join(projectRoot, 'changes'), { recursive: true });
+  fs.writeFileSync(path.join(projectRoot, 'CHANGELOG.md'), '# Changelog\n', 'utf8');
+  fs.writeFileSync(
+    path.join(projectRoot, 'changes', '001.md'),
+    ['type: added', 'area: overlay', '', '- Added a feature.'].join('\n'),
+    'utf8',
+  );
+  fs.writeFileSync(
+    path.join(projectRoot, 'changes', '002.md'),
+    ['type: fixed', 'area: jellyfin', '', '- Fixed a bug.'].join('\n'),
+    'utf8',
+  );
+
+  try {
+    const stub = defaultStubClaude();
+    const resolveContributionsCalls: string[][] = [];
+    writeChangelogArtifacts({
+      cwd: projectRoot,
+      version: '0.6.0',
+      date: '2026-05-06',
+      deps: {
+        runClaude: stub.runClaude,
+        resolveContributions: (fragmentPaths) => {
+          resolveContributionsCalls.push(fragmentPaths);
+          return [
+            {
+              prNumber: 110,
+              login: 'ksyasuda',
+              title: 'feat(overlay): add a feature',
+              isFirstContribution: false,
+            },
+            {
+              prNumber: 112,
+              login: 'bee-san',
+              title: 'fix(jellyfin): restart remote session',
+              isFirstContribution: true,
+            },
+          ];
+        },
+      },
+    });
+
+    assert.equal(resolveContributionsCalls.length, 1, 'resolves contributions once per release');
+    assert.deepEqual(resolveContributionsCalls[0], [
+      path.join(projectRoot, 'changes', '001.md'),
+      path.join(projectRoot, 'changes', '002.md'),
+    ]);
+
+    const releaseNotes = fs.readFileSync(
+      path.join(projectRoot, 'release', 'release-notes.md'),
+      'utf8',
+    );
+    assert.match(releaseNotes, /## What’s Changed\n\n/);
+    assert.match(releaseNotes, /- feat\(overlay\): add a feature by @ksyasuda in #110\n/);
+    assert.match(releaseNotes, /- fix\(jellyfin\): restart remote session by @bee-san in #112\n/);
+    assert.match(
+      releaseNotes,
+      /## New Contributors\n\n- @bee-san made their first contribution in #112/,
+    );
+    assert.doesNotMatch(
+      releaseNotes,
+      /ksyasuda made their first contribution/,
+      'returning contributors are not listed under New Contributors',
+    );
+
+    // Attribution is a release-notes concern only; the CHANGELOG stays clean.
+    const changelog = fs.readFileSync(path.join(projectRoot, 'CHANGELOG.md'), 'utf8');
+    assert.doesNotMatch(changelog, /What’s Changed/);
+    assert.doesNotMatch(changelog, /New Contributors/);
+  } finally {
+    fs.rmSync(workspace, { recursive: true, force: true });
+  }
+});
+
 test('writeChangelogArtifacts strips <details> blocks from release notes when reusing an existing CHANGELOG section', async () => {
  const { writeChangelogArtifacts } = await loadModule();
  const workspace = createWorkspace('reuse-existing-section');
@@ -4,6 +4,20 @@ import { execFileSync } from 'node:child_process';

 type RunClaude = (input: string, args: string[]) => string;

+// A single PR's contribution, resolved from the fragment files released in this
+// cycle. Used to append GitHub-style attribution to the release notes.
+type Contribution = {
+  prNumber: number;
+  login: string;
+  title: string;
+  isFirstContribution: boolean;
+};
+
+// Resolves the contributions behind a set of changelog fragment paths. Injected
+// in tests so we never hit git/gh; the default implementation walks git history
+// and the GitHub API.
+type ResolveContributions = (fragmentPaths: string[], cwd: string) => Contribution[];
+
 type ChangelogFsDeps = {
  existsSync?: (candidate: string) => boolean;
  mkdirSync?: (candidate: string, options: { recursive: true }) => void;
@@ -13,6 +27,7 @@ type ChangelogFsDeps = {
  writeFileSync?: (candidate: string, content: string, encoding: BufferEncoding) => void;
  log?: (message: string) => void;
  runClaude?: RunClaude;
+  resolveContributions?: ResolveContributions;
 };

 type PolishMode = 'changelog' | 'release-notes';
@@ -296,6 +311,152 @@ function defaultRunClaude(input: string, args: string[]): string {
  }
 }

+function resolveFragmentRelativePath(fragmentPath: string, cwd: string): string {
+  return path.relative(cwd, fragmentPath).split(path.sep).join('/');
+}
+
+// Walks git history + the GitHub API to attribute each released fragment to the
+// PR (and author) that introduced it. One git call and one gh call per fragment,
+// plus one gh call per unique author for the first-contribution check. Best
+// effort: if gh is unavailable/unauthenticated or any lookup fails, we warn and
+// drop attribution rather than failing the release.
+function defaultResolveContributions(fragmentPaths: string[], cwd: string): Contribution[] {
+  if (fragmentPaths.length === 0) {
+    return [];
+  }
+
+  try {
+    const slug = execFileSync(
+      'gh',
+      ['repo', 'view', '--json', 'nameWithOwner', '--jq', '.nameWithOwner'],
+      {
+        cwd,
+        encoding: 'utf8',
+      },
+    ).trim();
+    if (!slug) {
+      return [];
+    }
+
+    const byPr = new Map<number, Contribution>();
+    for (const fragmentPath of fragmentPaths) {
+      const relativePath = resolveFragmentRelativePath(fragmentPath, cwd);
+      // git log lists newest first, so the commit that *added* the file is the
+      // last line of the --diff-filter=A history.
+      const addingSha = execFileSync(
+        'git',
+        ['log', '--diff-filter=A', '--follow', '--format=%H', '--', relativePath],
+        { cwd, encoding: 'utf8' },
+      )
+        .trim()
+        .split(/\r?\n/)
+        .filter(Boolean)
+        .pop();
+      if (!addingSha) {
+        continue;
+      }
+
+      const prRaw = execFileSync(
+        'gh',
+        [
+          'api',
+          `repos/${slug}/commits/${addingSha}/pulls`,
+          '--jq',
+          '.[0] // empty | {number, login: .user.login, title}',
+        ],
+        { cwd, encoding: 'utf8' },
+      ).trim();
+      if (!prRaw) {
+        continue;
+      }
+
+      const pr = JSON.parse(prRaw) as { number?: number; login?: string; title?: string };
+      if (typeof pr.number !== 'number' || !pr.login || !pr.title) {
+        continue;
+      }
+      if (!byPr.has(pr.number)) {
+        byPr.set(pr.number, {
+          prNumber: pr.number,
+          login: pr.login,
+          title: pr.title,
+          isFirstContribution: false,
+        });
+      }
+    }
+
+    const firstPrByAuthor = new Map<string, number | null>();
+    for (const contribution of byPr.values()) {
+      if (!firstPrByAuthor.has(contribution.login)) {
+        const firstRaw = execFileSync(
+          'gh',
+          [
+            'api',
+            '-X',
+            'GET',
+            'search/issues',
+            '-f',
+            `q=repo:${slug} is:pr is:merged author:${contribution.login}`,
+            '-f',
+            'sort=created',
+            '-f',
+            'order=asc',
+            '-f',
+            'per_page=1',
+            '--jq',
+            '.items[0].number // empty',
+          ],
+          { cwd, encoding: 'utf8' },
+        ).trim();
+        firstPrByAuthor.set(contribution.login, firstRaw ? Number.parseInt(firstRaw, 10) : null);
+      }
+      const firstPr = firstPrByAuthor.get(contribution.login) ?? null;
+      contribution.isFirstContribution = firstPr !== null && firstPr === contribution.prNumber;
+    }
+
+    return [...byPr.values()].sort((a, b) => a.prNumber - b.prNumber);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(`Skipping contributor attribution: ${message}`);
+    return [];
+  }
+}
+
+function resolveContributionsForFragments(
+  fragments: ChangeFragment[],
+  cwd: string,
+  deps?: ChangelogFsDeps,
+): Contribution[] {
+  const resolve = deps?.resolveContributions ?? defaultResolveContributions;
+  return resolve(
+    fragments.filter((fragment) => fragment.type !== 'internal').map((fragment) => fragment.path),
+    cwd,
+  );
+}
+
+function renderContributorsSections(contributions: Contribution[]): string[] {
+  if (contributions.length === 0) {
+    return [];
+  }
+
+  const lines: string[] = ['## What’s Changed', ''];
+  for (const contribution of contributions) {
+    lines.push(`- ${contribution.title} by @${contribution.login} in #${contribution.prNumber}`);
+  }
+
+  const firstTimers = contributions.filter((contribution) => contribution.isFirstContribution);
+  if (firstTimers.length > 0) {
+    lines.push('', '## New Contributors', '');
+    for (const contribution of firstTimers) {
+      lines.push(
+        `- @${contribution.login} made their first contribution in #${contribution.prNumber}`,
+      );
+    }
+  }
+
+  lines.push('');
+  return lines;
+}
+
 function serializeFragmentsForPrompt(
  fragments: ChangeFragment[],
  mode: PolishMode,
@@ -473,6 +634,7 @@ function renderReleaseNotes(
  changes: string,
  options?: {
    disclaimer?: string;
+    contributions?: Contribution[];
  },
 ): string {
  const prefix = options?.disclaimer ? [options.disclaimer, ''] : [];
@@ -494,6 +656,7 @@ function renderReleaseNotes(
    '',
    'Note: the `subminer` wrapper script uses Bun (`#!/usr/bin/env bun`), so `bun` must be installed and on `PATH`.',
    '',
+    ...renderContributorsSections(options?.contributions ?? []),
  ].join('\n');
 }

@@ -504,6 +667,7 @@ function writeReleaseNotesFile(
  options?: {
    disclaimer?: string;
    outputPath?: string;
+    contributions?: Contribution[];
  },
 ): string {
  const mkdirSync = deps?.mkdirSync ?? fs.mkdirSync;
@@ -530,6 +694,7 @@ export function writeChangelogArtifacts(options?: ChangelogOptions): {
  const version = resolveVersion(options ?? {});
  const date = resolveDate(options?.date);
  const fragments = readChangeFragments(cwd, options?.deps);
+  const contributions = resolveContributionsForFragments(fragments, cwd, options?.deps);
  const existingChangelogPath = path.join(cwd, 'CHANGELOG.md');
  const existingChangelog = existsSync(existingChangelogPath)
    ? readFileSync(existingChangelogPath, 'utf8')
@@ -547,6 +712,7 @@ export function writeChangelogArtifacts(options?: ChangelogOptions): {
      cwd,
      stripDetailsBlocks(existingReleaseSection),
      options?.deps,
+      { contributions },
    );
    log(`Generated ${releaseNotesPath}`);

@@ -572,7 +738,9 @@ export function writeChangelogArtifacts(options?: ChangelogOptions): {
    date,
    deps: options?.deps,
  });
-  const releaseNotesPath = writeReleaseNotesFile(cwd, releaseNotesBody, options?.deps);
+  const releaseNotesPath = writeReleaseNotesFile(cwd, releaseNotesBody, options?.deps, {
+    contributions,
+  });
  log(`Generated ${releaseNotesPath}`);

  for (const fragment of fragments) {
@@ -661,14 +829,15 @@ export function verifyPullRequestChangelog(options: PullRequestChangelogOptions)
    return;
  }

-  const hasFragment = normalizedEntries.some(
+  const fragmentEntries = normalizedEntries.filter(
    (entry) => entry.status !== 'D' && isFragmentPath(entry.path),
  );
+  const hasFragment = fragmentEntries.length > 0;
  const requiresFragment = normalizedEntries.some((entry) => !isIgnoredPullRequestPath(entry.path));

  if (requiresFragment && !hasFragment) {
    throw new Error(
-      `This pull request changes release-relevant files and requires a changelog fragment under changes/ or the ${SKIP_CHANGELOG_LABEL} label.`,
+      `This pull request changes release-relevant files and requires a reconciled changelog fragment under changes/ or the ${SKIP_CHANGELOG_LABEL} label. Before adding a new fragment, update the existing PR fragment when the new work modifies, fixes, or supersedes behavior already described there.`,
    );
  }
 }
@@ -832,10 +1001,12 @@ export function writePrereleaseNotesForVersion(options?: ChangelogOptions): stri
    existingReleaseNotes,
    deps: options?.deps,
  });
+  const contributions = resolveContributionsForFragments(fragments, cwd, options?.deps);
  return writeReleaseNotesFile(cwd, changes, options?.deps, {
    disclaimer:
      '> This is a prerelease build for testing. Stable changelog and docs-site updates remain pending until the final stable release.',
    outputPath: PRERELEASE_NOTES_PATH,
+    contributions,
  });
 }

@@ -156,6 +156,22 @@ export class AnkiConnectClient {
    return (result as number[]) || [];
  }

+  async findCards(query: string, options?: { maxRetries?: number }): Promise<number[]> {
+    const result = await this.invoke('findCards', { query }, options);
+    return (result as number[]) || [];
+  }
+
+  async changeDeck(cardIds: number[], deckName: string): Promise<void> {
+    if (cardIds.length === 0 || !deckName.trim()) {
+      return;
+    }
+
+    await this.invoke('changeDeck', {
+      cards: cardIds,
+      deck: deckName,
+    });
+  }
+
  async deckNames(): Promise<string[]> {
    const result = await this.invoke('deckNames');
    return Array.isArray(result)
@@ -63,7 +63,7 @@ export function buildIntegrationConfigOptionRegistry(
      kind: 'string',
      defaultValue: defaultConfig.ankiConnect.deck,
      description:
-        'Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to search all decks.',
+        'Restrict duplicate detection and card enrichment to this Anki deck. Leave empty to use the Yomitan mining deck when available.',
    },
    {
      path: 'ankiConnect.fields.word',
@@ -34,13 +34,13 @@ test('guessAnilistMediaInfo fills missing guessit episode from filename parser',
  });
 });

-test('guessAnilistMediaInfo ignores low-confidence parser details when guessit omits them', async () => {
+test('guessAnilistMediaInfo keeps season directory scope when guessit omits details', async () => {
  const result = await guessAnilistMediaInfo('/tmp/Season 2/Guessit Title.mkv', null, {
    runGuessit: async () => JSON.stringify({ title: 'Guessit Title' }),
  });
  assert.deepEqual(result, {
    title: 'Guessit Title',
-    season: null,
+    season: 2,
    episode: null,
    source: 'guessit',
  });
@@ -235,6 +235,86 @@ test('updateAnilistPostWatchProgress uses the configured AniList rate limiter',
  }
 });

+test('updateAnilistPostWatchProgress marks the final season episode completed', async () => {
+  const originalFetch = globalThis.fetch;
+  let call = 0;
+  globalThis.fetch = (async (_input, init) => {
+    call += 1;
+    const body = JSON.parse(String(init?.body)) as { variables?: Record<string, unknown> };
+    if (call === 1) {
+      return createJsonResponse({
+        data: {
+          Page: {
+            media: [{ id: 12, episodes: 12, title: { english: 'Final Show' } }],
+          },
+        },
+      });
+    }
+    if (call === 2) {
+      return createJsonResponse({
+        data: {
+          Media: { id: 12, mediaListEntry: { progress: 11, status: 'CURRENT' } },
+        },
+      });
+    }
+
+    assert.equal(body.variables?.progress, 12);
+    assert.equal(body.variables?.status, 'COMPLETED');
+    return createJsonResponse({
+      data: { SaveMediaListEntry: { progress: 12, status: 'COMPLETED' } },
+    });
+  }) as typeof fetch;
+
+  try {
+    const result = await updateAnilistPostWatchProgress('token', 'Final Show', 12);
+    assert.equal(result.status, 'updated');
+    assert.match(result.message, /completed/i);
+    assert.equal(call, 3);
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+});
+
+test('updateAnilistPostWatchProgress marks an already watched final season episode completed', async () => {
+  const originalFetch = globalThis.fetch;
+  let call = 0;
+  globalThis.fetch = (async (_input, init) => {
+    call += 1;
+    const body = JSON.parse(String(init?.body)) as { variables?: Record<string, unknown> };
+    if (call === 1) {
+      return createJsonResponse({
+        data: {
+          Page: {
+            media: [{ id: 12, episodes: 12, title: { english: 'Final Show' } }],
+          },
+        },
+      });
+    }
+    if (call === 2) {
+      return createJsonResponse({
+        data: {
+          Media: { id: 12, mediaListEntry: { progress: 12, status: 'CURRENT' } },
+        },
+      });
+    }
+
+    assert.equal(body.variables?.progress, 12);
+    assert.equal(body.variables?.status, 'COMPLETED');
+    return createJsonResponse({
+      data: { SaveMediaListEntry: { progress: 12, status: 'COMPLETED' } },
+    });
+  }) as typeof fetch;
+
+  try {
+    const result = await updateAnilistPostWatchProgress('token', 'Final Show', 12);
+    assert.equal(result.status, 'updated');
+    assert.match(result.message, /completed/i);
+    assert.equal(call, 3);
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+});
+
 test('updateAnilistPostWatchProgress skips when progress already reached', async () => {
  const originalFetch = globalThis.fetch;
  let call = 0;
@@ -228,7 +228,7 @@ function pickBestSearchResult(
      native?: string | null;
    };
  }>,
-): { id: number; title: string } | null {
+): { id: number; title: string; episodes: number | null } | null {
  const filtered = media.filter((item) => {
    const totalEpisodes = item.episodes;
    return totalEpisodes === null || totalEpisodes >= episode;
@@ -247,7 +247,7 @@ function pickBestSearchResult(
  const selected = exact ?? candidates[0]!;
  const selectedTitle =
    selected.title?.english || selected.title?.romaji || selected.title?.native || title;
-  return { id: selected.id, title: selectedTitle };
+  return { id: selected.id, title: selectedTitle, episodes: selected.episodes };
 }

 function isUpdateableListStatus(status: string | null | undefined): boolean {
@@ -259,6 +259,15 @@ function formatListStatus(status: string | null | undefined): string {
  return `marked ${status.toLowerCase().replace(/_/g, ' ')} on AniList`;
 }

+function isKnownFinalEpisode(totalEpisodes: number | null, episode: number): boolean {
+  return (
+    typeof totalEpisodes === 'number' &&
+    Number.isInteger(totalEpisodes) &&
+    totalEpisodes > 0 &&
+    episode === totalEpisodes
+  );
+}
+
 export async function guessAnilistMediaInfo(
  mediaPath: string | null,
  mediaTitle: string | null,
@@ -283,7 +292,7 @@ export async function guessAnilistMediaInfo(
          title: buildGuessitTitle(title, alternativeTitle),
          ...(alternativeTitle ? { alternativeTitle } : {}),
          ...(year ? { year } : {}),
-          season: season ?? (canUseFallbackDetails ? fallback.season : null),
+          season: season ?? fallback.season,
          episode: episode ?? (canUseFallbackDetails ? fallback.episode : null),
          source: 'guessit',
        };
@@ -394,7 +403,8 @@ export async function updateAnilistPostWatchProgress(
  }

  const currentProgress = entry.progress ?? 0;
-  if (typeof currentProgress === 'number' && currentProgress >= episode) {
+  const shouldMarkCompleted = isKnownFinalEpisode(picked.episodes, episode);
+  if (typeof currentProgress === 'number' && currentProgress >= episode && !shouldMarkCompleted) {
    return {
      status: 'skipped',
      message: `AniList already at episode ${currentProgress} (${picked.title}).`,
@@ -404,14 +414,18 @@ export async function updateAnilistPostWatchProgress(
  const saveResponse = await anilistGraphQl<AnilistSaveEntryData>(
    accessToken,
    `
-      mutation ($mediaId: Int!, $progress: Int!) {
-        SaveMediaListEntry(mediaId: $mediaId, progress: $progress, status: CURRENT) {
+      mutation ($mediaId: Int!, $progress: Int!, $status: MediaListStatus!) {
+        SaveMediaListEntry(mediaId: $mediaId, progress: $progress, status: $status) {
          progress
          status
        }
      }
    `,
-    { mediaId: picked.id, progress: episode },
+    {
+      mediaId: picked.id,
+      progress: episode,
+      status: shouldMarkCompleted ? 'COMPLETED' : 'CURRENT',
+    },
    options,
  );
  const saveError = firstErrorMessage(saveResponse);
@@ -421,6 +435,8 @@ export async function updateAnilistPostWatchProgress(

  return {
    status: 'updated',
-    message: `AniList updated "${picked.title}" to episode ${episode}.`,
+    message: shouldMarkCompleted
+      ? `AniList updated "${picked.title}" to episode ${episode} and marked it completed.`
+      : `AniList updated "${picked.title}" to episode ${episode}.`,
  };
 }
@@ -4,6 +4,7 @@ import {
  buildHyprlandPlacementDispatches,
  ensureHyprlandWindowFloatingByTitle,
  findHyprlandWindowForPlacement,
+  hasHyprlandWindowPlacementBoundsMismatch,
  shouldAttemptHyprlandWindowPlacement,
 } from './hyprland-window-placement';

@@ -83,8 +84,8 @@ test('buildHyprlandPlacementDispatches force-aligns floating overlay windows to
      },
    ),
    [
-      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xabc'],
      ['dispatch', 'resizewindowpixel', 'exact 1920 1080,address:0xabc'],
+      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xabc'],
      ['dispatch', 'setprop', 'address:0xabc rounding 0'],
      ['dispatch', 'setprop', 'address:0xabc border_size 0'],
      ['dispatch', 'setprop', 'address:0xabc no_shadow 1'],
@@ -116,8 +117,8 @@ test('buildHyprlandPlacementDispatches emits Lua dispatchers for Lua-config Hypr
    [
      ['dispatch', 'hl.dsp.window.float({ action = "on", window = "address:0xabc" })'],
      ['dispatch', 'hl.dsp.window.pin({ action = "off", window = "address:0xabc" })'],
-      ['dispatch', 'hl.dsp.window.move({ x = 0, y = 0, window = "address:0xabc" })'],
      ['dispatch', 'hl.dsp.window.resize({ x = 1920, y = 1080, window = "address:0xabc" })'],
+      ['dispatch', 'hl.dsp.window.move({ x = 0, y = 0, window = "address:0xabc" })'],
      [
        'dispatch',
        'hl.dsp.window.set_prop({ prop = "rounding", value = "0", window = "address:0xabc" })',
@@ -177,8 +178,8 @@ test('buildHyprlandPlacementDispatches can update placement without raising z-or
      { promote: false },
    ),
    [
-      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xabc'],
      ['dispatch', 'resizewindowpixel', 'exact 1920 1080,address:0xabc'],
+      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xabc'],
      ['dispatch', 'setprop', 'address:0xabc rounding 0'],
      ['dispatch', 'setprop', 'address:0xabc border_size 0'],
      ['dispatch', 'setprop', 'address:0xabc no_shadow 1'],
@@ -286,8 +287,8 @@ test('ensureHyprlandWindowFloatingByTitle dispatches exact Hyprland geometry whe
    [
      ['-j', 'clients'],
      ['-j', 'status'],
-      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xmatch'],
      ['dispatch', 'resizewindowpixel', 'exact 1920 1080,address:0xmatch'],
+      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xmatch'],
      ['dispatch', 'setprop', 'address:0xmatch rounding 0'],
      ['dispatch', 'setprop', 'address:0xmatch border_size 0'],
      ['dispatch', 'setprop', 'address:0xmatch no_shadow 1'],
@@ -340,8 +341,8 @@ test('ensureHyprlandWindowFloatingByTitle dispatches Lua syntax for Lua-config H
    [
      ['-j', 'clients'],
      ['-j', 'status'],
-      ['dispatch', 'hl.dsp.window.move({ x = 0, y = 0, window = "address:0xmatch" })'],
      ['dispatch', 'hl.dsp.window.resize({ x = 1920, y = 1080, window = "address:0xmatch" })'],
+      ['dispatch', 'hl.dsp.window.move({ x = 0, y = 0, window = "address:0xmatch" })'],
      [
        'dispatch',
        'hl.dsp.window.set_prop({ prop = "rounding", value = "0", window = "address:0xmatch" })',
@@ -366,3 +367,97 @@ test('ensureHyprlandWindowFloatingByTitle dispatches Lua syntax for Lua-config H
    ],
  );
 });
+
+test('hasHyprlandWindowPlacementBoundsMismatch compares compositor client bounds', () => {
+  const mismatch = hasHyprlandWindowPlacementBoundsMismatch({
+    title: 'SubMiner Overlay',
+    platform: 'linux',
+    env: {
+      HYPRLAND_INSTANCE_SIGNATURE: 'abc',
+    },
+    pid: 456,
+    bounds: {
+      x: 0,
+      y: 0,
+      width: 3440,
+      height: 1440,
+    },
+    execFileSync: ((command: string, args: string[]) => {
+      assert.equal(command, 'hyprctl');
+      assert.deepEqual(args, ['-j', 'clients']);
+      return JSON.stringify([
+        {
+          address: '0xmatch',
+          pid: 456,
+          title: 'SubMiner Overlay',
+          mapped: true,
+          floating: true,
+          at: [0, 14],
+          size: [3440, 1426],
+        },
+      ]);
+    }) as never,
+  });
+
+  assert.equal(mismatch, true);
+});
+
+test('ensureHyprlandWindowFloatingByTitle retries when compositor bounds stay misaligned', () => {
+  let clientReads = 0;
+  const calls: unknown[][] = [];
+  const placed = ensureHyprlandWindowFloatingByTitle({
+    title: 'SubMiner Overlay',
+    platform: 'linux',
+    env: {
+      HYPRLAND_INSTANCE_SIGNATURE: 'abc',
+    },
+    pid: 456,
+    bounds: {
+      x: 0,
+      y: 0,
+      width: 3440,
+      height: 1440,
+    },
+    execFileSync: ((command: string, args: string[], options: unknown) => {
+      calls.push([command, args, options]);
+      if (args.join(' ') === '-j clients') {
+        clientReads += 1;
+        return JSON.stringify([
+          {
+            address: '0xmatch',
+            pid: 456,
+            title: 'SubMiner Overlay',
+            mapped: true,
+            floating: true,
+            pinned: false,
+            at: clientReads === 1 ? [10, 58] : [0, 14],
+            size: clientReads === 1 ? [3420, 1372] : [3440, 1426],
+          },
+        ]);
+      }
+      if (args.join(' ') === '-j status') {
+        return JSON.stringify({ configProvider: 'hyprlang' });
+      }
+      return '';
+    }) as never,
+  });
+
+  assert.equal(placed, true);
+  assert.equal(clientReads, 2);
+  assert.deepEqual(
+    calls
+      .map(([, args]) => args)
+      .filter(
+        (args) =>
+          Array.isArray(args) &&
+          args[0] === 'dispatch' &&
+          (args[1] === 'resizewindowpixel' || args[1] === 'movewindowpixel'),
+      ),
+    [
+      ['dispatch', 'resizewindowpixel', 'exact 3440 1440,address:0xmatch'],
+      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xmatch'],
+      ['dispatch', 'resizewindowpixel', 'exact 3440 1440,address:0xmatch'],
+      ['dispatch', 'movewindowpixel', 'exact 0 0,address:0xmatch'],
+    ],
+  );
+});
@@ -2,12 +2,14 @@ import { execFileSync } from 'node:child_process';

 export interface HyprlandPlacementClient {
  address?: string;
+  at?: [number, number];
  floating?: boolean;
  hidden?: boolean;
  initialTitle?: string;
  mapped?: boolean;
  pid?: number;
  pinned?: boolean;
+  size?: [number, number];
  title?: string;
 }

@@ -43,6 +45,10 @@ function parseHyprlandClients(output: string): HyprlandPlacementClient[] {
  return Array.isArray(parsed) ? (parsed as HyprlandPlacementClient[]) : [];
 }

+function readHyprlandPlacementClients(run: ExecFileSync): HyprlandPlacementClient[] {
+  return parseHyprlandClients(String(run('hyprctl', ['-j', 'clients'], { encoding: 'utf-8' })));
+}
+
 export function findHyprlandWindowForPlacement(
  clients: HyprlandPlacementClient[],
  options: {
@@ -96,18 +102,18 @@ export function buildHyprlandPlacementDispatches(
  const roundedBounds = roundPlacementBounds(bounds);
  if (roundedBounds) {
    if (configProvider === 'lua') {
-      dispatches.push(
-        luaWindowDispatch('move', windowAddress, [
-          `x = ${roundedBounds.x}`,
-          `y = ${roundedBounds.y}`,
-        ]),
-      );
      dispatches.push(
        luaWindowDispatch('resize', windowAddress, [
          `x = ${roundedBounds.width}`,
          `y = ${roundedBounds.height}`,
        ]),
      );
+      dispatches.push(
+        luaWindowDispatch('move', windowAddress, [
+          `x = ${roundedBounds.x}`,
+          `y = ${roundedBounds.y}`,
+        ]),
+      );
      dispatches.push(luaWindowSetProp(windowAddress, 'rounding', '0'));
      dispatches.push(luaWindowSetProp(windowAddress, 'border_size', '0'));
      dispatches.push(luaWindowSetProp(windowAddress, 'no_shadow', '1'));
@@ -116,13 +122,13 @@ export function buildHyprlandPlacementDispatches(
    } else {
      dispatches.push([
        'dispatch',
-        'movewindowpixel',
-        `exact ${roundedBounds.x} ${roundedBounds.y},${windowAddress}`,
+        'resizewindowpixel',
+        `exact ${roundedBounds.width} ${roundedBounds.height},${windowAddress}`,
      ]);
      dispatches.push([
        'dispatch',
-        'resizewindowpixel',
-        `exact ${roundedBounds.width} ${roundedBounds.height},${windowAddress}`,
+        'movewindowpixel',
+        `exact ${roundedBounds.x} ${roundedBounds.y},${windowAddress}`,
      ]);
      dispatches.push(['dispatch', 'setprop', `${windowAddress} rounding 0`]);
      dispatches.push(['dispatch', 'setprop', `${windowAddress} border_size 0`]);
@@ -181,6 +187,91 @@ function roundPlacementBounds(
    : null;
 }

+function isFiniteTuple(value: unknown): value is [number, number] {
+  return (
+    Array.isArray(value) &&
+    value.length >= 2 &&
+    typeof value[0] === 'number' &&
+    typeof value[1] === 'number' &&
+    Number.isFinite(value[0]) &&
+    Number.isFinite(value[1])
+  );
+}
+
+export function getHyprlandClientPlacementBounds(
+  client: HyprlandPlacementClient,
+): HyprlandPlacementBounds | null {
+  if (!isFiniteTuple(client.at) || !isFiniteTuple(client.size)) {
+    return null;
+  }
+
+  return roundPlacementBounds({
+    x: client.at[0],
+    y: client.at[1],
+    width: client.size[0],
+    height: client.size[1],
+  });
+}
+
+export function hyprlandPlacementBoundsMatch(
+  actual: HyprlandPlacementBounds | null,
+  target: HyprlandPlacementBounds | null,
+  tolerancePx = 1,
+): boolean {
+  const roundedActual = roundPlacementBounds(actual);
+  const roundedTarget = roundPlacementBounds(target);
+  if (!roundedActual || !roundedTarget) {
+    return false;
+  }
+
+  return (
+    Math.abs(roundedActual.x - roundedTarget.x) <= tolerancePx &&
+    Math.abs(roundedActual.y - roundedTarget.y) <= tolerancePx &&
+    Math.abs(roundedActual.width - roundedTarget.width) <= tolerancePx &&
+    Math.abs(roundedActual.height - roundedTarget.height) <= tolerancePx
+  );
+}
+
+function clientMatchesPlacementBounds(
+  client: HyprlandPlacementClient,
+  bounds: HyprlandPlacementBounds,
+): boolean | null {
+  const actual = getHyprlandClientPlacementBounds(client);
+  return actual ? hyprlandPlacementBoundsMatch(actual, bounds) : null;
+}
+
+export function hasHyprlandWindowPlacementBoundsMismatch(options: {
+  title: string;
+  bounds?: HyprlandPlacementBounds | null;
+  platform?: NodeJS.Platform;
+  env?: NodeJS.ProcessEnv;
+  pid?: number;
+  execFileSync?: ExecFileSync;
+}): boolean {
+  if (!shouldAttemptHyprlandWindowPlacement(options.platform, options.env)) {
+    return false;
+  }
+
+  const targetBounds = roundPlacementBounds(options.bounds);
+  if (!targetBounds) {
+    return false;
+  }
+
+  const run = options.execFileSync ?? execFileSync;
+  try {
+    const client = findHyprlandWindowForPlacement(readHyprlandPlacementClients(run), {
+      pid: options.pid ?? process.pid,
+      title: options.title,
+    });
+    if (!client) {
+      return false;
+    }
+    return clientMatchesPlacementBounds(client, targetBounds) === false;
+  } catch {
+    return false;
+  }
+}
+
 export function ensureHyprlandWindowFloatingByTitle(options: {
  title: string;
  bounds?: HyprlandPlacementBounds | null;
@@ -196,9 +287,7 @@ export function ensureHyprlandWindowFloatingByTitle(options: {

  const run = options.execFileSync ?? execFileSync;
  try {
-    const clients = parseHyprlandClients(
-      String(run('hyprctl', ['-j', 'clients'], { encoding: 'utf-8' })),
-    );
+    const clients = readHyprlandPlacementClients(run);
    const client = findHyprlandWindowForPlacement(clients, {
      pid: options.pid ?? process.pid,
      title: options.title,
@@ -208,6 +297,9 @@ export function ensureHyprlandWindowFloatingByTitle(options: {
    }

    const configProvider = detectHyprlandConfigProvider(run);
+    const targetBounds = roundPlacementBounds(options.bounds);
+    const shouldVerifyBounds =
+      targetBounds !== null && clientMatchesPlacementBounds(client, targetBounds) === false;
    const dispatches = buildHyprlandPlacementDispatches(client, options.bounds, {
      configProvider,
      promote: options.promote,
@@ -215,6 +307,28 @@ export function ensureHyprlandWindowFloatingByTitle(options: {
    for (const args of dispatches) {
      run('hyprctl', args, { stdio: 'ignore' });
    }
+    if (shouldVerifyBounds) {
+      try {
+        const refreshedClient = findHyprlandWindowForPlacement(readHyprlandPlacementClients(run), {
+          pid: options.pid ?? process.pid,
+          title: options.title,
+        });
+        if (
+          refreshedClient &&
+          targetBounds &&
+          clientMatchesPlacementBounds(refreshedClient, targetBounds) === false
+        ) {
+          for (const args of buildHyprlandPlacementDispatches(refreshedClient, targetBounds, {
+            configProvider,
+            promote: options.promote,
+          })) {
+            run('hyprctl', args, { stdio: 'ignore' });
+          }
+        }
+      } catch {
+        // Best-effort reconciliation: the initial placement dispatches already ran.
+      }
+    }
    return dispatches.length > 0;
  } catch {
    return false;
@@ -6,6 +6,7 @@ import path from 'node:path';
 import { toMonthKey } from './immersion-tracker/maintenance';
 import { enqueueWrite } from './immersion-tracker/queue';
 import { toDbTimestamp } from './immersion-tracker/query-shared';
+import { repairJellyfinStreamVideoLinks } from './immersion-tracker/jellyfin-link-repair';
 import { Database, type DatabaseSync } from './immersion-tracker/sqlite';
 import { nowMs as trackerNowMs } from './immersion-tracker/time';
 import {
@@ -1164,6 +1165,54 @@ test('recordSubtitleLine leaves session token counts at zero when tokenization i
  }
 });

+test('recordSubtitleLine skips invalid cue timing and still stores the later valid cue', async () => {
+  const dbPath = makeDbPath();
+  let tracker: ImmersionTrackerService | null = null;
+
+  try {
+    const Ctor = await loadTrackerCtor();
+    tracker = new Ctor({ dbPath });
+
+    tracker.handleMediaChange('/tmp/timing.mkv', 'Timing');
+    tracker.recordSubtitleLine('same subtitle', 953.991, 953.891);
+    tracker.recordSubtitleLine('same subtitle', 953.991, 956.56);
+
+    const privateApi = tracker as unknown as {
+      flushTelemetry: (force?: boolean) => void;
+      flushNow: () => void;
+    };
+    privateApi.flushTelemetry(true);
+    privateApi.flushNow();
+
+    const db = new Database(dbPath);
+    const rows = db
+      .prepare(
+        `SELECT line_index, segment_start_ms, segment_end_ms, text
+         FROM imm_subtitle_lines
+         ORDER BY line_id ASC`,
+      )
+      .all() as Array<{
+      line_index: number;
+      segment_start_ms: number | null;
+      segment_end_ms: number | null;
+      text: string;
+    }>;
+    db.close();
+
+    assert.deepEqual(rows, [
+      {
+        line_index: 1,
+        segment_start_ms: 953991,
+        segment_end_ms: 956560,
+        text: 'same subtitle',
+      },
+    ]);
+  } finally {
+    tracker?.destroy();
+    cleanupDbPath(dbPath);
+  }
+});
+
 test('subtitle-line event payload omits duplicated subtitle text', async () => {
  const dbPath = makeDbPath();
  let tracker: ImmersionTrackerService | null = null;
@@ -1470,7 +1519,7 @@ test('handleMediaChange links parsed anime metadata on the active video row', as
    assert.equal(row?.parsed_season, 2);
    assert.equal(row?.parsed_episode, 5);
    assert.ok(row?.parser_source === 'guessit' || row?.parser_source === 'fallback');
-    assert.equal(row?.anime_title, 'Little Witch Academia');
+    assert.equal(row?.anime_title, 'Little Witch Academia Season 2');
    assert.equal(row?.anilist_id, null);
  } finally {
    tracker?.destroy();
@@ -1535,13 +1584,13 @@ test('handleMediaChange reuses the same provisional anime row across matching fi
        {
          sourcePath: '/tmp/Little Witch Academia S02E05.mkv',
          parsedEpisode: 5,
-          animeTitle: 'Little Witch Academia',
+          animeTitle: 'Little Witch Academia Season 2',
          anilistId: null,
        },
        {
          sourcePath: '/tmp/Little Witch Academia S02E06.mkv',
          parsedEpisode: 6,
-          animeTitle: 'Little Witch Academia',
+          animeTitle: 'Little Witch Academia Season 2',
          anilistId: null,
        },
      ],
@@ -1552,6 +1601,351 @@ test('handleMediaChange reuses the same provisional anime row across matching fi
  }
 });

+test('handleMediaChange splits matching parsed titles across distinct seasons', async () => {
+  const dbPath = makeDbPath();
+  let tracker: ImmersionTrackerService | null = null;
+
+  try {
+    const Ctor = await loadTrackerCtor();
+    tracker = new Ctor({ dbPath });
+
+    tracker.handleMediaChange('/tmp/KonoSuba/Season 1/KonoSuba S01E05.mkv', 'Episode 5');
+    await waitForPendingAnimeMetadata(tracker);
+
+    tracker.handleMediaChange('/tmp/KonoSuba/Season 2/KonoSuba S02E05.mkv', 'Episode 5');
+    await waitForPendingAnimeMetadata(tracker);
+
+    const privateApi = tracker as unknown as {
+      db: DatabaseSync;
+    };
+    const rows = privateApi.db
+      .prepare(
+        `
+          SELECT
+            v.source_path,
+            v.anime_id,
+            v.parsed_season,
+            a.canonical_title AS anime_title,
+            a.normalized_title_key
+          FROM imm_videos v
+          LEFT JOIN imm_anime a ON a.anime_id = v.anime_id
+          WHERE v.source_path IN (?, ?)
+          ORDER BY v.source_path
+        `,
+      )
+      .all(
+        '/tmp/KonoSuba/Season 1/KonoSuba S01E05.mkv',
+        '/tmp/KonoSuba/Season 2/KonoSuba S02E05.mkv',
+      ) as Array<{
+      source_path: string | null;
+      anime_id: number | null;
+      parsed_season: number | null;
+      anime_title: string | null;
+      normalized_title_key: string | null;
+    }>;
+
+    assert.equal(rows.length, 2);
+    assert.ok(rows[0]?.anime_id);
+    assert.ok(rows[1]?.anime_id);
+    assert.notEqual(rows[0]?.anime_id, rows[1]?.anime_id);
+    assert.deepEqual(
+      rows.map((row) => ({
+        sourcePath: row.source_path,
+        parsedSeason: row.parsed_season,
+        animeTitle: row.anime_title,
+        normalizedTitleKey: row.normalized_title_key,
+      })),
+      [
+        {
+          sourcePath: '/tmp/KonoSuba/Season 1/KonoSuba S01E05.mkv',
+          parsedSeason: 1,
+          animeTitle: 'KonoSuba Season 1',
+          normalizedTitleKey: 'konosuba season 1',
+        },
+        {
+          sourcePath: '/tmp/KonoSuba/Season 2/KonoSuba S02E05.mkv',
+          parsedSeason: 2,
+          animeTitle: 'KonoSuba Season 2',
+          normalizedTitleKey: 'konosuba season 2',
+        },
+      ],
+    );
+  } finally {
+    tracker?.destroy();
+    cleanupDbPath(dbPath);
+  }
+});
+
+test('startup redistributes legacy combined anime rows across parsed seasons', async () => {
+  const dbPath = makeDbPath();
+  let tracker: ImmersionTrackerService | null = null;
+
+  try {
+    const Ctor = await loadTrackerCtor();
+    tracker = new Ctor({ dbPath });
+    const privateApi = tracker as unknown as { db: DatabaseSync };
+
+    privateApi.db.exec(`
+      INSERT INTO imm_anime (
+        anime_id,
+        normalized_title_key,
+        canonical_title,
+        anilist_id,
+        title_romaji,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES (
+        1,
+        'frieren',
+        'Frieren',
+        154587,
+        'Sousou no Frieren',
+        1000,
+        1000
+      );
+
+      INSERT INTO imm_videos (
+        video_id,
+        video_key,
+        canonical_title,
+        anime_id,
+        source_type,
+        source_path,
+        parsed_basename,
+        parsed_title,
+        parsed_season,
+        parsed_episode,
+        parser_source,
+        parser_confidence,
+        watched,
+        duration_ms,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES
+        (
+          1,
+          'local:/tmp/Frieren S01E01.mkv',
+          'Frieren S01E01',
+          1,
+          1,
+          '/tmp/Frieren S01E01.mkv',
+          'Frieren S01E01.mkv',
+          'Frieren',
+          1,
+          1,
+          'fallback',
+          0.9,
+          1,
+          0,
+          1000,
+          1000
+        ),
+        (
+          2,
+          'local:/tmp/Frieren S02E01.mkv',
+          'Frieren S02E01',
+          1,
+          1,
+          '/tmp/Frieren S02E01.mkv',
+          'Frieren S02E01.mkv',
+          'Frieren',
+          2,
+          1,
+          'fallback',
+          0.9,
+          1,
+          0,
+          1000,
+          1000
+        );
+
+      INSERT INTO imm_sessions (
+        session_id,
+        session_uuid,
+        video_id,
+        started_at_ms,
+        ended_at_ms,
+        status,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES
+        (1, 'season-repair-session-1', 1, 1000, 2000, 2, 1000, 2000),
+        (2, 'season-repair-session-2', 2, 3000, 4000, 2, 3000, 4000);
+
+      INSERT INTO imm_session_telemetry (
+        session_id,
+        sample_ms,
+        total_watched_ms,
+        active_watched_ms,
+        lines_seen,
+        tokens_seen,
+        cards_mined,
+        lookup_count,
+        lookup_hits,
+        pause_count,
+        pause_ms,
+        seek_forward_count,
+        seek_backward_count,
+        media_buffer_events
+      ) VALUES
+        (1, 2000, 1000, 1000, 1, 10, 1, 0, 0, 0, 0, 0, 0, 0),
+        (2, 4000, 2000, 2000, 2, 20, 2, 0, 0, 0, 0, 0, 0, 0);
+    `);
+
+    tracker.destroy();
+    tracker = new Ctor({ dbPath });
+    const repairedApi = tracker as unknown as { db: DatabaseSync };
+
+    const rows = repairedApi.db
+      .prepare(
+        `
+          SELECT
+            a.canonical_title AS canonicalTitle,
+            a.normalized_title_key AS normalizedTitleKey,
+            a.anilist_id AS anilistId,
+            COUNT(v.video_id) AS videoCount,
+            COALESCE(lm.total_active_ms, 0) AS totalActiveMs
+          FROM imm_anime a
+          LEFT JOIN imm_videos v ON v.anime_id = a.anime_id
+          LEFT JOIN imm_lifetime_anime lm ON lm.anime_id = a.anime_id
+          GROUP BY a.anime_id
+          ORDER BY a.canonical_title ASC
+        `,
+      )
+      .all() as Array<{
+      canonicalTitle: string;
+      normalizedTitleKey: string;
+      anilistId: number | null;
+      videoCount: number;
+      totalActiveMs: number;
+    }>;
+
+    assert.deepEqual(rows, [
+      {
+        canonicalTitle: 'Frieren Season 1',
+        normalizedTitleKey: 'frieren season 1',
+        anilistId: 154587,
+        videoCount: 1,
+        totalActiveMs: 1000,
+      },
+      {
+        canonicalTitle: 'Frieren Season 2',
+        normalizedTitleKey: 'frieren season 2',
+        anilistId: null,
+        videoCount: 1,
+        totalActiveMs: 2000,
+      },
+    ]);
+  } finally {
+    tracker?.destroy();
+    cleanupDbPath(dbPath);
+  }
+});
+
+test('startup skips single-season anime rows during legacy season repair', async () => {
+  const dbPath = makeDbPath();
+  let tracker: ImmersionTrackerService | null = null;
+
+  try {
+    const Ctor = await loadTrackerCtor();
+    tracker = new Ctor({ dbPath });
+    const privateApi = tracker as unknown as { db: DatabaseSync };
+
+    privateApi.db.exec(`
+      INSERT INTO imm_anime (
+        anime_id,
+        normalized_title_key,
+        canonical_title,
+        anilist_id,
+        title_romaji,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES (
+        1,
+        'frieren',
+        'Frieren',
+        154587,
+        'Sousou no Frieren',
+        1000,
+        1000
+      );
+
+      INSERT INTO imm_videos (
+        video_id,
+        video_key,
+        canonical_title,
+        anime_id,
+        source_type,
+        source_path,
+        parsed_basename,
+        parsed_title,
+        parsed_season,
+        parsed_episode,
+        parser_source,
+        parser_confidence,
+        watched,
+        duration_ms,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES (
+        1,
+        'local:/tmp/Frieren S01E01.mkv',
+        'Frieren S01E01',
+        1,
+        1,
+        '/tmp/Frieren S01E01.mkv',
+        'Frieren S01E01.mkv',
+        'Frieren',
+        1,
+        1,
+        'fallback',
+        0.9,
+        1,
+        0,
+        1000,
+        1000
+      );
+    `);
+
+    tracker.destroy();
+    tracker = new Ctor({ dbPath });
+    const repairedApi = tracker as unknown as { db: DatabaseSync };
+
+    const rows = repairedApi.db
+      .prepare(
+        `
+          SELECT
+            a.canonical_title AS canonicalTitle,
+            a.normalized_title_key AS normalizedTitleKey,
+            a.anilist_id AS anilistId,
+            COUNT(v.video_id) AS videoCount
+          FROM imm_anime a
+          LEFT JOIN imm_videos v ON v.anime_id = a.anime_id
+          GROUP BY a.anime_id
+          ORDER BY a.anime_id ASC
+        `,
+      )
+      .all() as Array<{
+      canonicalTitle: string;
+      normalizedTitleKey: string;
+      anilistId: number | null;
+      videoCount: number;
+    }>;
+
+    assert.deepEqual(rows, [
+      {
+        canonicalTitle: 'Frieren',
+        normalizedTitleKey: 'frieren',
+        anilistId: 154587,
+        videoCount: 1,
+      },
+    ]);
+  } finally {
+    tracker?.destroy();
+    cleanupDbPath(dbPath);
+  }
+});
+
 test('Jellyfin playback metadata links stream videos to existing series title', async () => {
  const dbPath = makeDbPath();
  let tracker: ImmersionTrackerService | null = null;
@@ -1595,8 +1989,41 @@ test('Jellyfin playback metadata links stream videos to existing series title',
      'http://jellyfin.local/Videos/item-2/stream?static=true&api_key=token&MediaSourceId=ms-1&StartTimeTicks=12000000',
      'The Beginning After the End S02E02 The Princess Begins Adventuring',
    );
+    tracker.handleMediaChange(null, null);
+    tracker.recordJellyfinPlaybackMetadata({
+      mediaPath:
+        'http://jellyfin.local/Videos/item-3/stream?static=true&api_key=token&MediaSourceId=ms-2',
+      displayTitle: 'The Beginning After the End S02E03 Dragon Has Left the Building',
+      itemTitle: 'Dragon Has Left the Building',
+      seriesTitle: 'The Beginning After the End',
+      seasonNumber: 2,
+      episodeNumber: 3,
+      itemId: 'item-3',
+    });
+    tracker.handleMediaChange(
+      'http://jellyfin.local/Videos/item-3/stream?static=true&api_key=token&MediaSourceId=ms-2&AudioStreamIndex=3&SubtitleStreamIndex=4',
+      'The Beginning After the End S02E03 Dragon Has Left the Building',
+    );
+    await waitForPendingAnimeMetadata(tracker);

    const privateApi = tracker as unknown as { db: DatabaseSync };
+    const videoRows = privateApi.db
+      .prepare(
+        `
+          SELECT source_url, canonical_title AS video_title
+          FROM imm_videos
+          ORDER BY video_id
+        `,
+      )
+      .all() as Array<{ source_url: string | null; video_title: string }>;
+    assert.equal(videoRows.length, 3);
+    assert.equal(
+      videoRows.some(
+        (row) => row.source_url?.includes('api_key=') || row.video_title.includes('api_key='),
+      ),
+      false,
+    );
+
    const rows = privateApi.db
      .prepare(
        `
@@ -1623,7 +2050,7 @@ test('Jellyfin playback metadata links stream videos to existing series title',
      anime_title: string;
    }>;

-    assert.equal(rows.length, 2);
+    assert.equal(rows.length, 3);
    assert.equal(new Set(rows.map((row) => row.anime_title)).size, 1);
    const jellyfinRow = rows.find(
      (row) => row.source_url === 'jellyfin://jellyfin.local/item/item-2',
@@ -1637,7 +2064,250 @@ test('Jellyfin playback metadata links stream videos to existing series title',
    assert.equal(jellyfinRow.parsed_season, 2);
    assert.equal(jellyfinRow.parsed_episode, 2);
    assert.equal(jellyfinRow.parser_source, 'jellyfin');
-    assert.equal(jellyfinRow.anime_title, 'The Beginning After the End');
+    assert.equal(jellyfinRow.anime_title, 'The Beginning After the End Season 2');
+    const streamVariantRow = rows.find(
+      (row) => row.source_url === 'jellyfin://jellyfin.local/item/item-3',
+    );
+    assert.ok(streamVariantRow);
+    assert.equal(
+      streamVariantRow.video_title,
+      'The Beginning After the End S02E03 Dragon Has Left the Building',
+    );
+    assert.equal(streamVariantRow.source_url?.includes('api_key='), false);
+    assert.equal(streamVariantRow.video_title.includes('api_key='), false);
+    assert.equal(streamVariantRow.video_title.includes('stream?'), false);
+    assert.equal(streamVariantRow.parsed_title, 'The Beginning After the End');
+    assert.equal(streamVariantRow.parsed_season, 2);
+    assert.equal(streamVariantRow.parsed_episode, 3);
+    assert.equal(streamVariantRow.parser_source, 'jellyfin');
+    assert.equal(streamVariantRow.anime_title, 'The Beginning After the End Season 2');
+  } finally {
+    tracker?.destroy();
+    cleanupDbPath(dbPath);
+  }
+});
+
+test('startup repairs existing Jellyfin stream video links to metadata rows', async () => {
+  const dbPath = makeDbPath();
+  let tracker: ImmersionTrackerService | null = null;
+
+  try {
+    const Ctor = await loadTrackerCtor();
+    tracker = new Ctor({ dbPath });
+    const streamUrl =
+      'http://jellyfin.local/Videos/item-9/stream?static=true&api_key=secret-token&MediaSourceId=ms-1&AudioStreamIndex=3&SubtitleStreamIndex=4';
+    tracker.handleMediaChange(
+      streamUrl,
+      'stream?static=true&api_key=secret-token&MediaSourceId=ms-1&AudioStreamIndex=3&SubtitleStreamIndex=4',
+    );
+    tracker.handleMediaChange(null, null);
+    const titledStreamUrl =
+      'http://jellyfin.local/Videos/item-10/stream?static=true&api_key=secret-token&MediaSourceId=ms-2';
+    tracker.handleMediaChange(titledStreamUrl, 'KonoSuba S01E06 Decision! Class Rep');
+    tracker.handleMediaChange(null, null);
+    tracker.recordJellyfinPlaybackMetadata({
+      mediaPath: 'http://jellyfin.local/Videos/item-9/stream?static=true&api_key=secret-token',
+      displayTitle: 'Frieren S01E09 Aura the Guillotine',
+      itemTitle: 'Aura the Guillotine',
+      seriesTitle: 'Frieren',
+      seasonNumber: 1,
+      episodeNumber: 9,
+      itemId: 'item-9',
+    });
+    tracker.destroy();
+    tracker = null;
+
+    tracker = new Ctor({ dbPath });
+
+    const privateApi = tracker as unknown as { db: DatabaseSync };
+    const videoRows = privateApi.db
+      .prepare(
+        `
+          SELECT
+            video_id,
+            video_key,
+            source_url,
+            canonical_title,
+            parser_source,
+            parsed_basename,
+            parsed_title,
+            parse_metadata_json
+          FROM imm_videos
+          ORDER BY video_id
+        `,
+      )
+      .all() as Array<{
+      video_id: number;
+      video_key: string;
+      source_url: string | null;
+      canonical_title: string;
+      parser_source: string | null;
+      parsed_basename: string | null;
+      parsed_title: string | null;
+      parse_metadata_json: string | null;
+    }>;
+    assert.equal(videoRows.length, 3);
+    const frierenRows = videoRows.filter(
+      (row) => row.source_url === 'jellyfin://jellyfin.local/item/item-9',
+    );
+    assert.equal(frierenRows.length, 2);
+    for (const row of frierenRows) {
+      assert.equal(row.source_url, 'jellyfin://jellyfin.local/item/item-9');
+      assert.equal(row.canonical_title, 'Frieren S01E09 Aura the Guillotine');
+      assert.equal(row.parser_source, 'jellyfin');
+      assert.equal(row.video_key.includes('api_key='), false);
+      assert.equal(row.source_url?.includes('api_key='), false);
+      assert.equal(row.canonical_title.includes('api_key='), false);
+    }
+    const titledRow = videoRows.find(
+      (row) => row.source_url === 'jellyfin://jellyfin.local/item/item-10',
+    );
+    assert.ok(titledRow);
+    assert.equal(titledRow.canonical_title, 'KonoSuba S01E06 Decision! Class Rep');
+    assert.equal(titledRow.video_key.includes('api_key='), false);
+    assert.equal(titledRow.source_url?.includes('api_key='), false);
+    assert.equal(JSON.stringify(videoRows).includes('api_key='), false);
+    assert.equal(JSON.stringify(videoRows).includes('secret-token'), false);
+
+    const animeRows = privateApi.db
+      .prepare(
+        `
+          SELECT canonical_title, normalized_title_key
+          FROM imm_anime
+          ORDER BY anime_id
+        `,
+      )
+      .all() as Array<{ canonical_title: string; normalized_title_key: string }>;
+    assert.equal(JSON.stringify(animeRows).includes('api_key='), false);
+    assert.equal(JSON.stringify(animeRows).includes('api key'), false);
+    assert.equal(JSON.stringify(animeRows).includes('secret-token'), false);
+
+    const sessionRows = privateApi.db
+      .prepare(
+        `
+          SELECT v.source_url, v.canonical_title
+          FROM imm_sessions s
+          JOIN imm_videos v ON v.video_id = s.video_id
+          ORDER BY s.session_id
+        `,
+      )
+      .all() as Array<{ source_url: string | null; canonical_title: string }>;
+    assert.deepEqual(
+      sessionRows.map((row) => row.canonical_title),
+      ['Frieren S01E09 Aura the Guillotine', 'KonoSuba S01E06 Decision! Class Rep'],
+    );
+    assert.equal(
+      sessionRows.some((row) => row.source_url?.includes('api_key=')),
+      false,
+    );
+  } finally {
+    tracker?.destroy();
+    cleanupDbPath(dbPath);
+  }
+});
+
+test('Jellyfin link repair removes merged leaked anime rows and sanitizes orphan video titles', async () => {
+  const dbPath = makeDbPath();
+  let tracker: ImmersionTrackerService | null = null;
+
+  try {
+    const Ctor = await loadTrackerCtor();
+    tracker = new Ctor({ dbPath });
+    const privateApi = tracker as unknown as { db: DatabaseSync };
+    const db = privateApi.db;
+    const timestamp = toDbTimestamp(trackerNowMs());
+    const leakedTitle =
+      'http://jellyfin.local/Videos/item-20/stream?static=true&api_key=secret-token&MediaSourceId=ms-1';
+    const orphanLeakedTitle =
+      'http://jellyfin.local/Videos/item-21/stream?static=true&api_key=secret-token&MediaSourceId=ms-2&AudioStreamIndex=3';
+
+    const existingAnime = db
+      .prepare(
+        `
+          INSERT INTO imm_anime (
+            normalized_title_key,
+            canonical_title,
+            CREATED_DATE,
+            LAST_UPDATE_DATE
+          )
+          VALUES ('frieren', 'Frieren', ?, ?)
+          RETURNING anime_id
+        `,
+      )
+      .get(timestamp, timestamp) as { anime_id: number };
+    const leakedAnime = db
+      .prepare(
+        `
+          INSERT INTO imm_anime (
+            normalized_title_key,
+            canonical_title,
+            CREATED_DATE,
+            LAST_UPDATE_DATE
+          )
+          VALUES ('http jellyfin local videos item 20 stream static true api key secret token mediasourceid ms 1', ?, ?, ?)
+          RETURNING anime_id
+        `,
+      )
+      .get(leakedTitle, timestamp, timestamp) as { anime_id: number };
+
+    db.prepare(
+      `
+        INSERT INTO imm_videos (
+          video_key,
+          anime_id,
+          canonical_title,
+          source_type,
+          source_url,
+          duration_ms,
+          CREATED_DATE,
+          LAST_UPDATE_DATE
+        )
+        VALUES (?, ?, 'Frieren', 2, ?, 0, ?, ?)
+      `,
+    ).run(`remote:${leakedTitle}`, leakedAnime.anime_id, leakedTitle, timestamp, timestamp);
+    db.prepare(
+      `
+        INSERT INTO imm_videos (
+          video_key,
+          anime_id,
+          canonical_title,
+          source_type,
+          source_url,
+          duration_ms,
+          CREATED_DATE,
+          LAST_UPDATE_DATE
+        )
+        VALUES (?, NULL, ?, 2, ?, 0, ?, ?)
+      `,
+    ).run(
+      `remote:${orphanLeakedTitle}`,
+      orphanLeakedTitle,
+      orphanLeakedTitle,
+      timestamp,
+      timestamp,
+    );
+
+    const summary = repairJellyfinStreamVideoLinks(db);
+
+    assert.equal(summary.repaired, 3);
+    const leakedAnimeRow = db
+      .prepare('SELECT anime_id FROM imm_anime WHERE anime_id = ?')
+      .get(leakedAnime.anime_id);
+    assert.equal(leakedAnimeRow, undefined);
+    const reparentedCount = db
+      .prepare('SELECT COUNT(*) AS count FROM imm_videos WHERE anime_id = ?')
+      .get(existingAnime.anime_id) as { count: number };
+    assert.equal(reparentedCount.count, 1);
+    const orphanVideo = db
+      .prepare(
+        `
+          SELECT canonical_title
+          FROM imm_videos
+          WHERE source_url = 'jellyfin://jellyfin.local/item/item-21'
+        `,
+      )
+      .get() as { canonical_title: string };
+    assert.equal(orphanVideo.canonical_title, 'Jellyfin Video');
  } finally {
    tracker?.destroy();
    cleanupDbPath(dbPath);
@@ -2447,6 +3117,216 @@ test('reassignAnimeAnilist preserves existing description when description is om
  }
 });

+test('reassignAnimeAnilist redistributes conflicting legacy combined row before assigning AniList id', async () => {
+  const dbPath = makeDbPath();
+  let tracker: ImmersionTrackerService | null = null;
+
+  try {
+    const Ctor = await loadTrackerCtor();
+    tracker = new Ctor({ dbPath });
+    const privateApi = tracker as unknown as { db: DatabaseSync };
+
+    privateApi.db.exec(`
+      INSERT INTO imm_anime (
+        anime_id,
+        normalized_title_key,
+        canonical_title,
+        anilist_id,
+        title_romaji,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES
+        (
+          1,
+          'konosuba',
+          'KonoSuba',
+          21202,
+          'Kono Subarashii Sekai ni Shukufuku wo!',
+          1000,
+          1000
+        ),
+        (
+          2,
+          'konosuba season 1',
+          'KonoSuba Season 1',
+          NULL,
+          NULL,
+          1000,
+          1000
+        );
+
+      INSERT INTO imm_videos (
+        video_id,
+        video_key,
+        canonical_title,
+        anime_id,
+        source_type,
+        source_path,
+        parsed_basename,
+        parsed_title,
+        parsed_season,
+        parsed_episode,
+        parser_source,
+        parser_confidence,
+        watched,
+        duration_ms,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES
+        (
+          1,
+          'local:/tmp/KonoSuba S01E01.mkv',
+          'KonoSuba S01E01',
+          1,
+          1,
+          '/tmp/KonoSuba S01E01.mkv',
+          'KonoSuba S01E01.mkv',
+          'KonoSuba',
+          1,
+          1,
+          'fallback',
+          0.9,
+          1,
+          0,
+          1000,
+          1000
+        ),
+        (
+          2,
+          'local:/tmp/KonoSuba S02E01.mkv',
+          'KonoSuba S02E01',
+          1,
+          1,
+          '/tmp/KonoSuba S02E01.mkv',
+          'KonoSuba S02E01.mkv',
+          'KonoSuba',
+          2,
+          1,
+          'fallback',
+          0.9,
+          1,
+          0,
+          1000,
+          1000
+        ),
+        (
+          3,
+          'local:/tmp/KonoSuba S01E02.mkv',
+          'KonoSuba S01E02',
+          2,
+          1,
+          '/tmp/KonoSuba S01E02.mkv',
+          'KonoSuba S01E02.mkv',
+          'KonoSuba',
+          1,
+          2,
+          'fallback',
+          0.9,
+          1,
+          0,
+          1000,
+          1000
+        );
+
+      INSERT INTO imm_sessions (
+        session_id,
+        session_uuid,
+        video_id,
+        started_at_ms,
+        ended_at_ms,
+        status,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES
+        (1, 'anilist-conflict-session-1', 1, 1000, 2000, 2, 1000, 2000),
+        (2, 'anilist-conflict-session-2', 2, 3000, 4000, 2, 3000, 4000),
+        (3, 'anilist-conflict-session-3', 3, 5000, 6000, 2, 5000, 6000);
+
+      INSERT INTO imm_subtitle_lines (
+        session_id,
+        video_id,
+        anime_id,
+        line_index,
+        text,
+        CREATED_DATE,
+        LAST_UPDATE_DATE
+      ) VALUES
+        (1, 1, 1, 0, 'season one legacy line', 1000, 1000),
+        (2, 2, 1, 0, 'season two legacy line', 1000, 1000);
+
+      INSERT INTO imm_session_telemetry (
+        session_id,
+        sample_ms,
+        total_watched_ms,
+        active_watched_ms,
+        lines_seen,
+        tokens_seen,
+        cards_mined,
+        lookup_count,
+        lookup_hits,
+        pause_count,
+        pause_ms,
+        seek_forward_count,
+        seek_backward_count,
+        media_buffer_events
+      ) VALUES
+        (1, 2000, 1000, 1000, 1, 10, 0, 0, 0, 0, 0, 0, 0, 0),
+        (2, 4000, 2000, 2000, 2, 20, 0, 0, 0, 0, 0, 0, 0, 0),
+        (3, 6000, 3000, 3000, 3, 30, 0, 0, 0, 0, 0, 0, 0, 0);
+    `);
+
+    await tracker.reassignAnimeAnilist(2, {
+      anilistId: 21202,
+      titleRomaji: 'Kono Subarashii Sekai ni Shukufuku wo!',
+    });
+
+    const rows = privateApi.db
+      .prepare(
+        `
+          SELECT
+            a.canonical_title AS canonicalTitle,
+            a.anilist_id AS anilistId,
+            COUNT(DISTINCT v.video_id) AS videoCount,
+            COUNT(DISTINCT sl.line_id) AS subtitleLineCount,
+            COALESCE(lm.total_active_ms, 0) AS totalActiveMs
+          FROM imm_anime a
+          LEFT JOIN imm_videos v ON v.anime_id = a.anime_id
+          LEFT JOIN imm_subtitle_lines sl ON sl.anime_id = a.anime_id
+          LEFT JOIN imm_lifetime_anime lm ON lm.anime_id = a.anime_id
+          GROUP BY a.anime_id
+          ORDER BY a.canonical_title ASC
+        `,
+      )
+      .all() as Array<{
+      canonicalTitle: string;
+      anilistId: number | null;
+      videoCount: number;
+      subtitleLineCount: number;
+      totalActiveMs: number;
+    }>;
+
+    assert.deepEqual(rows, [
+      {
+        canonicalTitle: 'KonoSuba Season 1',
+        anilistId: 21202,
+        videoCount: 2,
+        subtitleLineCount: 1,
+        totalActiveMs: 4000,
+      },
+      {
+        canonicalTitle: 'KonoSuba Season 2',
+        anilistId: null,
+        videoCount: 1,
+        subtitleLineCount: 1,
+        totalActiveMs: 2000,
+      },
+    ]);
+  } finally {
+    tracker?.destroy();
+    cleanupDbPath(dbPath);
+  }
+});
+
 test('handleMediaChange stores youtube metadata for new youtube sessions', async () => {
  const dbPath = makeDbPath();
  let tracker: ImmersionTrackerService | null = null;
@@ -55,6 +55,7 @@ import {
  getStatsExcludedWords,
  getVocabularyStats,
  replaceStatsExcludedWords,
+  searchSubtitleSentences,
  getWordAnimeAppearances,
  getWordDetail,
  getWordOccurrences,
@@ -89,6 +90,11 @@ import {
  markVideoWatched,
  upsertCoverArt,
 } from './immersion-tracker/query-maintenance';
+import { repairJellyfinStreamVideoLinks } from './immersion-tracker/jellyfin-link-repair';
+import {
+  repairLegacySeasonlessAnimeRows,
+  resolveAnimeAnilistConflict,
+} from './immersion-tracker/anime-season-repair';
 import {
  buildVideoKey,
  deriveCanonicalTitle,
@@ -148,6 +154,8 @@ import {
  type MediaLibraryRow,
  type NewAnimePerDayRow,
  type QueuedWrite,
+  type SentenceSearchOptions,
+  type SentenceSearchResultRow,
  type SessionEventRow,
  type SessionState,
  type SessionSummaryQueryRow,
@@ -328,6 +336,34 @@ function buildJellyfinStatsMediaPath(mediaPath: string, itemId: string): string
  }
 }

+const JELLYFIN_MEDIA_ALIAS_QUERY_KEYS = [
+  'api_key',
+  'StartTimeTicks',
+  'AudioStreamIndex',
+  'SubtitleStreamIndex',
+];
+
+function deleteSearchParamsCaseInsensitive(searchParams: URLSearchParams, names: string[]): void {
+  const loweredNames = new Set(names.map((name) => name.toLowerCase()));
+  for (const key of [...searchParams.keys()]) {
+    if (loweredNames.has(key.toLowerCase())) {
+      searchParams.delete(key);
+    }
+  }
+}
+
+function buildJellyfinMediaPathAliasCandidates(mediaPath: string): string[] {
+  const candidates = new Set<string>([mediaPath]);
+  try {
+    const parsed = new URL(mediaPath);
+    deleteSearchParamsCaseInsensitive(parsed.searchParams, JELLYFIN_MEDIA_ALIAS_QUERY_KEYS);
+    candidates.add(parsed.toString());
+  } catch {
+    // Non-URL fallback paths are already represented by the raw candidate.
+  }
+  return [...candidates];
+}
+
 export class ImmersionTrackerService {
  private readonly logger = createLogger('main:immersion-tracker');
  private readonly db: DatabaseSync;
@@ -437,6 +473,19 @@ export class ImmersionTrackerService {
        `Recovered stale active sessions on startup: reconciledSessions=${reconciledSessions}`,
      );
    }
+    const jellyfinRepair = repairJellyfinStreamVideoLinks(this.db);
+    if (jellyfinRepair.repaired > 0) {
+      this.logger.info(
+        `Repaired Jellyfin stats links on startup: scanned=${jellyfinRepair.scanned} repaired=${jellyfinRepair.repaired}`,
+      );
+    }
+    const seasonRepair = repairLegacySeasonlessAnimeRows(this.db);
+    if (seasonRepair.movedVideos > 0 || seasonRepair.deletedAnimeRows > 0) {
+      this.logger.info(
+        `Repaired season-scoped stats links on startup: scanned=${seasonRepair.scanned} movedVideos=${seasonRepair.movedVideos} deletedAnimeRows=${seasonRepair.deletedAnimeRows}`,
+      );
+      rebuildLifetimeSummaryTables(this.db);
+    }
    if (shouldBackfillLifetimeSummaries(this.db)) {
      const result = rebuildLifetimeSummaryTables(this.db);
      if (result.appliedSessions > 0) {
@@ -568,6 +617,14 @@ export class ImmersionTrackerService {
    return getKanjiOccurrences(this.db, kanji, limit, offset);
  }

+  async searchSubtitleSentences(
+    query: string,
+    limit = 50,
+    options?: SentenceSearchOptions,
+  ): Promise<SentenceSearchResultRow[]> {
+    return searchSubtitleSentences(this.db, query, limit, options);
+  }
+
  async getSessionEvents(
    sessionId: number,
    limit = 500,
@@ -687,6 +744,7 @@ export class ImmersionTrackerService {
      coverUrl?: string | null;
    },
  ): Promise<void> {
+    const repair = resolveAnimeAnilistConflict(this.db, animeId, info.anilistId);
    this.db
      .prepare(
        `
@@ -712,6 +770,9 @@ export class ImmersionTrackerService {
        nowMs(),
        animeId,
      );
+    if (repair.movedVideos > 0 || repair.deletedAnimeRows > 0) {
+      rebuildLifetimeSummaryTables(this.db);
+    }

    // Update cover art for all videos in this anime
    if (info.coverUrl) {
@@ -1149,7 +1210,9 @@ export class ImmersionTrackerService {
      return;
    }
    const normalizedPath = buildJellyfinStatsMediaPath(rawPath, metadata.itemId);
-    this.mediaPathAliases.set(rawPath, normalizedPath);
+    for (const alias of buildJellyfinMediaPathAliasCandidates(rawPath)) {
+      this.mediaPathAliases.set(alias, normalizedPath);
+    }

    const displayTitle =
      normalizeText(metadata.displayTitle) ||
@@ -1158,6 +1221,8 @@ export class ImmersionTrackerService {
    const itemTitle = normalizeText(metadata.itemTitle) || displayTitle;
    const seriesTitle = normalizeText(metadata.seriesTitle);
    const libraryTitle = seriesTitle || itemTitle;
+    const seasonNumber = normalizeMetadataInt(metadata.seasonNumber);
+    const episodeNumber = normalizeMetadataInt(metadata.episodeNumber);
    if (!libraryTitle) {
      return;
    }
@@ -1181,12 +1246,13 @@ export class ImmersionTrackerService {
      itemTitle,
      seriesTitle: seriesTitle || null,
      displayTitle,
-      seasonNumber: normalizeMetadataInt(metadata.seasonNumber),
-      episodeNumber: normalizeMetadataInt(metadata.episodeNumber),
+      seasonNumber,
+      episodeNumber,
    });
    const animeId = getOrCreateAnimeRecord(this.db, {
      parsedTitle: libraryTitle,
      canonicalTitle: libraryTitle,
+      seasonScope: seasonNumber,
      anilistId: null,
      titleRomaji: null,
      titleEnglish: null,
@@ -1197,8 +1263,8 @@ export class ImmersionTrackerService {
      animeId,
      parsedBasename: null,
      parsedTitle: libraryTitle,
-      parsedSeason: normalizeMetadataInt(metadata.seasonNumber),
-      parsedEpisode: normalizeMetadataInt(metadata.episodeNumber),
+      parsedSeason: seasonNumber,
+      parsedEpisode: episodeNumber,
      parserSource: 'jellyfin',
      parserConfidence: 1,
      parseMetadataJson: metadataJson,
@@ -1221,7 +1287,10 @@ export class ImmersionTrackerService {

  handleMediaChange(mediaPath: string | null, mediaTitle: string | null): void {
    const rawPath = normalizeMediaPath(mediaPath);
-    const normalizedPath = this.mediaPathAliases.get(rawPath) ?? rawPath;
+    const normalizedPath =
+      buildJellyfinMediaPathAliasCandidates(rawPath)
+        .map((alias) => this.mediaPathAliases.get(alias))
+        .find((alias): alias is string => Boolean(alias)) ?? rawPath;
    const normalizedTitle = normalizeText(mediaTitle);
    this.logger.info(
      `handleMediaChange called with path=${normalizedPath || '<empty>'} title=${normalizedTitle || '<empty>'}`,
@@ -1294,7 +1363,7 @@ export class ImmersionTrackerService {
    const cleaned = normalizeText(text);
    if (!cleaned) return;

-    if (!endSec || endSec <= 0) {
+    if (!Number.isFinite(startSec) || !Number.isFinite(endSec) || endSec <= startSec) {
      return;
    }

@@ -1826,6 +1895,7 @@ export class ImmersionTrackerService {
        const animeId = getOrCreateAnimeRecord(this.db, {
          parsedTitle: parsed.parsedTitle,
          canonicalTitle: parsed.parsedTitle,
+          seasonScope: parsed.parsedSeason,
          anilistId: null,
          titleRomaji: null,
          titleEnglish: null,
@@ -0,0 +1,18 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import test from 'node:test';
+
+test('getRollupGroupsForSessions uses only localtime rollup keys', () => {
+  const source = fs.readFileSync(
+    path.join(process.cwd(), 'src/core/services/immersion-tracker/maintenance.ts'),
+    'utf8',
+  );
+  const start = source.indexOf('export function getRollupGroupsForSessions');
+  const end = source.indexOf('export function refreshRollupsForGroupsInTransaction');
+  const functionSource = source.slice(start, end);
+
+  assert.match(functionSource, /'unixepoch', 'localtime'/);
+  assert.doesNotMatch(functionSource, /UNION/);
+  assert.doesNotMatch(functionSource, /86400000/);
+});
@@ -356,6 +356,81 @@ test('split session and lexical helpers return distinct-headword, detail, appear
  }
 });

+test('similar words use same reading and shared kanji without kana suffix noise', () => {
+  const { db, dbPath, stmts } = createDb();
+
+  try {
+    const animeId = getOrCreateAnimeRecord(db, {
+      parsedTitle: 'Similar Words Anime',
+      canonicalTitle: 'Similar Words Anime',
+      anilistId: null,
+      titleRomaji: null,
+      titleEnglish: null,
+      titleNative: null,
+      metadataJson: null,
+    });
+    const videoId = getOrCreateVideoRecord(db, 'local:/tmp/similar-words.mkv', {
+      canonicalTitle: 'Similar Words Episode',
+      sourcePath: '/tmp/similar-words.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+    const sessionId = startSessionRecord(db, videoId, 1_000_000).sessionId;
+
+    const araiId = insertWordOccurrence(db, stmts, {
+      sessionId,
+      videoId,
+      animeId,
+      lineIndex: 1,
+      text: '荒い息',
+      word: { headword: '荒い', word: '荒い', reading: 'あらい' },
+    });
+    insertWordOccurrence(db, stmts, {
+      sessionId,
+      videoId,
+      animeId,
+      lineIndex: 2,
+      text: '洗い物',
+      word: { headword: '洗い', word: '洗い', reading: 'あらい' },
+    });
+    insertWordOccurrence(db, stmts, {
+      sessionId,
+      videoId,
+      animeId,
+      lineIndex: 3,
+      text: '荒波',
+      word: { headword: '荒波', word: '荒波', reading: 'あらなみ' },
+    });
+
+    for (let lineIndex = 4; lineIndex < 9; lineIndex++) {
+      insertWordOccurrence(db, stmts, {
+        sessionId,
+        videoId,
+        animeId,
+        lineIndex,
+        text: '良い',
+        word: { headword: '良い', word: '良い', reading: 'よい' },
+      });
+    }
+    insertWordOccurrence(db, stmts, {
+      sessionId,
+      videoId,
+      animeId,
+      lineIndex: 9,
+      text: 'お構いなく',
+      word: { headword: 'お構いなく', word: 'お構いなく', reading: 'おかまいなく' },
+    });
+
+    assert.deepEqual(
+      getSimilarWords(db, araiId, 10).map((row) => row.headword),
+      ['洗い', '荒波'],
+    );
+  } finally {
+    db.close();
+    cleanupDbPath(dbPath);
+  }
+});
+
 test('split library helpers return anime/media session and analytics rows', () => {
  const { db, dbPath, stmts } = createDb();

@@ -605,6 +680,189 @@ test('split maintenance helpers update anime metadata and watched state', () =>
  }
 });

+test('updateAnimeAnilistInfo redistributes legacy combined row before assigning duplicate AniList id', () => {
+  const { db, dbPath } = createDb();
+
+  try {
+    const legacyAnimeId = getOrCreateAnimeRecord(db, {
+      parsedTitle: 'KonoSuba',
+      canonicalTitle: 'KonoSuba',
+      anilistId: 21202,
+      titleRomaji: 'Kono Subarashii Sekai ni Shukufuku wo!',
+      titleEnglish: null,
+      titleNative: null,
+      metadataJson: null,
+    });
+    const seasonAnimeId = getOrCreateAnimeRecord(db, {
+      parsedTitle: 'KonoSuba',
+      canonicalTitle: 'KonoSuba',
+      seasonScope: 1,
+      anilistId: null,
+      titleRomaji: null,
+      titleEnglish: null,
+      titleNative: null,
+      metadataJson: null,
+    });
+    const legacySeasonOneVideoId = getOrCreateVideoRecord(db, 'local:/tmp/konosuba-s01e01.mkv', {
+      canonicalTitle: 'KonoSuba S01E01',
+      sourcePath: '/tmp/konosuba-s01e01.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+    const legacySeasonTwoVideoId = getOrCreateVideoRecord(db, 'local:/tmp/konosuba-s02e01.mkv', {
+      canonicalTitle: 'KonoSuba S02E01',
+      sourcePath: '/tmp/konosuba-s02e01.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+    const targetVideoId = getOrCreateVideoRecord(db, 'local:/tmp/konosuba-s01e02.mkv', {
+      canonicalTitle: 'KonoSuba S01E02',
+      sourcePath: '/tmp/konosuba-s01e02.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+
+    linkVideoToAnimeRecord(db, legacySeasonOneVideoId, {
+      animeId: legacyAnimeId,
+      parsedBasename: 'konosuba-s01e01.mkv',
+      parsedTitle: 'KonoSuba',
+      parsedSeason: 1,
+      parsedEpisode: 1,
+      parserSource: 'test',
+      parserConfidence: 1,
+      parseMetadataJson: null,
+    });
+    linkVideoToAnimeRecord(db, legacySeasonTwoVideoId, {
+      animeId: legacyAnimeId,
+      parsedBasename: 'konosuba-s02e01.mkv',
+      parsedTitle: 'KonoSuba',
+      parsedSeason: 2,
+      parsedEpisode: 1,
+      parserSource: 'test',
+      parserConfidence: 1,
+      parseMetadataJson: null,
+    });
+    linkVideoToAnimeRecord(db, targetVideoId, {
+      animeId: seasonAnimeId,
+      parsedBasename: 'konosuba-s01e02.mkv',
+      parsedTitle: 'KonoSuba',
+      parsedSeason: 1,
+      parsedEpisode: 2,
+      parserSource: 'test',
+      parserConfidence: 1,
+      parseMetadataJson: null,
+    });
+
+    updateAnimeAnilistInfo(db, targetVideoId, {
+      anilistId: 21202,
+      titleRomaji: 'Kono Subarashii Sekai ni Shukufuku wo!',
+      titleEnglish: null,
+      titleNative: null,
+      episodesTotal: 10,
+    });
+
+    const rows = db
+      .prepare(
+        `
+          SELECT
+            a.canonical_title AS canonicalTitle,
+            a.anilist_id AS anilistId,
+            COUNT(v.video_id) AS videoCount
+          FROM imm_anime a
+          LEFT JOIN imm_videos v ON v.anime_id = a.anime_id
+          GROUP BY a.anime_id
+          ORDER BY a.canonical_title ASC
+        `,
+      )
+      .all() as Array<{
+      canonicalTitle: string;
+      anilistId: number | null;
+      videoCount: number;
+    }>;
+
+    assert.deepEqual(rows, [
+      { canonicalTitle: 'KonoSuba Season 1', anilistId: 21202, videoCount: 2 },
+      { canonicalTitle: 'KonoSuba Season 2', anilistId: null, videoCount: 1 },
+    ]);
+  } finally {
+    db.close();
+    cleanupDbPath(dbPath);
+  }
+});
+
+test('deleteSessions refreshes only rollups affected by deleted sessions', () => {
+  const { db, dbPath } = createDb();
+
+  try {
+    const keepVideoId = getOrCreateVideoRecord(db, 'local:/tmp/rollup-keep.mkv', {
+      canonicalTitle: 'Rollup Keep',
+      sourcePath: '/tmp/rollup-keep.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+    const dropVideoId = getOrCreateVideoRecord(db, 'local:/tmp/rollup-drop.mkv', {
+      canonicalTitle: 'Rollup Drop',
+      sourcePath: '/tmp/rollup-drop.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+
+    const keepStartedAtMs = 1_700_000_000_000;
+    const dropStartedAtMs = 1_700_086_400_000;
+    const keepSessionId = startSessionRecord(db, keepVideoId, keepStartedAtMs).sessionId;
+    const dropSessionId = startSessionRecord(db, dropVideoId, dropStartedAtMs).sessionId;
+    finalizeSessionMetrics(db, keepSessionId, keepStartedAtMs, {
+      activeWatchedMs: 30_000,
+      cardsMined: 1,
+    });
+    finalizeSessionMetrics(db, dropSessionId, dropStartedAtMs, {
+      activeWatchedMs: 60_000,
+      cardsMined: 2,
+    });
+
+    const keepDay = getLocalEpochDay(db, keepStartedAtMs);
+    const dropDay = getLocalEpochDay(db, dropStartedAtMs);
+    const keepMonth = 202311;
+    const dropMonth = 202311;
+
+    const insertDaily = db.prepare(`
+      INSERT INTO imm_daily_rollups (
+        rollup_day, video_id, total_sessions, total_active_min, total_lines_seen,
+        total_tokens_seen, total_cards, CREATED_DATE, LAST_UPDATE_DATE
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    const insertMonthly = db.prepare(`
+      INSERT INTO imm_monthly_rollups (
+        rollup_month, video_id, total_sessions, total_active_min, total_lines_seen,
+        total_tokens_seen, total_cards, CREATED_DATE, LAST_UPDATE_DATE
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+    insertDaily.run(keepDay, keepVideoId, 1, 0.5, 3, 6, 1, keepStartedAtMs, keepStartedAtMs);
+    insertDaily.run(dropDay, dropVideoId, 1, 1, 3, 6, 2, dropStartedAtMs, dropStartedAtMs);
+    insertMonthly.run(keepMonth, keepVideoId, 1, 0.5, 3, 6, 1, keepStartedAtMs, keepStartedAtMs);
+    insertMonthly.run(dropMonth, dropVideoId, 1, 1, 3, 6, 2, dropStartedAtMs, dropStartedAtMs);
+
+    deleteSessions(db, [dropSessionId]);
+
+    const dailyRows = db
+      .prepare('SELECT rollup_day, video_id, total_cards FROM imm_daily_rollups ORDER BY video_id')
+      .all() as Array<{ rollup_day: number; video_id: number; total_cards: number }>;
+    const monthlyRows = db
+      .prepare(
+        'SELECT rollup_month, video_id, total_cards FROM imm_monthly_rollups ORDER BY video_id',
+      )
+      .all() as Array<{ rollup_month: number; video_id: number; total_cards: number }>;
+
+    assert.deepEqual(dailyRows, [{ rollup_day: keepDay, video_id: keepVideoId, total_cards: 1 }]);
+    assert.deepEqual(monthlyRows, [
+      { rollup_month: keepMonth, video_id: keepVideoId, total_cards: 1 },
+    ]);
+  } finally {
+    db.close();
+    cleanupDbPath(dbPath);
+  }
+});
+
 test('split maintenance helpers delete multiple sessions and whole videos with dependent rows', () => {
  const { db, dbPath, stmts } = createDb();

@@ -35,9 +35,11 @@ import {
  getSessionTimeline,
  getSessionWordsByLine,
  getWordOccurrences,
+  searchSubtitleSentences,
  upsertCoverArt,
 } from '../query.js';
 import {
+  getLocalEpochDay,
  getShiftedLocalDaySec,
  getStartOfLocalDayTimestamp,
  toDbTimestamp,
@@ -759,6 +761,10 @@ test('getTrendsDashboard returns chart-ready aggregated series', () => {
    assert.equal(dashboard.progress.watchTime[1]?.value, 75);
    assert.equal(dashboard.progress.lookups[1]?.value, 18);
    assert.equal(dashboard.ratios.lookupsPerHundred[0]?.value, +((8 / 120) * 100).toFixed(1));
+    assert.equal(dashboard.ratios.cardsPerHour[0]?.value, +(2 / (30 / 60)).toFixed(1));
+    assert.equal(dashboard.ratios.cardsPerHour[1]?.value, +(3 / (45 / 60)).toFixed(1));
+    assert.equal(dashboard.ratios.readingSpeed[0]?.value, +(120 / 30).toFixed(1));
+    assert.equal(dashboard.ratios.readingSpeed[1]?.value, +(140 / 45).toFixed(1));
    assert.equal(dashboard.librarySummary[0]?.title, 'Trend Dashboard Anime');
    assert.equal(dashboard.animeCumulative.watchTime[1]?.value, 75);
    assert.equal(
@@ -771,6 +777,84 @@ test('getTrendsDashboard returns chart-ready aggregated series', () => {
  }
 });

+test('getTrendsDashboard redacts legacy Jellyfin stream titles', () => {
+  const dbPath = makeDbPath();
+  const db = new Database(dbPath);
+
+  try {
+    ensureSchema(db);
+    const rawStreamTitle =
+      'stream?static true&api key secret-token&MediaSourceId ms-1&AudioStreamIndex 3&SubtitleStreamIndex 4';
+    const videoId = getOrCreateVideoRecord(
+      db,
+      'remote:http://jellyfin.local/Videos/item-1/stream?static=true&api_key=secret-token&MediaSourceId=ms-1&AudioStreamIndex=3&SubtitleStreamIndex=4',
+      {
+        canonicalTitle: rawStreamTitle,
+        sourcePath: null,
+        sourceUrl:
+          'http://jellyfin.local/Videos/item-1/stream?static=true&api_key=secret-token&MediaSourceId=ms-1&AudioStreamIndex=3&SubtitleStreamIndex=4',
+        sourceType: SOURCE_TYPE_REMOTE,
+      },
+    );
+    const animeId = getOrCreateAnimeRecord(db, {
+      parsedTitle: rawStreamTitle,
+      canonicalTitle: rawStreamTitle,
+      anilistId: null,
+      titleRomaji: null,
+      titleEnglish: null,
+      titleNative: null,
+      metadataJson: null,
+    });
+    linkVideoToAnimeRecord(db, videoId, {
+      animeId,
+      parsedBasename:
+        'stream?static=true&api_key=secret-token&MediaSourceId=ms-1&AudioStreamIndex=3&SubtitleStreamIndex=4',
+      parsedTitle: rawStreamTitle,
+      parsedSeason: null,
+      parsedEpisode: null,
+      parserSource: 'guessit',
+      parserConfidence: 1,
+      parseMetadataJson: null,
+    });
+    const startedAtMs = 1_700_000_000_000;
+    const session = startSessionRecord(db, videoId, startedAtMs);
+    db.prepare(
+      `
+        UPDATE imm_sessions
+        SET
+          ended_at_ms = ?,
+          total_watched_ms = ?,
+          active_watched_ms = ?,
+          tokens_seen = ?
+        WHERE session_id = ?
+      `,
+    ).run(`${startedAtMs + 30 * 60_000}`, 30 * 60_000, 30 * 60_000, 120, session.sessionId);
+    db.prepare(
+      `
+        INSERT INTO imm_daily_rollups (
+          rollup_day, video_id, total_sessions, total_active_min, total_lines_seen,
+          total_tokens_seen, total_cards
+        ) VALUES (?, ?, ?, ?, ?, ?, ?)
+      `,
+    ).run(Math.floor(startedAtMs / 86_400_000), videoId, 1, 30, 10, 120, 0);
+
+    const dashboard = getTrendsDashboard(db, 'all', 'day');
+    const titles = [
+      ...dashboard.animeCumulative.watchTime.map((point) => point.animeTitle),
+      ...dashboard.librarySummary.map((row) => row.title),
+    ];
+
+    assert.deepEqual([...new Set(titles)], ['Jellyfin Video']);
+    assert.equal(titles.some((title) => title.includes('api_key=')), false);
+    assert.equal(titles.some((title) => title.includes('api key')), false);
+    assert.equal(titles.some((title) => title.includes('secret-token')), false);
+    assert.equal(titles.some((title) => title.includes('stream?')), false);
+  } finally {
+    db.close();
+    cleanupDbPath(dbPath);
+  }
+});
+
 test('getTrendsDashboard keeps local-midnight session buckets separate', () => {
  const dbPath = makeDbPath();
  const db = new Database(dbPath);
@@ -3686,6 +3770,187 @@ test('getWordOccurrences maps a normalized word back to anime, video, and subtit
  }
 });

+test('searchSubtitleSentences searches known subtitle lines and returns media context', () => {
+  const dbPath = makeDbPath();
+  const db = new Database(dbPath);
+
+  try {
+    ensureSchema(db);
+    const animeId = getOrCreateAnimeRecord(db, {
+      parsedTitle: 'Dungeon Meshi',
+      canonicalTitle: 'Dungeon Meshi',
+      anilistId: null,
+      titleRomaji: null,
+      titleEnglish: null,
+      titleNative: null,
+      metadataJson: '{"source":"test"}',
+    });
+    const videoId = getOrCreateVideoRecord(db, 'local:/tmp/dungeon-meshi-01.mkv', {
+      canonicalTitle: 'Episode 1',
+      sourcePath: '/tmp/Dungeon Meshi 01.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+    linkVideoToAnimeRecord(db, videoId, {
+      animeId,
+      parsedBasename: 'Dungeon Meshi 01.mkv',
+      parsedTitle: 'Dungeon Meshi',
+      parsedSeason: 1,
+      parsedEpisode: 1,
+      parserSource: 'fallback',
+      parserConfidence: 1,
+      parseMetadataJson: '{"episode":1}',
+    });
+    const { sessionId } = startSessionRecord(db, videoId, 3_000_000);
+
+    db.prepare(
+      `INSERT INTO imm_subtitle_lines (
+        session_id, event_id, video_id, anime_id, line_index, segment_start_ms, segment_end_ms,
+        text, secondary_text, CREATED_DATE, LAST_UPDATE_DATE
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+    ).run(
+      sessionId,
+      null,
+      videoId,
+      animeId,
+      7,
+      4_000,
+      5_500,
+      '魔物を食べるなんて信じられない',
+      'I cannot believe we are eating monsters',
+      3_000,
+      3_000,
+    );
+    db.prepare(
+      `INSERT INTO imm_subtitle_lines (
+        session_id, event_id, video_id, anime_id, line_index, segment_start_ms, segment_end_ms,
+        text, secondary_text, CREATED_DATE, LAST_UPDATE_DATE
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+    ).run(
+      sessionId,
+      null,
+      videoId,
+      animeId,
+      8,
+      6_000,
+      7_000,
+      'これは別の行です',
+      'Another line',
+      2_000,
+      2_000,
+    );
+
+    const rows = searchSubtitleSentences(db, '魔物 食べる', 10);
+
+    assert.deepEqual(rows, [
+      {
+        animeId,
+        animeTitle: 'Dungeon Meshi',
+        sourcePath: '/tmp/Dungeon Meshi 01.mkv',
+        secondaryText: 'I cannot believe we are eating monsters',
+        videoId,
+        videoTitle: 'Episode 1',
+        sessionId,
+        lineIndex: 7,
+        segmentStartMs: 4_000,
+        segmentEndMs: 5_500,
+        text: '魔物を食べるなんて信じられない',
+      },
+    ]);
+
+    assert.deepEqual(searchSubtitleSentences(db, 'monsters', 10), []);
+    assert.doesNotThrow(() => searchSubtitleSentences(db, '魔物', Number.POSITIVE_INFINITY));
+    assert.equal(searchSubtitleSentences(db, '魔物', -1).length, 1);
+  } finally {
+    db.close();
+    cleanupDbPath(dbPath);
+  }
+});
+
+test('searchSubtitleSentences searches subtitle lines by resolved headword candidates', () => {
+  const dbPath = makeDbPath();
+  const db = new Database(dbPath);
+
+  try {
+    ensureSchema(db);
+    const animeId = getOrCreateAnimeRecord(db, {
+      parsedTitle: 'Little Witch Academia',
+      canonicalTitle: 'Little Witch Academia',
+      anilistId: null,
+      titleRomaji: null,
+      titleEnglish: null,
+      titleNative: null,
+      metadataJson: '{"source":"test"}',
+    });
+    const videoId = getOrCreateVideoRecord(db, 'local:/tmp/lwa-05.mkv', {
+      canonicalTitle: 'Episode 5',
+      sourcePath: '/tmp/Little Witch Academia S01E05.mkv',
+      sourceUrl: null,
+      sourceType: SOURCE_TYPE_LOCAL,
+    });
+    linkVideoToAnimeRecord(db, videoId, {
+      animeId,
+      parsedBasename: 'Little Witch Academia S01E05.mkv',
+      parsedTitle: 'Little Witch Academia',
+      parsedSeason: 1,
+      parsedEpisode: 5,
+      parserSource: 'fallback',
+      parserConfidence: 1,
+      parseMetadataJson: '{"episode":5}',
+    });
+    const { sessionId } = startSessionRecord(db, videoId, 4_000_000);
+    const lineResult = db
+      .prepare(
+        `INSERT INTO imm_subtitle_lines (
+          session_id, event_id, video_id, anime_id, line_index, segment_start_ms, segment_end_ms,
+          text, secondary_text, CREATED_DATE, LAST_UPDATE_DATE
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      )
+      .run(
+        sessionId,
+        null,
+        videoId,
+        animeId,
+        20,
+        247_000,
+        250_000,
+        'ああ、名無しが何だか知らねえが',
+        null,
+        4_000,
+        4_000,
+      );
+    const wordResult = db
+      .prepare(
+        `INSERT INTO imm_words (
+          headword, word, reading, part_of_speech, pos1, pos2, pos3, first_seen, last_seen, frequency
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      )
+      .run('知る', '知らねえ', 'しらねえ', 'verb', '動詞', '自立', '', 4_000, 4_000, 1);
+    db.prepare(
+      `INSERT INTO imm_word_line_occurrences (line_id, word_id, occurrence_count)
+       VALUES (?, ?, ?)`,
+    ).run(Number(lineResult.lastInsertRowid), Number(wordResult.lastInsertRowid), 1);
+
+    assert.deepEqual(searchSubtitleSentences(db, '知らない', 10), []);
+
+    const rows = searchSubtitleSentences(db, '知らない', 10, {
+      headwordTerms: [{ term: '知らない', headwords: ['知る'] }],
+    });
+
+    assert.deepEqual(
+      rows.map((row) => row.text),
+      ['ああ、名無しが何だか知らねえが'],
+    );
+    assert.deepEqual(
+      searchSubtitleSentences(db, '知らねえ', 10).map((row) => row.text),
+      ['ああ、名無しが何だか知らねえが'],
+    );
+  } finally {
+    db.close();
+    cleanupDbPath(dbPath);
+  }
+});
+
 test('getKanjiOccurrences maps a kanji back to anime, video, and subtitle line context', () => {
  const dbPath = makeDbPath();
  const db = new Database(dbPath);
@@ -4100,8 +4365,14 @@ test('deleteSession removes zero-session media from library and trends', () => {

    const startedAtMs = 9_000_000;
    const endedAtMs = startedAtMs + 120_000;
-    const rollupDay = Math.floor(startedAtMs / 86_400_000);
-    const rollupMonth = 197001;
+    const rollupDay = getLocalEpochDay(db, startedAtMs);
+    const rollupMonth = (
+      db
+        .prepare(
+          "SELECT CAST(strftime('%Y%m', CAST(? AS REAL) / 1000, 'unixepoch', 'localtime') AS INTEGER) AS rollupMonth",
+        )
+        .get(startedAtMs) as { rollupMonth: number }
+    ).rollupMonth;
    const { sessionId } = startSessionRecord(db, videoId, startedAtMs);

    db.prepare(
@@ -0,0 +1,330 @@
+import type { DatabaseSync } from './sqlite';
+import { getOrCreateAnimeRecord } from './storage';
+import { toDbTimestamp } from './query-shared';
+import { nowMs } from './time';
+
+export interface AnimeSeasonRepairSummary {
+  scanned: number;
+  repaired: number;
+  movedVideos: number;
+  deletedAnimeRows: number;
+}
+
+interface AnimeRow {
+  anime_id: number;
+  anilist_id: number | null;
+  title_romaji: string | null;
+  title_english: string | null;
+  title_native: string | null;
+  episodes_total: number | null;
+  description: string | null;
+}
+
+interface ParsedVideoRow {
+  video_id: number;
+  parsed_title: string | null;
+  parsed_season: number | null;
+}
+
+interface RedistributeOptions {
+  transferAnilistToAnimeId?: number | null;
+  transferLegacyAnilist?: boolean;
+  overwriteTargetAnilist?: boolean;
+}
+
+function emptySummary(scanned = 0): AnimeSeasonRepairSummary {
+  return {
+    scanned,
+    repaired: 0,
+    movedVideos: 0,
+    deletedAnimeRows: 0,
+  };
+}
+
+function mergeSummary(
+  target: AnimeSeasonRepairSummary,
+  source: AnimeSeasonRepairSummary,
+): AnimeSeasonRepairSummary {
+  target.scanned += source.scanned;
+  target.repaired += source.repaired;
+  target.movedVideos += source.movedVideos;
+  target.deletedAnimeRows += source.deletedAnimeRows;
+  return target;
+}
+
+function runInTransaction<T>(db: DatabaseSync, work: () => T): T {
+  db.exec('BEGIN');
+  try {
+    const result = work();
+    db.exec('COMMIT');
+    return result;
+  } catch (error) {
+    db.exec('ROLLBACK');
+    throw error;
+  }
+}
+
+function normalizeSeason(value: number | null): number | null {
+  if (typeof value !== 'number' || !Number.isSafeInteger(value) || value <= 0) {
+    return null;
+  }
+  return value;
+}
+
+function getAnimeRow(db: DatabaseSync, animeId: number): AnimeRow | null {
+  return db
+    .prepare(
+      `
+        SELECT
+          anime_id,
+          anilist_id,
+          title_romaji,
+          title_english,
+          title_native,
+          episodes_total,
+          description
+        FROM imm_anime
+        WHERE anime_id = ?
+      `,
+    )
+    .get(animeId) as AnimeRow | null;
+}
+
+function getParsedVideos(db: DatabaseSync, animeId: number): ParsedVideoRow[] {
+  return db
+    .prepare(
+      `
+        SELECT video_id, parsed_title, parsed_season
+        FROM imm_videos
+        WHERE anime_id = ?
+        ORDER BY video_id ASC
+      `,
+    )
+    .all(animeId) as ParsedVideoRow[];
+}
+
+function hasAnimeReferences(db: DatabaseSync, animeId: number): boolean {
+  const row = db
+    .prepare(
+      `
+        SELECT 1 AS found
+        WHERE EXISTS (SELECT 1 FROM imm_videos WHERE anime_id = ?)
+           OR EXISTS (SELECT 1 FROM imm_subtitle_lines WHERE anime_id = ?)
+      `,
+    )
+    .get(animeId, animeId) as { found: number } | null;
+  return Boolean(row);
+}
+
+function assignAnilistToTarget(
+  db: DatabaseSync,
+  source: AnimeRow,
+  targetAnimeId: number,
+  overwriteTarget: boolean,
+  updatedAt: string,
+): boolean {
+  if (source.anilist_id === null || targetAnimeId === source.anime_id) {
+    return false;
+  }
+
+  const target = getAnimeRow(db, targetAnimeId);
+  if (!target) {
+    return false;
+  }
+  if (!overwriteTarget && target.anilist_id !== null && target.anilist_id !== source.anilist_id) {
+    return false;
+  }
+
+  db.prepare(
+    `
+      UPDATE imm_anime
+      SET anilist_id = NULL,
+          LAST_UPDATE_DATE = ?
+      WHERE anime_id = ?
+    `,
+  ).run(updatedAt, source.anime_id);
+
+  const updated = db
+    .prepare(
+      `
+        UPDATE imm_anime
+        SET
+          anilist_id = ?,
+          title_romaji = COALESCE(?, title_romaji),
+          title_english = COALESCE(?, title_english),
+          title_native = COALESCE(?, title_native),
+          episodes_total = COALESCE(?, episodes_total),
+          description = COALESCE(?, description),
+          LAST_UPDATE_DATE = ?
+        WHERE anime_id = ?
+      `,
+    )
+    .run(
+      source.anilist_id,
+      source.title_romaji,
+      source.title_english,
+      source.title_native,
+      source.episodes_total,
+      source.description,
+      updatedAt,
+      targetAnimeId,
+    ) as { changes: number };
+  return updated.changes > 0;
+}
+
+function redistributeAnimeRowByParsedSeasonsInTransaction(
+  db: DatabaseSync,
+  animeId: number,
+  options: RedistributeOptions = {},
+): AnimeSeasonRepairSummary {
+  const source = getAnimeRow(db, animeId);
+  if (!source) {
+    return emptySummary(1);
+  }
+
+  const videos = getParsedVideos(db, animeId);
+  const summary = emptySummary(1);
+  const updatedAt = toDbTimestamp(nowMs());
+  const targetBySeason = new Map<number, number>();
+
+  for (const video of videos) {
+    const parsedTitle = video.parsed_title?.trim();
+    const season = normalizeSeason(video.parsed_season);
+    if (!parsedTitle || season === null) {
+      continue;
+    }
+
+    const targetAnimeId = getOrCreateAnimeRecord(db, {
+      parsedTitle,
+      canonicalTitle: parsedTitle,
+      seasonScope: season,
+      anilistId: null,
+      titleRomaji: null,
+      titleEnglish: null,
+      titleNative: null,
+      metadataJson: null,
+    });
+    targetBySeason.set(season, targetAnimeId);
+
+    if (targetAnimeId === animeId) {
+      continue;
+    }
+
+    const videoUpdate = db
+      .prepare(
+        `
+          UPDATE imm_videos
+          SET anime_id = ?,
+              LAST_UPDATE_DATE = ?
+          WHERE video_id = ?
+        `,
+      )
+      .run(targetAnimeId, updatedAt, video.video_id) as { changes: number };
+    const lineUpdate = db
+      .prepare(
+        `
+          UPDATE imm_subtitle_lines
+          SET anime_id = ?,
+              LAST_UPDATE_DATE = ?
+          WHERE video_id = ?
+        `,
+      )
+      .run(targetAnimeId, updatedAt, video.video_id) as { changes: number };
+
+    if (videoUpdate.changes > 0 || lineUpdate.changes > 0) {
+      summary.movedVideos += 1;
+    }
+  }
+
+  const transferTarget =
+    options.transferAnilistToAnimeId ??
+    (options.transferLegacyAnilist
+      ? (targetBySeason.get(1) ??
+        (targetBySeason.size === 1 ? [...targetBySeason.values()][0] : null))
+      : null);
+  if (transferTarget) {
+    const transferred = assignAnilistToTarget(
+      db,
+      source,
+      transferTarget,
+      options.overwriteTargetAnilist ?? false,
+      updatedAt,
+    );
+    if (transferred) {
+      summary.repaired += 1;
+    }
+  }
+
+  if (!hasAnimeReferences(db, animeId)) {
+    const deleted = db.prepare('DELETE FROM imm_anime WHERE anime_id = ?').run(animeId) as {
+      changes: number;
+    };
+    if (deleted.changes > 0) {
+      summary.deletedAnimeRows += 1;
+    }
+  }
+
+  if (summary.movedVideos > 0 || summary.deletedAnimeRows > 0) {
+    summary.repaired += 1;
+  }
+  return summary;
+}
+
+export function repairLegacySeasonlessAnimeRows(db: DatabaseSync): AnimeSeasonRepairSummary {
+  return runInTransaction(db, () => {
+    const candidates = db
+      .prepare(
+        `
+          SELECT a.anime_id AS animeId
+          FROM imm_anime a
+          JOIN imm_videos v ON v.anime_id = a.anime_id
+          WHERE v.parsed_title IS NOT NULL
+            AND TRIM(v.parsed_title) != ''
+            AND v.parsed_season IS NOT NULL
+            AND v.parsed_season > 0
+          GROUP BY a.anime_id
+          HAVING COUNT(DISTINCT v.parsed_season) > 1
+          ORDER BY a.anime_id ASC
+        `,
+      )
+      .all() as Array<{ animeId: number }>;
+    const summary = emptySummary();
+    for (const candidate of candidates) {
+      mergeSummary(
+        summary,
+        redistributeAnimeRowByParsedSeasonsInTransaction(db, candidate.animeId, {
+          transferLegacyAnilist: true,
+        }),
+      );
+    }
+    return summary;
+  });
+}
+
+export function resolveAnimeAnilistConflict(
+  db: DatabaseSync,
+  targetAnimeId: number,
+  anilistId: number,
+): AnimeSeasonRepairSummary {
+  const conflict = db
+    .prepare(
+      `
+        SELECT anime_id AS animeId
+        FROM imm_anime
+        WHERE anilist_id = ?
+          AND anime_id != ?
+        LIMIT 1
+      `,
+    )
+    .get(anilistId, targetAnimeId) as { animeId: number } | null;
+  if (!conflict) {
+    return emptySummary();
+  }
+
+  return runInTransaction(db, () =>
+    redistributeAnimeRowByParsedSeasonsInTransaction(db, conflict.animeId, {
+      transferAnilistToAnimeId: targetAnimeId,
+      overwriteTargetAnilist: true,
+    }),
+  );
+}
@@ -0,0 +1,413 @@
+import type { DatabaseSync } from './sqlite';
+import { normalizeText } from './reducer';
+import { normalizeAnimeIdentityKey } from './storage';
+import { nowMs } from './time';
+import { toDbTimestamp } from './query-shared';
+import type { JellyfinLinkRepairSummary } from './types';
+
+type LegacyJellyfinVideoRow = {
+  video_id: number;
+  video_key: string;
+  source_url: string | null;
+  canonical_title: string;
+};
+
+type JellyfinTargetVideoRow = {
+  video_id: number;
+  anime_id: number | null;
+  canonical_title: string;
+  parsed_basename: string | null;
+  parsed_title: string | null;
+  parsed_season: number | null;
+  parsed_episode: number | null;
+  parser_source: string | null;
+  parser_confidence: number | null;
+  parse_metadata_json: string | null;
+};
+
+type LeakedAnimeTitleRow = {
+  anime_id: number;
+  canonical_title: string;
+  normalized_title_key: string;
+  title_romaji: string | null;
+  title_english: string | null;
+  title_native: string | null;
+  linked_video_title: string | null;
+};
+
+function looksLikeLeakedJellyfinTitle(value: string | null): boolean {
+  if (!value) return false;
+  const lowered = value.toLowerCase();
+  const hasApiKey = /api[\s_-]*key(?:\s|=|$)/i.test(value);
+  return (
+    hasApiKey &&
+    (lowered.includes('stream?') ||
+      lowered.includes('/stream?') ||
+      lowered.includes('/videos/') ||
+      lowered.includes('mediasourceid'))
+  );
+}
+
+function chooseSafeAnimeTitle(row: LeakedAnimeTitleRow): string | null {
+  const candidates = [
+    row.title_english,
+    row.title_romaji,
+    row.title_native,
+    row.linked_video_title?.replace(/^\[Jellyfin\/direct]\s*/i, ''),
+  ];
+  for (const candidate of candidates) {
+    const normalized = candidate?.trim();
+    if (normalized && !looksLikeLeakedJellyfinTitle(normalized)) {
+      return normalized;
+    }
+  }
+  return null;
+}
+
+function parseLegacyJellyfinStreamUrl(value: string | null): URL | null {
+  if (!value) return null;
+  const trimmed = value.trim();
+  const urlText = trimmed.startsWith('remote:') ? trimmed.slice('remote:'.length) : trimmed;
+  try {
+    const url = new URL(urlText);
+    const pathSegments = url.pathname.split('/').filter(Boolean);
+    const videosIndex = pathSegments.findIndex((segment) => segment.toLowerCase() === 'videos');
+    if (
+      videosIndex < 0 ||
+      pathSegments[videosIndex + 1] === undefined ||
+      pathSegments[videosIndex + 2]?.toLowerCase() !== 'stream'
+    ) {
+      return null;
+    }
+    if (!url.searchParams.has('api_key')) {
+      return null;
+    }
+    return url;
+  } catch {
+    return null;
+  }
+}
+
+function buildJellyfinStatsUrlFromLegacyStream(url: URL): string | null {
+  const pathSegments = url.pathname.split('/').filter(Boolean);
+  const videosIndex = pathSegments.findIndex((segment) => segment.toLowerCase() === 'videos');
+  const itemId = normalizeText(pathSegments[videosIndex + 1]);
+  if (!itemId) return null;
+  return `jellyfin://${url.host}/item/${encodeURIComponent(itemId)}`;
+}
+
+function buildSanitizedJellyfinVideoKey(
+  db: DatabaseSync,
+  videoId: number,
+  statsUrl: string,
+): string {
+  const baseKey = `remote:${statsUrl}`;
+  const existing = db
+    .prepare('SELECT video_id FROM imm_videos WHERE video_key = ?')
+    .get(baseKey) as { video_id: number } | null;
+  if (!existing || existing.video_id === videoId) {
+    return baseKey;
+  }
+  return `${baseKey}#legacy-${videoId}`;
+}
+
+function repairLeakedJellyfinAnimeTitles(db: DatabaseSync, currentTimestamp: string): number {
+  const candidates = (
+    db
+      .prepare(
+        `
+          SELECT
+            a.anime_id,
+            a.normalized_title_key,
+            a.canonical_title,
+            a.title_romaji,
+            a.title_english,
+            a.title_native,
+            (
+              SELECT v.canonical_title
+              FROM imm_videos v
+              WHERE v.anime_id = a.anime_id
+                AND v.canonical_title NOT LIKE '%api_key=%'
+                AND lower(v.canonical_title) NOT LIKE '%api key%'
+              ORDER BY v.LAST_UPDATE_DATE DESC, v.video_id DESC
+              LIMIT 1
+            ) AS linked_video_title
+          FROM imm_anime a
+          WHERE a.canonical_title LIKE '%api_key=%'
+             OR lower(a.canonical_title) LIKE '%api key%'
+             OR lower(a.normalized_title_key) LIKE '%api key%'
+        `,
+      )
+      .all() as LeakedAnimeTitleRow[]
+  ).filter(
+    (row) =>
+      looksLikeLeakedJellyfinTitle(row.canonical_title) ||
+      looksLikeLeakedJellyfinTitle(row.normalized_title_key),
+  );
+
+  let repaired = 0;
+  for (const candidate of candidates) {
+    const replacementTitle = chooseSafeAnimeTitle(candidate);
+    if (!replacementTitle) {
+      continue;
+    }
+    const replacementKey = normalizeAnimeIdentityKey(replacementTitle);
+    if (!replacementKey) {
+      continue;
+    }
+    const existing = db
+      .prepare(
+        `
+          SELECT anime_id
+          FROM imm_anime
+          WHERE normalized_title_key = ?
+            AND anime_id != ?
+        `,
+      )
+      .get(replacementKey, candidate.anime_id) as { anime_id: number } | null;
+    if (existing) {
+      const videoUpdate = db
+        .prepare(
+          `
+            UPDATE imm_videos
+            SET anime_id = ?, LAST_UPDATE_DATE = ?
+            WHERE anime_id = ?
+          `,
+        )
+        .run(existing.anime_id, currentTimestamp, candidate.anime_id) as { changes: number };
+      const subtitleUpdate = db
+        .prepare(
+          `
+            UPDATE imm_subtitle_lines
+            SET anime_id = ?, LAST_UPDATE_DATE = ?
+            WHERE anime_id = ?
+          `,
+        )
+        .run(existing.anime_id, currentTimestamp, candidate.anime_id) as { changes: number };
+      const animeDelete = db
+        .prepare(
+          `
+            DELETE FROM imm_anime
+            WHERE anime_id = ?
+              AND NOT EXISTS (SELECT 1 FROM imm_videos WHERE anime_id = ?)
+              AND NOT EXISTS (SELECT 1 FROM imm_subtitle_lines WHERE anime_id = ?)
+          `,
+        )
+        .run(candidate.anime_id, candidate.anime_id, candidate.anime_id) as { changes: number };
+      if (videoUpdate.changes > 0 || subtitleUpdate.changes > 0) {
+        repaired += 1;
+      } else if (animeDelete.changes > 0) {
+        repaired += 1;
+      }
+      continue;
+    }
+    const updated = db
+      .prepare(
+        `
+          UPDATE imm_anime
+          SET
+            normalized_title_key = ?,
+            canonical_title = ?,
+            LAST_UPDATE_DATE = ?
+          WHERE anime_id = ?
+        `,
+      )
+      .run(replacementKey, replacementTitle, currentTimestamp, candidate.anime_id) as {
+      changes: number;
+    };
+    if (updated.changes > 0) {
+      repaired += 1;
+    }
+  }
+  return repaired;
+}
+
+function repairLeakedJellyfinVideoParseMetadata(
+  db: DatabaseSync,
+  currentTimestamp: string,
+): number {
+  const updated = db
+    .prepare(
+      `
+        UPDATE imm_videos
+        SET
+          parsed_basename = NULL,
+          parsed_title = NULL,
+          parse_metadata_json = NULL,
+          parser_source = CASE
+            WHEN parser_source = 'guessit' THEN 'jellyfin'
+            ELSE parser_source
+          END,
+          LAST_UPDATE_DATE = ?
+        WHERE source_type = 2
+          AND (
+            parsed_basename LIKE '%api_key=%'
+            OR lower(parsed_basename) LIKE '%api key%'
+            OR parsed_title LIKE '%api_key=%'
+            OR lower(parsed_title) LIKE '%api key%'
+            OR parse_metadata_json LIKE '%api_key=%'
+            OR lower(parse_metadata_json) LIKE '%api key%'
+          )
+      `,
+    )
+    .run(currentTimestamp) as { changes: number };
+  return updated.changes;
+}
+
+export function repairJellyfinStreamVideoLinks(db: DatabaseSync): JellyfinLinkRepairSummary {
+  const candidates = db
+    .prepare(
+      `
+        SELECT video_id, video_key, source_url, canonical_title
+        FROM imm_videos
+        WHERE source_type = 2
+          AND (
+            video_key LIKE '%api_key=%'
+            OR lower(video_key) LIKE '%api key%'
+            OR source_url LIKE '%api_key=%'
+            OR lower(source_url) LIKE '%api key%'
+            OR canonical_title LIKE '%api_key=%'
+            OR lower(canonical_title) LIKE '%api key%'
+          )
+      `,
+    )
+    .all() as LegacyJellyfinVideoRow[];
+
+  const summary: JellyfinLinkRepairSummary = {
+    scanned: candidates.length,
+    repaired: 0,
+  };
+  if (candidates.length === 0) {
+    const currentTimestamp = toDbTimestamp(nowMs());
+    const repaired =
+      repairLeakedJellyfinAnimeTitles(db, currentTimestamp) +
+      repairLeakedJellyfinVideoParseMetadata(db, currentTimestamp);
+    summary.repaired += repaired;
+    return summary;
+  }
+
+  const currentTimestamp = toDbTimestamp(nowMs());
+  db.exec('BEGIN IMMEDIATE');
+  try {
+    for (const candidate of candidates) {
+      const legacyUrl =
+        parseLegacyJellyfinStreamUrl(candidate.source_url) ??
+        parseLegacyJellyfinStreamUrl(candidate.video_key);
+      if (!legacyUrl) {
+        continue;
+      }
+      const statsUrl = buildJellyfinStatsUrlFromLegacyStream(legacyUrl);
+      if (!statsUrl) {
+        continue;
+      }
+      const sanitizedVideoKey = buildSanitizedJellyfinVideoKey(db, candidate.video_id, statsUrl);
+      const sanitizedCanonicalTitle = looksLikeLeakedJellyfinTitle(candidate.canonical_title)
+        ? 'Jellyfin Video'
+        : candidate.canonical_title;
+      const target = db
+        .prepare(
+          `
+            SELECT
+              video_id,
+              anime_id,
+              canonical_title,
+              parsed_basename,
+              parsed_title,
+              parsed_season,
+              parsed_episode,
+              parser_source,
+              parser_confidence,
+              parse_metadata_json
+            FROM imm_videos
+            WHERE video_id != ?
+              AND (video_key = ? OR source_url = ?)
+            ORDER BY parser_source = 'jellyfin' DESC, video_id DESC
+            LIMIT 1
+          `,
+        )
+        .get(candidate.video_id, `remote:${statsUrl}`, statsUrl) as JellyfinTargetVideoRow | null;
+      if (!target) {
+        const updated = db
+          .prepare(
+            `
+              UPDATE imm_videos
+              SET
+                video_key = ?,
+                source_url = ?,
+                canonical_title = ?,
+                parser_source = COALESCE(parser_source, 'jellyfin'),
+                LAST_UPDATE_DATE = ?
+              WHERE video_id = ?
+                AND (video_key != ? OR source_url != ? OR canonical_title != ?)
+            `,
+          )
+          .run(
+            sanitizedVideoKey,
+            statsUrl,
+            sanitizedCanonicalTitle,
+            currentTimestamp,
+            candidate.video_id,
+            sanitizedVideoKey,
+            statsUrl,
+            sanitizedCanonicalTitle,
+          ) as { changes: number };
+        if (updated.changes > 0) {
+          summary.repaired += 1;
+        }
+        continue;
+      }
+
+      db.prepare(
+        `
+          UPDATE imm_videos
+          SET
+            video_key = ?,
+            anime_id = ?,
+            canonical_title = ?,
+            source_url = ?,
+            parsed_basename = ?,
+            parsed_title = ?,
+            parsed_season = ?,
+            parsed_episode = ?,
+            parser_source = ?,
+            parser_confidence = ?,
+            parse_metadata_json = ?,
+            LAST_UPDATE_DATE = ?
+          WHERE video_id = ?
+        `,
+      ).run(
+        sanitizedVideoKey,
+        target.anime_id,
+        target.canonical_title,
+        statsUrl,
+        target.parsed_basename,
+        target.parsed_title,
+        target.parsed_season,
+        target.parsed_episode,
+        target.parser_source,
+        target.parser_confidence,
+        target.parse_metadata_json,
+        currentTimestamp,
+        candidate.video_id,
+      );
+      if (target.anime_id !== null) {
+        db.prepare(
+          `
+            UPDATE imm_subtitle_lines
+            SET anime_id = ?, LAST_UPDATE_DATE = ?
+            WHERE video_id = ?
+          `,
+        ).run(target.anime_id, currentTimestamp, candidate.video_id);
+      }
+      summary.repaired += 1;
+    }
+    summary.repaired += repairLeakedJellyfinAnimeTitles(db, currentTimestamp);
+    summary.repaired += repairLeakedJellyfinVideoParseMetadata(db, currentTimestamp);
+    db.exec('COMMIT');
+  } catch (error) {
+    db.exec('ROLLBACK');
+    throw error;
+  }
+
+  return summary;
+}
@@ -60,6 +60,34 @@ interface RetainedSessionRow {
  mediaBufferEvents: number;
 }

+const RETAINED_SESSION_METRICS_CTE = `
+  retained_sessions AS (
+    SELECT
+      s.session_id,
+      s.video_id,
+      v.anime_id,
+      s.started_at_ms,
+      s.ended_at_ms,
+      MAX(COALESCE(t.active_watched_ms, s.active_watched_ms, 0), 0) AS active_ms,
+      MAX(COALESCE(t.cards_mined, s.cards_mined, 0), 0) AS cards_mined,
+      MAX(COALESCE(t.lines_seen, s.lines_seen, 0), 0) AS lines_seen,
+      MAX(COALESCE(t.tokens_seen, s.tokens_seen, 0), 0) AS tokens_seen,
+      CASE WHEN v.watched > 0 THEN 1 ELSE 0 END AS completed
+    FROM imm_sessions s
+    JOIN imm_videos v
+      ON v.video_id = s.video_id
+    LEFT JOIN imm_session_telemetry t
+      ON t.telemetry_id = (
+        SELECT telemetry_id
+        FROM imm_session_telemetry
+        WHERE session_id = s.session_id
+        ORDER BY sample_ms DESC, telemetry_id DESC
+        LIMIT 1
+      )
+    WHERE s.ended_at_ms IS NOT NULL
+  )
+`;
+
 function hasRetainedPriorSession(
  db: DatabaseSync,
  videoId: number,
@@ -154,54 +182,150 @@ function rebuildLifetimeSummariesInternal(
  db: DatabaseSync,
  rebuiltAtMs: number,
 ): LifetimeRebuildSummary {
-  const rows = db
-    .prepare(
-      `
-      SELECT
-        session_id AS sessionId,
-        video_id AS videoId,
-        started_at_ms AS startedAtMs,
-        ended_at_ms AS endedAtMs,
-        ended_media_ms AS lastMediaMs,
-        total_watched_ms AS totalWatchedMs,
-        active_watched_ms AS activeWatchedMs,
-        lines_seen AS linesSeen,
-        tokens_seen AS tokensSeen,
-        cards_mined AS cardsMined,
-        lookup_count AS lookupCount,
-        lookup_hits AS lookupHits,
-        yomitan_lookup_count AS yomitanLookupCount,
-        pause_count AS pauseCount,
-        pause_ms AS pauseMs,
-        seek_forward_count AS seekForwardCount,
-        seek_backward_count AS seekBackwardCount,
-        media_buffer_events AS mediaBufferEvents
-      FROM imm_sessions
-      WHERE ended_at_ms IS NOT NULL
-      ORDER BY started_at_ms ASC, session_id ASC
-      `,
-    )
-    .all() as Array<
-    Omit<RetainedSessionRow, 'startedAtMs' | 'endedAtMs' | 'lastMediaMs'> & {
-      startedAtMs: number | string;
-      endedAtMs: number | string;
-      lastMediaMs: number | string | null;
-    }
-  >;
-  const sessions = rows.map((row) => ({
-    ...row,
-    startedAtMs: row.startedAtMs,
-    endedAtMs: row.endedAtMs,
-    lastMediaMs: row.lastMediaMs === null ? null : Number(row.lastMediaMs),
-  })) as RetainedSessionRow[];
+  const rebuiltAtDbMs = toDbTimestamp(rebuiltAtMs);
+  const appliedSessions = Number(
+    (
+      db
+        .prepare('SELECT COUNT(*) AS total FROM imm_sessions WHERE ended_at_ms IS NOT NULL')
+        .get() as { total: number }
+    ).total,
+  );

  resetLifetimeSummaries(db, rebuiltAtMs);
-  for (const session of sessions) {
-    applySessionLifetimeSummary(db, toRebuildSessionState(session), session.endedAtMs);
-  }
+
+  db.prepare(
+    `
+    INSERT INTO imm_lifetime_applied_sessions (
+      session_id,
+      applied_at_ms,
+      CREATED_DATE,
+      LAST_UPDATE_DATE
+    )
+    SELECT
+      session_id,
+      ended_at_ms,
+      ?,
+      ?
+    FROM imm_sessions
+    WHERE ended_at_ms IS NOT NULL
+    `,
+  ).run(rebuiltAtDbMs, rebuiltAtDbMs);
+
+  db.prepare(
+    `
+    WITH ${RETAINED_SESSION_METRICS_CTE}
+    INSERT INTO imm_lifetime_media (
+      video_id,
+      total_sessions,
+      total_active_ms,
+      total_cards,
+      total_lines_seen,
+      total_tokens_seen,
+      completed,
+      first_watched_ms,
+      last_watched_ms,
+      CREATED_DATE,
+      LAST_UPDATE_DATE
+    )
+    SELECT
+      video_id,
+      COUNT(*) AS total_sessions,
+      COALESCE(SUM(active_ms), 0) AS total_active_ms,
+      COALESCE(SUM(cards_mined), 0) AS total_cards,
+      COALESCE(SUM(lines_seen), 0) AS total_lines_seen,
+      COALESCE(SUM(tokens_seen), 0) AS total_tokens_seen,
+      MAX(completed) AS completed,
+      MIN(started_at_ms) AS first_watched_ms,
+      MAX(ended_at_ms) AS last_watched_ms,
+      ? AS CREATED_DATE,
+      ? AS LAST_UPDATE_DATE
+    FROM retained_sessions
+    GROUP BY video_id
+    `,
+  ).run(rebuiltAtDbMs, rebuiltAtDbMs);
+
+  db.prepare(
+    `
+    WITH ${RETAINED_SESSION_METRICS_CTE}
+    INSERT INTO imm_lifetime_anime (
+      anime_id,
+      total_sessions,
+      total_active_ms,
+      total_cards,
+      total_lines_seen,
+      total_tokens_seen,
+      episodes_started,
+      episodes_completed,
+      first_watched_ms,
+      last_watched_ms,
+      CREATED_DATE,
+      LAST_UPDATE_DATE
+    )
+    SELECT
+      anime_id,
+      COUNT(*) AS total_sessions,
+      COALESCE(SUM(active_ms), 0) AS total_active_ms,
+      COALESCE(SUM(cards_mined), 0) AS total_cards,
+      COALESCE(SUM(lines_seen), 0) AS total_lines_seen,
+      COALESCE(SUM(tokens_seen), 0) AS total_tokens_seen,
+      COUNT(DISTINCT video_id) AS episodes_started,
+      COUNT(DISTINCT CASE WHEN completed > 0 THEN video_id END) AS episodes_completed,
+      MIN(started_at_ms) AS first_watched_ms,
+      MAX(ended_at_ms) AS last_watched_ms,
+      ? AS CREATED_DATE,
+      ? AS LAST_UPDATE_DATE
+    FROM retained_sessions
+    WHERE anime_id IS NOT NULL
+    GROUP BY anime_id
+    `,
+  ).run(rebuiltAtDbMs, rebuiltAtDbMs);
+
+  db.prepare(
+    `
+    WITH ${RETAINED_SESSION_METRICS_CTE},
+    anime_completion AS (
+      SELECT
+        rs.anime_id,
+        MAX(a.episodes_total) AS episodes_total,
+        COUNT(DISTINCT CASE WHEN rs.completed > 0 THEN rs.video_id END) AS completed_videos
+      FROM retained_sessions rs
+      JOIN imm_anime a
+        ON a.anime_id = rs.anime_id
+      WHERE rs.anime_id IS NOT NULL
+      GROUP BY rs.anime_id
+    )
+    UPDATE imm_lifetime_global
+    SET
+      total_sessions = (SELECT COUNT(*) FROM retained_sessions),
+      total_active_ms = (SELECT COALESCE(SUM(active_ms), 0) FROM retained_sessions),
+      total_cards = (SELECT COALESCE(SUM(cards_mined), 0) FROM retained_sessions),
+      active_days = (
+        SELECT COUNT(DISTINCT CAST(
+          julianday(CAST(started_at_ms AS REAL) / 1000, 'unixepoch', 'localtime') - 2440587.5
+          AS INTEGER
+        ))
+        FROM retained_sessions
+      ),
+      episodes_started = (SELECT COUNT(DISTINCT video_id) FROM retained_sessions),
+      episodes_completed = (
+        SELECT COUNT(DISTINCT CASE WHEN completed > 0 THEN video_id END)
+        FROM retained_sessions
+      ),
+      anime_completed = (
+        SELECT COUNT(*)
+        FROM anime_completion
+        WHERE episodes_total IS NOT NULL
+          AND episodes_total > 0
+          AND completed_videos >= episodes_total
+      ),
+      last_rebuilt_ms = ?,
+      LAST_UPDATE_DATE = ?
+    WHERE global_id = 1
+    `,
+  ).run(rebuiltAtDbMs, rebuiltAtDbMs);

  return {
-    appliedSessions: sessions.length,
+    appliedSessions,
    rebuiltAtMs,
  };
 }
@@ -1,6 +1,6 @@
 import type { DatabaseSync } from './sqlite';
 import { nowMs } from './time';
-import { subtractDbTimestamp, toDbTimestamp } from './query-shared';
+import { makePlaceholders, subtractDbTimestamp, toDbTimestamp } from './query-shared';

 const ROLLUP_STATE_KEY = 'last_rollup_sample_ms';
 const DAILY_MS = 86_400_000;
@@ -20,6 +20,12 @@ interface RollupTelemetryResult {
  maxSampleMs: number | null;
 }

+export interface RollupGroup {
+  rollupDay: number;
+  rollupMonth: number;
+  videoId: number;
+}
+
 interface RawRetentionResult {
  deletedSessionEvents: number;
  deletedTelemetryRows: number;
@@ -164,6 +170,26 @@ function upsertDailyRollupsForGroups(
  }

  const upsertStmt = db.prepare(`
+    WITH matching_sessions AS (
+      SELECT *
+      FROM imm_sessions
+      WHERE CAST(julianday(CAST(started_at_ms AS REAL) / 1000, 'unixepoch', 'localtime') - 2440587.5 AS INTEGER) = ?
+        AND video_id = ?
+    ),
+    session_metrics AS (
+      SELECT
+        t.session_id,
+        MAX(t.active_watched_ms) AS max_active_ms,
+        MAX(t.lines_seen) AS max_lines,
+        MAX(t.tokens_seen) AS max_tokens,
+        MAX(t.cards_mined) AS max_cards,
+        MAX(t.lookup_count) AS max_lookups,
+        MAX(t.lookup_hits) AS max_hits
+      FROM imm_session_telemetry t
+      JOIN matching_sessions s
+        ON s.session_id = t.session_id
+      GROUP BY t.session_id
+    )
    INSERT INTO imm_daily_rollups (
      rollup_day, video_id, total_sessions, total_active_min, total_lines_seen,
      total_tokens_seen, total_cards, cards_per_hour,
@@ -197,20 +223,8 @@ function upsertDailyRollupsForGroups(
      END AS lookup_hit_rate,
      ? AS CREATED_DATE,
      ? AS LAST_UPDATE_DATE
-    FROM imm_sessions s
-    LEFT JOIN (
-      SELECT
-        t.session_id,
-        MAX(t.active_watched_ms) AS max_active_ms,
-        MAX(t.lines_seen) AS max_lines,
-        MAX(t.tokens_seen) AS max_tokens,
-        MAX(t.cards_mined) AS max_cards,
-        MAX(t.lookup_count) AS max_lookups,
-        MAX(t.lookup_hits) AS max_hits
-      FROM imm_session_telemetry t
-      GROUP BY t.session_id
-    ) sm ON s.session_id = sm.session_id
-    WHERE CAST(julianday(s.started_at_ms / 1000, 'unixepoch', 'localtime') - 2440587.5 AS INTEGER) = ? AND s.video_id = ?
+    FROM matching_sessions s
+    LEFT JOIN session_metrics sm ON s.session_id = sm.session_id
    GROUP BY rollup_day, s.video_id
    ON CONFLICT (rollup_day, video_id) DO UPDATE SET
      total_sessions = excluded.total_sessions,
@@ -226,7 +240,7 @@ function upsertDailyRollupsForGroups(
  `);

  for (const { rollupDay, videoId } of groups) {
-    upsertStmt.run(rollupNowMs, rollupNowMs, rollupDay, videoId);
+    upsertStmt.run(rollupDay, videoId, rollupNowMs, rollupNowMs);
  }
 }

@@ -240,6 +254,24 @@ function upsertMonthlyRollupsForGroups(
  }

  const upsertStmt = db.prepare(`
+    WITH matching_sessions AS (
+      SELECT *
+      FROM imm_sessions
+      WHERE CAST(strftime('%Y%m', CAST(started_at_ms AS REAL) / 1000, 'unixepoch', 'localtime') AS INTEGER) = ?
+        AND video_id = ?
+    ),
+    session_metrics AS (
+      SELECT
+        t.session_id,
+        MAX(t.active_watched_ms) AS max_active_ms,
+        MAX(t.lines_seen) AS max_lines,
+        MAX(t.tokens_seen) AS max_tokens,
+        MAX(t.cards_mined) AS max_cards
+      FROM imm_session_telemetry t
+      JOIN matching_sessions s
+        ON s.session_id = t.session_id
+      GROUP BY t.session_id
+    )
    INSERT INTO imm_monthly_rollups (
      rollup_month, video_id, total_sessions, total_active_min, total_lines_seen,
      total_tokens_seen, total_cards, CREATED_DATE, LAST_UPDATE_DATE
@@ -254,18 +286,8 @@ function upsertMonthlyRollupsForGroups(
      COALESCE(SUM(COALESCE(sm.max_cards, s.cards_mined)), 0) AS total_cards,
      ? AS CREATED_DATE,
      ? AS LAST_UPDATE_DATE
-    FROM imm_sessions s
-    LEFT JOIN (
-      SELECT
-        t.session_id,
-        MAX(t.active_watched_ms) AS max_active_ms,
-        MAX(t.lines_seen) AS max_lines,
-        MAX(t.tokens_seen) AS max_tokens,
-        MAX(t.cards_mined) AS max_cards
-      FROM imm_session_telemetry t
-      GROUP BY t.session_id
-    ) sm ON s.session_id = sm.session_id
-    WHERE CAST(strftime('%Y%m', s.started_at_ms / 1000, 'unixepoch', 'localtime') AS INTEGER) = ? AND s.video_id = ?
+    FROM matching_sessions s
+    LEFT JOIN session_metrics sm ON s.session_id = sm.session_id
    GROUP BY rollup_month, s.video_id
    ON CONFLICT (rollup_month, video_id) DO UPDATE SET
      total_sessions = excluded.total_sessions,
@@ -278,10 +300,75 @@ function upsertMonthlyRollupsForGroups(
  `);

  for (const { rollupMonth, videoId } of groups) {
-    upsertStmt.run(rollupNowMs, rollupNowMs, rollupMonth, videoId);
+    upsertStmt.run(rollupMonth, videoId, rollupNowMs, rollupNowMs);
  }
 }

+export function getRollupGroupsForSessions(db: DatabaseSync, sessionIds: number[]): RollupGroup[] {
+  if (sessionIds.length === 0) {
+    return [];
+  }
+
+  const placeholders = makePlaceholders(sessionIds);
+  const rows = db
+    .prepare(
+      `
+        SELECT DISTINCT
+          CAST(julianday(CAST(started_at_ms AS REAL) / 1000, 'unixepoch', 'localtime') - 2440587.5 AS INTEGER) AS rollup_day,
+          CAST(strftime('%Y%m', CAST(started_at_ms AS REAL) / 1000, 'unixepoch', 'localtime') AS INTEGER) AS rollup_month,
+          video_id
+        FROM imm_sessions
+        WHERE session_id IN (${placeholders})
+      `,
+    )
+    .all(...sessionIds) as RollupGroupRow[];
+
+  return rows.map((row) => ({
+    rollupDay: row.rollup_day,
+    rollupMonth: row.rollup_month,
+    videoId: row.video_id,
+  }));
+}
+
+export function refreshRollupsForGroupsInTransaction(
+  db: DatabaseSync,
+  groups: RollupGroup[],
+): void {
+  if (groups.length === 0) {
+    return;
+  }
+
+  const rollupNowMs = toDbTimestamp(nowMs());
+  const dailyGroups = dedupeGroups(
+    groups.map((group) => ({
+      rollupDay: group.rollupDay,
+      videoId: group.videoId,
+    })),
+  );
+  const monthlyGroups = dedupeGroups(
+    groups.map((group) => ({
+      rollupMonth: group.rollupMonth,
+      videoId: group.videoId,
+    })),
+  );
+  const deleteDailyStmt = db.prepare(
+    'DELETE FROM imm_daily_rollups WHERE rollup_day = ? AND video_id = ?',
+  );
+  const deleteMonthlyStmt = db.prepare(
+    'DELETE FROM imm_monthly_rollups WHERE rollup_month = ? AND video_id = ?',
+  );
+
+  for (const { rollupDay, videoId } of dailyGroups) {
+    deleteDailyStmt.run(rollupDay, videoId);
+  }
+  for (const { rollupMonth, videoId } of monthlyGroups) {
+    deleteMonthlyStmt.run(rollupMonth, videoId);
+  }
+
+  upsertDailyRollupsForGroups(db, dailyGroups, rollupNowMs);
+  upsertMonthlyRollupsForGroups(db, monthlyGroups, rollupNowMs);
+}
+
 function getAffectedRollupGroups(
  db: DatabaseSync,
  lastRollupSampleMs: number | string,
@@ -179,6 +179,32 @@ test('guessAnimeVideoMetadata uses guessit basename output first when available'
  });
 });

+test('guessAnimeVideoMetadata keeps season directory scope when guessit omits season', async () => {
+  const parsed = await guessAnimeVideoMetadata(
+    '/tmp/KonoSuba/Season 2/KonoSuba - 05.mkv',
+    'Episode 5',
+    {
+      runGuessit: async () =>
+        JSON.stringify({
+          title: 'KonoSuba',
+        }),
+    },
+  );
+
+  assert.deepEqual(parsed, {
+    parsedBasename: 'KonoSuba - 05.mkv',
+    parsedTitle: 'KonoSuba',
+    parsedSeason: 2,
+    parsedEpisode: null,
+    parserSource: 'guessit',
+    parserConfidence: 1,
+    parseMetadataJson: JSON.stringify({
+      filename: 'KonoSuba - 05.mkv',
+      source: 'guessit',
+    }),
+  });
+});
+
 test('guessAnimeVideoMetadata falls back to parser when guessit throws', async () => {
  const parsed = await guessAnimeVideoMetadata(
    '/tmp/Little Witch Academia S02E05.mkv',
@@ -7,6 +7,8 @@ import type {
  KanjiOccurrenceRow,
  KanjiStatsRow,
  KanjiWordRow,
+  SentenceSearchOptions,
+  SentenceSearchResultRow,
  SessionEventRow,
  SimilarWordRow,
  StatsExcludedWordRow,
@@ -20,6 +22,56 @@ import { nowMs } from './time';

 const VOCABULARY_STATS_FILTER_OVERSAMPLE_FACTOR = 4;
 const VOCABULARY_STATS_FILTER_OVERSAMPLE_MIN = 100;
+const SENTENCE_SEARCH_DEFAULT_LIMIT = 50;
+const SENTENCE_SEARCH_MAX_LIMIT = 100;
+const KANJI_PATTERN = /\p{Script=Han}/gu;
+
+function resolveSentenceSearchLimit(limit: number): number {
+  if (!Number.isFinite(limit)) return SENTENCE_SEARCH_DEFAULT_LIMIT;
+  const normalized = Math.floor(limit);
+  if (normalized <= 0) return SENTENCE_SEARCH_DEFAULT_LIMIT;
+  return Math.min(normalized, SENTENCE_SEARCH_MAX_LIMIT);
+}
+
+export function splitSentenceSearchTerms(query: string): string[] {
+  return query
+    .trim()
+    .split(/\s+/)
+    .map((term) => term.trim())
+    .filter(Boolean)
+    .slice(0, 8);
+}
+
+function escapeLikeTerm(term: string): string {
+  return term.replace(/[\\%_]/g, (match) => `\\${match}`);
+}
+
+function uniqueNonEmptyTerms(values: readonly string[] | undefined): string[] {
+  const seen = new Set<string>();
+  const terms: string[] = [];
+  for (const value of values ?? []) {
+    const term = value.trim();
+    if (!term || seen.has(term)) continue;
+    seen.add(term);
+    terms.push(term);
+  }
+  return terms;
+}
+
+function getHeadwordCandidatesForSentenceSearchTerm(
+  term: string,
+  options: SentenceSearchOptions | undefined,
+): string[] {
+  const headwords =
+    options?.headwordTerms
+      ?.filter((entry) => entry.term === term)
+      .flatMap((entry) => entry.headwords) ?? [];
+  return uniqueNonEmptyTerms(headwords);
+}
+
+function uniqueKanji(text: string): string[] {
+  return Array.from(new Set(text.match(KANJI_PATTERN) ?? []));
+}

 function toVocabularyToken(row: VocabularyStatsRow): MergedToken {
  const partOfSpeech =
@@ -211,6 +263,70 @@ export function getKanjiOccurrences(
    .all(kanji, limit, offset) as unknown as KanjiOccurrenceRow[];
 }

+export function searchSubtitleSentences(
+  db: DatabaseSync,
+  query: string,
+  limit = SENTENCE_SEARCH_DEFAULT_LIMIT,
+  options?: SentenceSearchOptions,
+): SentenceSearchResultRow[] {
+  const terms = splitSentenceSearchTerms(query);
+  if (terms.length === 0) return [];
+  const resolvedLimit = resolveSentenceSearchLimit(limit);
+
+  const clauses: string[] = [];
+  const params: string[] = [];
+  for (const term of terms) {
+    const likeTerm = `%${escapeLikeTerm(term)}%`;
+    const headwords = getHeadwordCandidatesForSentenceSearchTerm(term, options);
+    const headwordClause =
+      headwords.length > 0
+        ? `
+        OR EXISTS (
+          SELECT 1
+          FROM imm_word_line_occurrences o
+          JOIN imm_words w ON w.id = o.word_id
+          WHERE o.line_id = l.line_id
+            AND w.headword IN (${headwords.map(() => '?').join(', ')})
+        )
+      `
+        : '';
+    clauses.push(`
+      (
+        l.text LIKE ? ESCAPE '\\'
+        OR v.canonical_title LIKE ? ESCAPE '\\'
+        OR COALESCE(a.canonical_title, '') LIKE ? ESCAPE '\\'
+        ${headwordClause}
+      )
+    `);
+    params.push(likeTerm, likeTerm, likeTerm, ...headwords);
+  }
+
+  return db
+    .prepare(
+      `
+        SELECT
+          l.anime_id AS animeId,
+          a.canonical_title AS animeTitle,
+          l.video_id AS videoId,
+          v.canonical_title AS videoTitle,
+          v.source_path AS sourcePath,
+          l.secondary_text AS secondaryText,
+          l.session_id AS sessionId,
+          l.line_index AS lineIndex,
+          l.segment_start_ms AS segmentStartMs,
+          l.segment_end_ms AS segmentEndMs,
+          l.text AS text
+        FROM imm_subtitle_lines l
+        JOIN imm_videos v ON v.video_id = l.video_id
+        LEFT JOIN imm_anime a ON a.anime_id = l.anime_id
+        WHERE ${clauses.join(' AND ')}
+        ORDER BY l.CREATED_DATE DESC, l.line_id DESC
+        LIMIT ?
+      `,
+    )
+    .all(...params, resolvedLimit) as unknown as SentenceSearchResultRow[];
+}
+
 export function getSessionEvents(
  db: DatabaseSync,
  sessionId: number,
@@ -287,24 +403,38 @@ export function getSimilarWords(db: DatabaseSync, wordId: number, limit = 10): S
    reading: string;
  } | null;
  if (!word || word.headword.trim() === '') return [];
+
+  const clauses: string[] = [];
+  const params: string[] = [];
+  const reading = word.reading.trim();
+  if (reading !== '') {
+    clauses.push('reading = ?');
+    params.push(word.reading);
+  }
+
+  for (const kanji of uniqueKanji(word.headword)) {
+    clauses.push("headword LIKE ? ESCAPE '\\'");
+    params.push(`%${escapeLikeTerm(kanji)}%`);
+  }
+
+  if (clauses.length === 0) return [];
+
+  const orderBy =
+    reading !== '' ? 'CASE WHEN reading = ? THEN 0 ELSE 1 END, frequency DESC' : 'frequency DESC';
+  const orderParams = reading !== '' ? [word.reading] : [];
+
  return db
    .prepare(
      `
    SELECT id AS wordId, headword, word, reading, frequency
    FROM imm_words
    WHERE id != ?
-    AND (reading = ? OR headword LIKE ? OR headword LIKE ?)
-    ORDER BY frequency DESC
+    AND (${clauses.join(' OR ')})
+    ORDER BY ${orderBy}
    LIMIT ?
  `,
    )
-    .all(
-      wordId,
-      word.reading,
-      `%${word.headword.charAt(0)}%`,
-      `%${word.headword.charAt(word.headword.length - 1)}%`,
-      limit,
-    ) as SimilarWordRow[];
+    .all(wordId, ...params, ...orderParams, limit) as SimilarWordRow[];
 }

 export function getKanjiDetail(db: DatabaseSync, kanjiId: number): KanjiDetailRow | null {
@@ -1,9 +1,10 @@
 import { createHash } from 'node:crypto';
 import type { DatabaseSync } from './sqlite';
 import { buildCoverBlobReference, normalizeCoverBlobBytes } from './storage';
-import { rebuildLifetimeSummariesInTransaction } from './lifetime';
-import { rebuildRollupsInTransaction } from './maintenance';
+import { rebuildLifetimeSummaries, rebuildLifetimeSummariesInTransaction } from './lifetime';
+import { getRollupGroupsForSessions, refreshRollupsForGroupsInTransaction } from './maintenance';
 import { nowMs } from './time';
+import { resolveAnimeAnilistConflict } from './anime-season-repair';
 import { PartOfSpeech, type MergedToken } from '../../../types';
 import { shouldExcludeTokenFromVocabularyPersistence } from '../tokenizer/annotation-stage';
 import { deriveStoredPartOfSpeech } from '../tokenizer/part-of-speech';
@@ -425,6 +426,14 @@ export function updateAnimeAnilistInfo(
  } | null;
  if (!row?.anime_id) return;

+  const repair = resolveAnimeAnilistConflict(db, row.anime_id, info.anilistId);
+  const targetRow = db
+    .prepare('SELECT anime_id FROM imm_videos WHERE video_id = ?')
+    .get(videoId) as {
+    anime_id: number | null;
+  } | null;
+  if (!targetRow?.anime_id) return;
+
  db.prepare(
    `
    UPDATE imm_anime
@@ -444,8 +453,11 @@ export function updateAnimeAnilistInfo(
    info.titleNative,
    info.episodesTotal,
    toDbTimestamp(nowMs()),
-    row.anime_id,
+    targetRow.anime_id,
  );
+  if (repair.movedVideos > 0 || repair.deletedAnimeRows > 0) {
+    rebuildLifetimeSummaries(db);
+  }
 }

 export function markVideoWatched(db: DatabaseSync, videoId: number, watched: boolean): void {
@@ -474,13 +486,14 @@ export function deleteSession(db: DatabaseSync, sessionId: number): void {
  const sessionIds = [sessionId];
  const affectedWordIds = getAffectedWordIdsForSessions(db, sessionIds);
  const affectedKanjiIds = getAffectedKanjiIdsForSessions(db, sessionIds);
+  const affectedRollupGroups = getRollupGroupsForSessions(db, sessionIds);

  db.exec('BEGIN IMMEDIATE');
  try {
    deleteSessionsByIds(db, sessionIds);
    refreshLexicalAggregates(db, affectedWordIds, affectedKanjiIds);
    rebuildLifetimeSummariesInTransaction(db);
-    rebuildRollupsInTransaction(db);
+    refreshRollupsForGroupsInTransaction(db, affectedRollupGroups);
    db.exec('COMMIT');
  } catch (error) {
    db.exec('ROLLBACK');
@@ -492,13 +505,14 @@ export function deleteSessions(db: DatabaseSync, sessionIds: number[]): void {
  if (sessionIds.length === 0) return;
  const affectedWordIds = getAffectedWordIdsForSessions(db, sessionIds);
  const affectedKanjiIds = getAffectedKanjiIdsForSessions(db, sessionIds);
+  const affectedRollupGroups = getRollupGroupsForSessions(db, sessionIds);

  db.exec('BEGIN IMMEDIATE');
  try {
    deleteSessionsByIds(db, sessionIds);
    refreshLexicalAggregates(db, affectedWordIds, affectedKanjiIds);
    rebuildLifetimeSummariesInTransaction(db);
-    rebuildRollupsInTransaction(db);
+    refreshRollupsForGroupsInTransaction(db, affectedRollupGroups);
    db.exec('COMMIT');
  } catch (error) {
    db.exec('ROLLBACK');
@@ -536,7 +550,6 @@ export function deleteVideo(db: DatabaseSync, videoId: number): void {
    db.prepare('DELETE FROM imm_videos WHERE video_id = ?').run(videoId);
    refreshLexicalAggregates(db, affectedWordIds, affectedKanjiIds);
    rebuildLifetimeSummariesInTransaction(db);
-    rebuildRollupsInTransaction(db);
    db.exec('COMMIT');
  } catch (error) {
    db.exec('ROLLBACK');
@@ -74,6 +74,8 @@ export interface TrendsDashboardQueryResult {
  };
  ratios: {
    lookupsPerHundred: TrendChartPoint[];
+    cardsPerHour: TrendChartPoint[];
+    readingSpeed: TrendChartPoint[];
  };
  animeCumulative: {
    watchTime: TrendPerAnimePoint[];
@@ -176,11 +178,31 @@ function getTrendSessionWordCount(session: Pick<TrendSessionMetricRow, 'tokensSe
  return session.tokensSeen;
 }

+function looksLikeJellyfinStreamTitle(title: string): boolean {
+  const lowered = title.toLowerCase();
+  const hasApiKey = /api[\s_-]*key(?:\s|=|$)/i.test(title);
+  return (
+    hasApiKey &&
+    (lowered.includes('stream?') ||
+      lowered.includes('/stream?') ||
+      lowered.includes('/videos/') ||
+      lowered.includes('mediasourceid'))
+  );
+}
+
+function sanitizeTrendTitle(title: string): string {
+  const normalized = title.trim();
+  if (!normalized) {
+    return 'Unknown';
+  }
+  return looksLikeJellyfinStreamTitle(normalized) ? 'Jellyfin Video' : normalized;
+}
+
 function resolveTrendAnimeTitle(value: {
  animeTitle: string | null;
  canonicalTitle: string | null;
 }): string {
-  return value.animeTitle ?? value.canonicalTitle ?? 'Unknown';
+  return sanitizeTrendTitle(value.animeTitle ?? value.canonicalTitle ?? 'Unknown');
 }

 function accumulatePoints(points: TrendChartPoint[]): TrendChartPoint[] {
@@ -225,6 +247,26 @@ function buildAggregatedTrendRows(rollups: ImmersionSessionRollupRow[]) {
    }));
 }

+function buildEfficiencyRates(rows: ReturnType<typeof buildAggregatedTrendRows>): {
+  cardsPerHour: TrendChartPoint[];
+  readingSpeed: TrendChartPoint[];
+} {
+  const cardsPerHour: TrendChartPoint[] = [];
+  const readingSpeed: TrendChartPoint[] = [];
+  for (const row of rows) {
+    const hours = row.activeMin / 60;
+    cardsPerHour.push({
+      label: row.label,
+      value: hours > 0 ? +(row.cards / hours).toFixed(1) : 0,
+    });
+    readingSpeed.push({
+      label: row.label,
+      value: row.activeMin > 0 ? +(row.words / row.activeMin).toFixed(1) : 0,
+    });
+  }
+  return { cardsPerHour, readingSpeed };
+}
+
 function buildWatchTimeByDayOfWeek(sessions: TrendSessionMetricRow[]): TrendChartPoint[] {
  const totals = new Array(7).fill(0);
  for (const session of sessions) {
@@ -449,7 +491,7 @@ function getVideoAnimeTitleMap(
    )
    .all(...uniqueIds) as Array<{ videoId: number; animeTitle: string }>;

-  return new Map(rows.map((row) => [row.videoId, row.animeTitle]));
+  return new Map(rows.map((row) => [row.videoId, sanitizeTrendTitle(row.animeTitle)]));
 }

 function resolveVideoAnimeTitle(
@@ -675,6 +717,7 @@ export function getTrendsDashboard(
  );

  const aggregatedRows = buildAggregatedTrendRows(chartRollups);
+  const efficiency = buildEfficiencyRates(aggregatedRows);
  const activity = {
    watchTime: aggregatedRows.map((row) => ({ label: row.label, value: row.activeMin })),
    cards: aggregatedRows.map((row) => ({ label: row.label, value: row.cards })),
@@ -724,6 +767,8 @@ export function getTrendsDashboard(
    },
    ratios: {
      lookupsPerHundred: buildLookupsPerHundredWords(sessions, groupBy),
+      cardsPerHour: efficiency.cardsPerHour,
+      readingSpeed: efficiency.readingSpeed,
    },
    animeCumulative: {
      watchTime: buildCumulativePerAnime(animePerDay.watchTime),
@@ -813,7 +813,7 @@ test('ensureSchema migrates legacy videos and backfills anime metadata from file
      .all() as Array<{ canonical_title: string }>;
    assert.deepEqual(
      animeRows.map((row) => row.canonical_title),
-      ['Frieren', 'Little Witch Academia'],
+      ['Frieren', 'Little Witch Academia Season 2'],
    );

    const littleWitchRows = db
@@ -855,7 +855,7 @@ test('ensureSchema migrates legacy videos and backfills anime metadata from file
      })),
      [
        {
-          animeTitle: 'Little Witch Academia',
+          animeTitle: 'Little Witch Academia Season 2',
          parsedTitle: 'Little Witch Academia',
          parsedBasename: 'Little Witch Academia S02E05.mkv',
          parsedSeason: 2,
@@ -863,7 +863,7 @@ test('ensureSchema migrates legacy videos and backfills anime metadata from file
          parserSource: 'fallback',
        },
        {
-          animeTitle: 'Little Witch Academia',
+          animeTitle: 'Little Witch Academia Season 2',
          parsedTitle: 'Little Witch Academia',
          parsedBasename: 'Little Witch Academia S02E06.mkv',
          parsedSeason: 2,
@@ -23,6 +23,7 @@ export interface TrackerPreparedStatements {
 export interface AnimeRecordInput {
  parsedTitle: string;
  canonicalTitle: string;
+  seasonScope?: number | null;
  anilistId: number | null;
  titleRomaji: string | null;
  titleEnglish: string | null;
@@ -300,6 +301,31 @@ export function normalizeAnimeIdentityKey(title: string): string {
    .replace(/\s+/g, ' ');
 }

+function normalizeSeasonScope(value: number | null | undefined): number | null {
+  if (typeof value !== 'number' || !Number.isSafeInteger(value) || value <= 0) {
+    return null;
+  }
+  return value;
+}
+
+function titleAlreadyHasSeasonScope(title: string, season: number): boolean {
+  const normalized = title.normalize('NFKC').toLowerCase();
+  const padded = String(season).padStart(2, '0');
+  return (
+    new RegExp(`\\bseason\\s*0?${season}\\b`, 'i').test(normalized) ||
+    new RegExp(`\\bs0?${season}\\b`, 'i').test(normalized) ||
+    new RegExp(`\\bs${padded}\\b`, 'i').test(normalized)
+  );
+}
+
+function buildSeasonScopedAnimeTitle(title: string, season: number | null): string {
+  const trimmed = title.trim();
+  if (!trimmed || season === null || titleAlreadyHasSeasonScope(trimmed, season)) {
+    return trimmed;
+  }
+  return `${trimmed} Season ${season}`;
+}
+
 function looksLikeEpisodeOnlyTitle(title: string): boolean {
  const normalized = title.normalize('NFKC').toLowerCase().replace(/\s+/g, ' ').trim();
  return /^(episode|ep)\s*\d{1,3}$/.test(normalized) || /^第\s*\d{1,3}\s*話$/.test(normalized);
@@ -478,7 +504,12 @@ function ensureStatsExcludedWordsTable(db: DatabaseSync): void {
 }

 export function getOrCreateAnimeRecord(db: DatabaseSync, input: AnimeRecordInput): number {
-  const normalizedTitleKey = normalizeAnimeIdentityKey(input.parsedTitle);
+  const seasonScope = normalizeSeasonScope(input.seasonScope);
+  const identityTitle = buildSeasonScopedAnimeTitle(input.parsedTitle, seasonScope);
+  const canonicalTitle =
+    buildSeasonScopedAnimeTitle(input.canonicalTitle || input.parsedTitle, seasonScope) ||
+    identityTitle;
+  const normalizedTitleKey = normalizeAnimeIdentityKey(identityTitle);
  if (!normalizedTitleKey) {
    throw new Error('parsedTitle is required to create or update an anime record');
  }
@@ -508,7 +539,7 @@ export function getOrCreateAnimeRecord(db: DatabaseSync, input: AnimeRecordInput
        WHERE anime_id = ?
      `,
    ).run(
-      input.canonicalTitle,
+      canonicalTitle,
      input.anilistId,
      input.titleRomaji,
      input.titleEnglish,
@@ -539,7 +570,7 @@ export function getOrCreateAnimeRecord(db: DatabaseSync, input: AnimeRecordInput
    )
    .run(
      normalizedTitleKey,
-      input.canonicalTitle,
+      canonicalTitle,
      input.anilistId,
      input.titleRomaji,
      input.titleEnglish,
@@ -648,6 +679,7 @@ function migrateLegacyAnimeMetadata(db: DatabaseSync): void {
    const animeId = getOrCreateAnimeRecord(db, {
      parsedTitle: parsed.title,
      canonicalTitle: parsed.title,
+      seasonScope: parsed.season,
      anilistId: null,
      titleRomaji: null,
      titleEnglish: null,
@@ -52,6 +52,11 @@ export interface ImmersionTrackerPolicy {
  };
 }

+export interface JellyfinLinkRepairSummary {
+  scanned: number;
+  repaired: number;
+}
+
 export interface TelemetryAccumulator {
  totalWatchedMs: number;
  activeWatchedMs: number;
@@ -367,6 +372,29 @@ export interface KanjiOccurrenceRow {
  occurrenceCount: number;
 }

+export interface SentenceSearchResultRow {
+  animeId: number | null;
+  animeTitle: string | null;
+  videoId: number;
+  videoTitle: string;
+  sourcePath: string | null;
+  secondaryText: string | null;
+  sessionId: number;
+  lineIndex: number;
+  segmentStartMs: number | null;
+  segmentEndMs: number | null;
+  text: string;
+}
+
+export interface SentenceSearchHeadwordTerm {
+  term: string;
+  headwords: string[];
+}
+
+export interface SentenceSearchOptions {
+  headwordTerms?: SentenceSearchHeadwordTerm[];
+}
+
 export interface SessionEventRow {
  eventType: number;
  tsMs: number;
@@ -235,6 +235,27 @@ test('dispatchMpvProtocolMessage prefers the already selected matching secondary
  assert.deepEqual(state.commands, [{ command: ['set_property', 'secondary-sid', 3] }]);
 });

+test('dispatchMpvProtocolMessage skips signs and songs when choosing secondary subtitles', async () => {
+  const { deps, state } = createDeps({
+    getResolvedConfig: () => ({
+      secondarySub: { secondarySubLanguages: ['eng', 'en'] },
+    }),
+  });
+
+  await dispatchMpvProtocolMessage(
+    {
+      request_id: MPV_REQUEST_ID_TRACK_LIST_SECONDARY,
+      data: [
+        { type: 'sub', id: 2, lang: 'eng', title: 'English Signs & Songs' },
+        { type: 'sub', id: 3, lang: 'eng', title: 'English Dialogue' },
+      ],
+    },
+    deps,
+  );
+
+  assert.deepEqual(state.commands, [{ command: ['set_property', 'secondary-sid', 3] }]);
+});
+
 test('dispatchMpvProtocolMessage restores secondary visibility on shutdown', async () => {
  const { deps, state } = createDeps();

@@ -149,6 +149,11 @@ function getSubtitleTrackIdentity(track: SubtitleTrackCandidate): string {
  return `id:${track.id}`;
 }

+function isSignsOrSongsSubtitleTrack(track: SubtitleTrackCandidate): boolean {
+  const label = `${track.title} ${track.externalFilename ?? ''}`.toLowerCase();
+  return /\b(signs?|songs?)\b/.test(label);
+}
+
 function pickSecondarySubtitleTrackId(
  tracks: Array<Record<string, unknown>>,
  preferredLanguages: string[],
@@ -177,12 +182,19 @@ function pickSecondarySubtitleTrackId(
  const uniqueTracks = [...dedupedTracks.values()];

  for (const language of normalizedLanguages) {
-    const selectedMatch = uniqueTracks.find((track) => track.selected && track.lang === language);
+    const languageTracks = uniqueTracks.filter((track) => track.lang === language);
+    if (languageTracks.length === 0) {
+      continue;
+    }
+    const cleanTracks = languageTracks.filter((track) => !isSignsOrSongsSubtitleTrack(track));
+    const candidateTracks = cleanTracks.length > 0 ? cleanTracks : languageTracks;
+
+    const selectedMatch = candidateTracks.find((track) => track.selected);
    if (selectedMatch) {
      return selectedMatch.id;
    }

-    const match = uniqueTracks.find((track) => track.lang === language);
+    const match = candidateTracks[0];
    if (match) {
      return match.id;
    }
@@ -7,6 +7,22 @@ test('normalizeOverlayWindowBoundsForPlatform returns original geometry outside
  assert.deepEqual(normalizeOverlayWindowBoundsForPlatform(geometry, 'linux', null), geometry);
 });

+test('normalizeOverlayWindowBoundsForPlatform compensates Linux content insets', () => {
+  assert.deepEqual(
+    normalizeOverlayWindowBoundsForPlatform(
+      { x: 0, y: 0, width: 3440, height: 1440 },
+      'linux',
+      null,
+      {
+        isDestroyed: () => false,
+        getBounds: () => ({ x: 0, y: 0, width: 3440, height: 1440 }),
+        getContentBounds: () => ({ x: 0, y: 14, width: 3440, height: 1426 }),
+      },
+    ),
+    { x: 0, y: -14, width: 3440, height: 1454 },
+  );
+});
+
 test('normalizeOverlayWindowBoundsForPlatform returns original geometry on Windows when screen is unavailable', () => {
  const geometry = { x: 150, y: 90, width: 1200, height: 675 };
  assert.deepEqual(normalizeOverlayWindowBoundsForPlatform(geometry, 'win32', null), geometry);
@@ -7,11 +7,56 @@ type ScreenDipConverter = {
  ) => Electron.Rectangle;
 };

+type ContentBoundsWindow = {
+  isDestroyed: () => boolean;
+  getBounds: () => Electron.Rectangle;
+  getContentBounds: () => Electron.Rectangle;
+};
+
+function resolveContentAlignedBounds(
+  geometry: WindowGeometry,
+  window?: ContentBoundsWindow | null,
+): WindowGeometry {
+  if (!window || window.isDestroyed()) {
+    return geometry;
+  }
+
+  let outer: Electron.Rectangle;
+  let content: Electron.Rectangle;
+  try {
+    outer = window.getBounds();
+    content = window.getContentBounds();
+  } catch {
+    return geometry;
+  }
+
+  const leftInset = content.x - outer.x;
+  const topInset = content.y - outer.y;
+  const rightInset = outer.x + outer.width - (content.x + content.width);
+  const bottomInset = outer.y + outer.height - (content.y + content.height);
+  const insets = [leftInset, topInset, rightInset, bottomInset];
+  if (insets.some((inset) => !Number.isFinite(inset) || inset < 0)) {
+    return geometry;
+  }
+
+  return {
+    x: geometry.x - leftInset,
+    y: geometry.y - topInset,
+    width: geometry.width + leftInset + rightInset,
+    height: geometry.height + topInset + bottomInset,
+  };
+}
+
 export function normalizeOverlayWindowBoundsForPlatform(
  geometry: WindowGeometry,
  platform: NodeJS.Platform,
  screen: ScreenDipConverter | null,
+  window?: ContentBoundsWindow | null,
 ): WindowGeometry {
+  if (platform === 'linux') {
+    return resolveContentAlignedBounds(geometry, window);
+  }
+
  if (platform !== 'win32' || !screen) {
    return geometry;
  }
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { ensureOverlayWindowLevel } from './overlay-window';
+import { ensureOverlayWindowLevel, updateOverlayWindowBounds } from './overlay-window';
 import {
  handleOverlayWindowBeforeInputEvent,
  handleOverlayWindowBlurred,
@@ -288,3 +288,37 @@ test('ensureOverlayWindowLevel promotes Linux overlay above fullscreen mpv witho
    'move-top',
  ]);
 });
+
+test('updateOverlayWindowBounds aligns Linux overlay content bounds to mpv geometry', () => {
+  const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform');
+  const originalHyprlandSignature = process.env.HYPRLAND_INSTANCE_SIGNATURE;
+  Object.defineProperty(process, 'platform', {
+    configurable: true,
+    value: 'linux',
+  });
+  delete process.env.HYPRLAND_INSTANCE_SIGNATURE;
+
+  const calls: Array<{ x: number; y: number; width: number; height: number }> = [];
+  try {
+    updateOverlayWindowBounds({ x: 0, y: 0, width: 3440, height: 1440 }, {
+      isDestroyed: () => false,
+      getTitle: () => 'SubMiner Overlay',
+      getBounds: () => ({ x: 0, y: 0, width: 3440, height: 1440 }),
+      getContentBounds: () => ({ x: 0, y: 14, width: 3440, height: 1426 }),
+      setBounds: (bounds: { x: number; y: number; width: number; height: number }) => {
+        calls.push(bounds);
+      },
+    } as never);
+  } finally {
+    if (originalPlatformDescriptor) {
+      Object.defineProperty(process, 'platform', originalPlatformDescriptor);
+    }
+    if (originalHyprlandSignature === undefined) {
+      delete process.env.HYPRLAND_INSTANCE_SIGNATURE;
+    } else {
+      process.env.HYPRLAND_INSTANCE_SIGNATURE = originalHyprlandSignature;
+    }
+  }
+
+  assert.deepEqual(calls, [{ x: 0, y: -14, width: 3440, height: 1454 }]);
+});
@@ -56,7 +56,12 @@ export function updateOverlayWindowBounds(
  } = {},
 ): void {
  if (!geometry || !window || window.isDestroyed()) return;
-  const bounds = normalizeOverlayWindowBoundsForPlatform(geometry, process.platform, screen);
+  const bounds = normalizeOverlayWindowBoundsForPlatform(
+    geometry,
+    process.platform,
+    screen,
+    window,
+  );
  window.setBounds(bounds);
  ensureHyprlandWindowFloatingByTitle({
    title: window.getTitle(),
@@ -0,0 +1,484 @@
+import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { runCommand, type CommandResult } from '../../subsync/utils';
+import { parseSubtitleCues, type SubtitleCue } from './subtitle-cue-parser.js';
+import { isEnglishYoutubeLang, normalizeYoutubeLangCode } from './youtube/labels.js';
+
+const DEFAULT_SECONDARY_SUBTITLE_LANGUAGES = ['en', 'eng', 'english', 'en-us', 'enus'];
+const DEFAULT_PRIMARY_SUBTITLE_LANGUAGES = ['ja', 'jpn', 'jp', 'japanese'];
+const SUPPORTED_SUBTITLE_EXTENSIONS = new Set(['.srt', '.vtt', '.ass', '.ssa']);
+const TIMING_TOLERANCE_SECONDS = 0.25;
+const SAME_TIMING_EPSILON_SECONDS = 0.001;
+const RETIMED_SUBTITLE_TIMEOUT_MS = 30_000;
+const FALLBACK_ALASS_PATHS = [
+  '/opt/homebrew/bin/alass-cli',
+  '/opt/homebrew/bin/alass',
+  '/usr/local/bin/alass-cli',
+  '/usr/local/bin/alass',
+  '/usr/bin/alass',
+];
+
+type SidecarCandidate = {
+  path: string;
+  languageRank: number;
+  extensionRank: number;
+  name: string;
+};
+
+type RetimedSubtitleCacheEntry = {
+  path: string;
+  cleanupDir: string;
+  promise?: Promise<string>;
+};
+
+export type RetimedSubtitleCommandRunner = (
+  alassPath: string,
+  referencePath: string,
+  inputPath: string,
+  outputPath: string,
+) => Promise<CommandResult>;
+
+export type RetimedSecondarySubtitleInput = {
+  sourcePath: string;
+  startMs: number;
+  endMs: number;
+  languages?: readonly string[];
+  primaryLanguages?: readonly string[];
+  alassPath?: string | null;
+  runAlass?: RetimedSubtitleCommandRunner;
+};
+
+const retimedSubtitleCache = new Map<string, RetimedSubtitleCacheEntry>();
+let retimedSubtitleCleanupRegistered = false;
+
+function unique(values: string[]): string[] {
+  return values.filter((value, index) => value.length > 0 && values.indexOf(value) === index);
+}
+
+function expandPreferredLanguages(
+  languages: readonly string[] | undefined,
+  fallback: readonly string[],
+): string[] {
+  const normalized = unique(
+    (languages ?? []).map((language) => normalizeYoutubeLangCode(language)).filter(Boolean),
+  );
+  const base = normalized.length > 0 ? normalized : [...fallback];
+  const expanded: string[] = [];
+  for (const language of base) {
+    expanded.push(language);
+    if (isEnglishYoutubeLang(language)) {
+      expanded.push(...DEFAULT_SECONDARY_SUBTITLE_LANGUAGES);
+    }
+  }
+  return unique(expanded);
+}
+
+function isExecutableFile(filePath: string): boolean {
+  try {
+    return statSync(filePath).isFile();
+  } catch {
+    return false;
+  }
+}
+
+function pathEntries(): string[] {
+  const entries = (process.env.PATH ?? '')
+    .split(path.delimiter)
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+  return unique([...entries, ...FALLBACK_ALASS_PATHS.map((candidate) => path.dirname(candidate))]);
+}
+
+function executableNames(name: string): string[] {
+  if (process.platform !== 'win32') return [name];
+  const extensions = (process.env.PATHEXT ?? '.EXE;.CMD;.BAT')
+    .split(';')
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+  if (path.extname(name)) return [name];
+  return [name, ...extensions.map((extension) => `${name}${extension}`)];
+}
+
+function findExecutable(names: readonly string[]): string {
+  for (const name of names) {
+    if (path.dirname(name) !== '.') {
+      return isExecutableFile(name) ? name : '';
+    }
+  }
+
+  for (const dir of pathEntries()) {
+    for (const name of names) {
+      for (const executableName of executableNames(name)) {
+        const candidate = path.join(dir, executableName);
+        if (isExecutableFile(candidate)) return candidate;
+      }
+    }
+  }
+
+  for (const candidate of FALLBACK_ALASS_PATHS) {
+    if (isExecutableFile(candidate)) return candidate;
+  }
+
+  return '';
+}
+
+function resolveAlassPath(configuredPath: string | null | undefined): string {
+  const trimmed = configuredPath?.trim() ?? '';
+  if (trimmed) {
+    return findExecutable([trimmed]);
+  }
+  return findExecutable(['alass', 'alass-cli']);
+}
+
+function fileSignature(filePath: string): string | null {
+  try {
+    const stats = statSync(filePath);
+    if (!stats.isFile()) return null;
+    return `${stats.size}:${stats.mtimeMs}`;
+  } catch {
+    return null;
+  }
+}
+
+function retimedCacheKey(
+  alassPath: string,
+  primaryPath: string,
+  secondaryPath: string,
+): string | null {
+  const primarySignature = fileSignature(primaryPath);
+  const secondarySignature = fileSignature(secondaryPath);
+  if (!primarySignature || !secondarySignature) return null;
+  return [alassPath, primaryPath, primarySignature, secondaryPath, secondarySignature].join('\0');
+}
+
+function cleanupRetimedSubtitleCache(): void {
+  for (const entry of retimedSubtitleCache.values()) {
+    try {
+      rmSync(entry.cleanupDir, { recursive: true, force: true });
+    } catch {
+      // Best-effort temp cleanup.
+    }
+  }
+  retimedSubtitleCache.clear();
+}
+
+function registerRetimedSubtitleCleanup(): void {
+  if (retimedSubtitleCleanupRegistered) return;
+  retimedSubtitleCleanupRegistered = true;
+  process.once('exit', cleanupRetimedSubtitleCache);
+}
+
+export function clearRetimedSecondarySubtitleCache(): void {
+  cleanupRetimedSubtitleCache();
+}
+
+function splitLanguageSuffix(value: string): string[] {
+  const normalizedWhole = normalizeYoutubeLangCode(value);
+  const tokens = value
+    .split(/[^A-Za-z0-9-]+/g)
+    .map((token) => normalizeYoutubeLangCode(token))
+    .filter(Boolean);
+  return unique([normalizedWhole, ...tokens]);
+}
+
+function languageTokenMatches(token: string, preferredLanguage: string): boolean {
+  if (token === preferredLanguage) {
+    return true;
+  }
+  if (token.startsWith(`${preferredLanguage}-`) || preferredLanguage.startsWith(`${token}-`)) {
+    return true;
+  }
+  return isEnglishYoutubeLang(token) && isEnglishYoutubeLang(preferredLanguage);
+}
+
+function resolveLanguageRank(suffix: string, preferredLanguages: string[]): number {
+  const tokens = splitLanguageSuffix(suffix);
+  for (let index = 0; index < preferredLanguages.length; index += 1) {
+    const preferredLanguage = preferredLanguages[index]!;
+    if (tokens.some((token) => languageTokenMatches(token, preferredLanguage))) {
+      return index;
+    }
+  }
+  return Number.POSITIVE_INFINITY;
+}
+
+function extensionRank(ext: string): number {
+  if (ext === '.srt') return 0;
+  if (ext === '.vtt') return 1;
+  if (ext === '.ass') return 2;
+  if (ext === '.ssa') return 3;
+  return 4;
+}
+
+function findSidecarSubtitleCandidates(
+  sourcePath: string,
+  preferredLanguages: string[],
+): SidecarCandidate[] {
+  const source = path.parse(sourcePath);
+  let entries: string[];
+  try {
+    entries = readdirSync(source.dir);
+  } catch {
+    return [];
+  }
+
+  const prefix = `${source.name}.`;
+  return entries
+    .map((entry) => {
+      const parsed = path.parse(entry);
+      const ext = parsed.ext.toLowerCase();
+      if (!SUPPORTED_SUBTITLE_EXTENSIONS.has(ext) || !parsed.name.startsWith(prefix)) {
+        return null;
+      }
+      const suffix = parsed.name.slice(prefix.length);
+      const languageRank = resolveLanguageRank(suffix, preferredLanguages);
+      if (!Number.isFinite(languageRank)) {
+        return null;
+      }
+      return {
+        path: path.join(source.dir, entry),
+        languageRank,
+        extensionRank: extensionRank(ext),
+        name: entry,
+      };
+    })
+    .filter((candidate): candidate is SidecarCandidate => candidate !== null)
+    .sort((left, right) => {
+      if (left.languageRank !== right.languageRank) return left.languageRank - right.languageRank;
+      if (left.extensionRank !== right.extensionRank)
+        return left.extensionRank - right.extensionRank;
+      return left.name.localeCompare(right.name);
+    });
+}
+
+function combineCueText(cues: SubtitleCue[]): string {
+  return unique(cues.map((cue) => cue.text.trim()).filter(Boolean))
+    .join('\n')
+    .trim();
+}
+
+function overlapSeconds(cue: SubtitleCue, startSeconds: number, endSeconds: number): number {
+  return (
+    Math.min(cue.endTime, endSeconds + TIMING_TOLERANCE_SECONDS) -
+    Math.max(cue.startTime, startSeconds - TIMING_TOLERANCE_SECONDS)
+  );
+}
+
+function isSameCueTiming(left: SubtitleCue, right: SubtitleCue): boolean {
+  return (
+    Math.abs(left.startTime - right.startTime) <= SAME_TIMING_EPSILON_SECONDS &&
+    Math.abs(left.endTime - right.endTime) <= SAME_TIMING_EPSILON_SECONDS
+  );
+}
+
+function compareCueTimingMatch(
+  startSeconds: number,
+  endSeconds: number,
+  left: { cue: SubtitleCue; overlap: number },
+  right: { cue: SubtitleCue; overlap: number },
+): number {
+  if (left.overlap !== right.overlap) {
+    return right.overlap - left.overlap;
+  }
+
+  const leftStartDistance = Math.abs(left.cue.startTime - startSeconds);
+  const rightStartDistance = Math.abs(right.cue.startTime - startSeconds);
+  if (leftStartDistance !== rightStartDistance) {
+    return leftStartDistance - rightStartDistance;
+  }
+
+  const leftEndDistance = Math.abs(left.cue.endTime - endSeconds);
+  const rightEndDistance = Math.abs(right.cue.endTime - endSeconds);
+  if (leftEndDistance !== rightEndDistance) {
+    return leftEndDistance - rightEndDistance;
+  }
+
+  return left.cue.startTime - right.cue.startTime;
+}
+
+function findCueTextAtTiming(cues: SubtitleCue[], startMs: number, endMs: number): string {
+  const startSeconds = startMs / 1000;
+  const endSeconds = endMs / 1000;
+  const midpointSeconds = (startSeconds + endSeconds) / 2;
+
+  const midpointMatches = cues
+    .filter(
+      (cue) =>
+        cue.startTime - TIMING_TOLERANCE_SECONDS <= midpointSeconds &&
+        cue.endTime + TIMING_TOLERANCE_SECONDS >= midpointSeconds,
+    )
+    .map((cue) => ({ cue, overlap: overlapSeconds(cue, startSeconds, endSeconds) }))
+    .sort((left, right) => compareCueTimingMatch(startSeconds, endSeconds, left, right));
+  const [bestMidpointMatch] = midpointMatches;
+  const midpointText = bestMidpointMatch
+    ? combineCueText(
+        midpointMatches
+          .filter((match) => isSameCueTiming(match.cue, bestMidpointMatch.cue))
+          .map((match) => match.cue),
+      )
+    : '';
+  if (midpointText) {
+    return midpointText;
+  }
+
+  const [bestOverlap] = cues
+    .map((cue) => ({ cue, overlap: overlapSeconds(cue, startSeconds, endSeconds) }))
+    .filter((entry) => entry.overlap > 0)
+    .sort((left, right) => compareCueTimingMatch(startSeconds, endSeconds, left, right));
+  return bestOverlap ? bestOverlap.cue.text.trim() : '';
+}
+
+function readCueTextAtTiming(filePath: string, startMs: number, endMs: number): string {
+  const content = readFileSync(filePath, 'utf8');
+  const cues = parseSubtitleCues(content, filePath);
+  return findCueTextAtTiming(cues, startMs, endMs);
+}
+
+async function defaultRunAlass(
+  alassPath: string,
+  referencePath: string,
+  inputPath: string,
+  outputPath: string,
+): Promise<CommandResult> {
+  return runCommand(alassPath, [referencePath, inputPath, outputPath], RETIMED_SUBTITLE_TIMEOUT_MS);
+}
+
+async function retimeSecondarySubtitle(input: {
+  alassPath: string;
+  primaryPath: string;
+  secondaryPath: string;
+  runAlass: RetimedSubtitleCommandRunner;
+}): Promise<string> {
+  const key = retimedCacheKey(input.alassPath, input.primaryPath, input.secondaryPath);
+  if (!key) return '';
+
+  const cached = retimedSubtitleCache.get(key);
+  if (cached?.promise) {
+    return cached.promise;
+  }
+  if (cached && existsSync(cached.path)) {
+    return cached.path;
+  }
+  if (cached) {
+    retimedSubtitleCache.delete(key);
+    try {
+      rmSync(cached.cleanupDir, { recursive: true, force: true });
+    } catch {}
+  }
+
+  registerRetimedSubtitleCleanup();
+  const cleanupDir = mkdtempSync(path.join(os.tmpdir(), 'subminer-retimed-secondary-'));
+  const parsedSecondary = path.parse(input.secondaryPath);
+  const outputPath = path.join(
+    cleanupDir,
+    `${parsedSecondary.name}.retimed${parsedSecondary.ext || '.srt'}`,
+  );
+
+  const entry: RetimedSubtitleCacheEntry = { path: outputPath, cleanupDir };
+  entry.promise = input
+    .runAlass(input.alassPath, input.primaryPath, input.secondaryPath, outputPath)
+    .then((result) => {
+      if (!result.ok || !existsSync(outputPath)) {
+        rmSync(cleanupDir, { recursive: true, force: true });
+        retimedSubtitleCache.delete(key);
+        return '';
+      }
+      entry.promise = undefined;
+      return outputPath;
+    })
+    .catch(() => {
+      rmSync(cleanupDir, { recursive: true, force: true });
+      retimedSubtitleCache.delete(key);
+      return '';
+    });
+  retimedSubtitleCache.set(key, entry);
+  return entry.promise;
+}
+
+export function resolveSecondarySubtitleTextFromSidecar(input: {
+  sourcePath: string;
+  startMs: number;
+  endMs: number;
+  languages?: readonly string[];
+}): string {
+  if (!input.sourcePath || !existsSync(input.sourcePath)) {
+    return '';
+  }
+  try {
+    if (!statSync(input.sourcePath).isFile()) {
+      return '';
+    }
+  } catch {
+    return '';
+  }
+
+  const preferredLanguages = expandPreferredLanguages(
+    input.languages,
+    DEFAULT_SECONDARY_SUBTITLE_LANGUAGES,
+  );
+  const candidates = findSidecarSubtitleCandidates(input.sourcePath, preferredLanguages);
+  for (const candidate of candidates) {
+    try {
+      const text = readCueTextAtTiming(candidate.path, input.startMs, input.endMs);
+      if (text) {
+        return text;
+      }
+    } catch {
+      // Try the next matching sidecar.
+    }
+  }
+
+  return '';
+}
+
+export async function resolveRetimedSecondarySubtitleTextFromSidecar(
+  input: RetimedSecondarySubtitleInput,
+): Promise<string> {
+  if (!input.sourcePath || !existsSync(input.sourcePath)) {
+    return '';
+  }
+  try {
+    if (!statSync(input.sourcePath).isFile()) {
+      return '';
+    }
+  } catch {
+    return '';
+  }
+
+  const alassPath = resolveAlassPath(input.alassPath);
+  if (!alassPath) return '';
+
+  const primaryLanguages = expandPreferredLanguages(
+    input.primaryLanguages,
+    DEFAULT_PRIMARY_SUBTITLE_LANGUAGES,
+  );
+  const secondaryLanguages = expandPreferredLanguages(
+    input.languages,
+    DEFAULT_SECONDARY_SUBTITLE_LANGUAGES,
+  );
+  const primaryCandidates = findSidecarSubtitleCandidates(input.sourcePath, primaryLanguages);
+  const secondaryCandidates = findSidecarSubtitleCandidates(input.sourcePath, secondaryLanguages);
+  const runAlass = input.runAlass ?? defaultRunAlass;
+
+  for (const primary of primaryCandidates) {
+    for (const secondary of secondaryCandidates) {
+      if (primary.path === secondary.path) continue;
+      try {
+        const retimedPath = await retimeSecondarySubtitle({
+          alassPath,
+          primaryPath: primary.path,
+          secondaryPath: secondary.path,
+          runAlass,
+        });
+        if (!retimedPath) continue;
+        const text = readCueTextAtTiming(retimedPath, input.startMs, input.endMs);
+        if (text) return text;
+      } catch {
+        // Try the next sidecar pair.
+      }
+    }
+  }
+
+  return '';
+}
@@ -1,5 +1,6 @@
 import { Hono } from 'hono';
 import type { ImmersionTrackerService } from './immersion-tracker-service.js';
+import { splitSentenceSearchTerms } from './immersion-tracker/query-lexical.js';
 import http, { type IncomingMessage, type ServerResponse } from 'node:http';
 import { basename, extname, resolve, sep } from 'node:path';
 import { readFileSync, existsSync, statSync } from 'node:fs';
@@ -7,6 +8,7 @@ import { Readable } from 'node:stream';
 import { MediaGenerator } from '../../media-generator.js';
 import { AnkiConnectClient } from '../../anki-connect.js';
 import type { AnkiConnectConfig } from '../../types.js';
+import { createLogger } from '../../logger.js';
 import {
  getConfiguredSentenceFieldName,
  getConfiguredTranslationFieldName,
@@ -15,18 +17,50 @@ import {
 } from '../../anki-field-config.js';
 import { resolveAnimatedImageLeadInSeconds } from '../../anki-integration/animated-image-sync.js';
 import type { AnilistRateLimiter } from './anilist/rate-limiter.js';
+import {
+  resolveRetimedSecondarySubtitleTextFromSidecar,
+  resolveSecondarySubtitleTextFromSidecar,
+  type RetimedSecondarySubtitleInput,
+} from './secondary-subtitle-sidecar.js';

 type StatsServerNoteInfo = {
  noteId: number;
  fields: Record<string, { value: string }>;
 };

+type StatsServerMediaGenerator = {
+  generateAudio: (...args: Parameters<MediaGenerator['generateAudio']>) => Promise<Buffer | null>;
+  generateScreenshot: (
+    ...args: Parameters<MediaGenerator['generateScreenshot']>
+  ) => Promise<Buffer | null>;
+  generateAnimatedImage: (
+    ...args: Parameters<MediaGenerator['generateAnimatedImage']>
+  ) => Promise<Buffer | null>;
+};
+
+export type StatsMiningTimingEvent = {
+  mode: 'word' | 'sentence' | 'audio';
+  phase: string;
+  elapsedMs: number;
+  noteId?: number;
+};
+
 type StatsExcludedWordPayload = {
  headword: string;
  word: string;
  reading: string;
 };

+type StatsCoverImagePayload = {
+  contentType: string;
+  dataUrl: string;
+} | null;
+
+type StatsCoverBatchBody = {
+  animeIds?: unknown;
+  videoIds?: unknown;
+};
+
 function parseIntQuery(raw: string | undefined, fallback: number, maxLimit?: number): number {
  if (raw === undefined) return fallback;
  const n = Number(raw);
@@ -73,6 +107,62 @@ function parseExcludedWordsBody(body: unknown): StatsExcludedWordPayload[] | nul
  return words;
 }

+function parsePositiveIdList(raw: unknown, maxItems = 100): number[] {
+  if (!Array.isArray(raw)) return [];
+
+  const ids = new Set<number>();
+  for (const rawId of raw) {
+    const id = typeof rawId === 'number' ? rawId : typeof rawId === 'string' ? Number(rawId) : NaN;
+    if (Number.isFinite(id) && id > 0) {
+      ids.add(Math.floor(id));
+      if (ids.size >= maxItems) break;
+    }
+  }
+
+  return Array.from(ids).sort((a, b) => a - b);
+}
+
+function coverImagePayload(
+  art: { coverBlob?: Uint8Array | null } | null | undefined,
+): StatsCoverImagePayload {
+  if (!art?.coverBlob) return null;
+  const bytes = new Uint8Array(art.coverBlob);
+  const contentType = detectImageContentType(bytes);
+  return {
+    contentType,
+    dataUrl: `data:${contentType};base64,${Buffer.from(bytes).toString('base64')}`,
+  };
+}
+
+function detectImageContentType(bytes: Uint8Array): string {
+  if (
+    bytes.length >= 8 &&
+    bytes[0] === 0x89 &&
+    bytes[1] === 0x50 &&
+    bytes[2] === 0x4e &&
+    bytes[3] === 0x47
+  ) {
+    return 'image/png';
+  }
+  if (bytes.length >= 3 && bytes[0] === 0xff && bytes[1] === 0xd8 && bytes[2] === 0xff) {
+    return 'image/jpeg';
+  }
+  if (
+    bytes.length >= 12 &&
+    bytes[0] === 0x52 &&
+    bytes[1] === 0x49 &&
+    bytes[2] === 0x46 &&
+    bytes[3] === 0x46 &&
+    bytes[8] === 0x57 &&
+    bytes[9] === 0x45 &&
+    bytes[10] === 0x42 &&
+    bytes[11] === 0x50
+  ) {
+    return 'image/webp';
+  }
+  return 'application/octet-stream';
+}
+
 function resolveStatsNoteFieldName(
  noteInfo: StatsServerNoteInfo,
  ...preferredNames: (string | undefined)[]
@@ -87,6 +177,57 @@ function resolveStatsNoteFieldName(
  return null;
 }

+function uniqueFieldNames(...fieldNames: (string | null | undefined)[]): string[] {
+  const seen = new Set<string>();
+  const result: string[] = [];
+  for (const fieldName of fieldNames) {
+    const normalized = fieldName?.trim();
+    if (!normalized) continue;
+    const key = normalized.toLowerCase();
+    if (seen.has(key)) continue;
+    seen.add(key);
+    result.push(normalized);
+  }
+  return result;
+}
+
+function getStatsWordMiningAudioFieldName(
+  ankiConfig: AnkiConnectConfig,
+  noteInfo: StatsServerNoteInfo | null,
+): string {
+  return (
+    (noteInfo
+      ? resolveStatsNoteFieldName(noteInfo, 'SentenceAudio', ankiConfig.fields?.audio)
+      : null) ??
+    ankiConfig.fields?.audio ??
+    'ExpressionAudio'
+  );
+}
+
+function getStatsDirectMiningAudioFieldNames(
+  ankiConfig: AnkiConnectConfig,
+  noteInfo: StatsServerNoteInfo | null,
+  mode: 'sentence' | 'audio',
+): string[] {
+  const configuredAudioField = ankiConfig.fields?.audio ?? 'ExpressionAudio';
+  if (!ankiConfig.isLapis?.enabled && !ankiConfig.isKiku?.enabled) {
+    return [configuredAudioField];
+  }
+
+  const sentenceAudioField = noteInfo
+    ? resolveStatsNoteFieldName(noteInfo, 'SentenceAudio', configuredAudioField)
+    : 'SentenceAudio';
+  const expressionAudioField = noteInfo
+    ? resolveStatsNoteFieldName(noteInfo, configuredAudioField)
+    : configuredAudioField;
+
+  if (mode === 'sentence') {
+    return uniqueFieldNames(sentenceAudioField);
+  }
+
+  return uniqueFieldNames(sentenceAudioField, expressionAudioField);
+}
+
 function toFetchHeaders(headers: IncomingMessage['headers']): Headers {
  const fetchHeaders = new Headers();
  for (const [name, value] of Object.entries(headers)) {
@@ -256,9 +397,19 @@ export interface StatsServerConfig {
  knownWordCachePath?: string;
  mpvSocketPath?: string;
  ankiConnectConfig?: AnkiConnectConfig;
+  getAnkiConnectConfig?: () => AnkiConnectConfig | undefined;
+  getYomitanAnkiDeckName?: () => Promise<string | null | undefined> | string | null | undefined;
+  secondarySubtitleLanguages?: string[];
+  getSecondarySubtitleLanguages?: () => string[] | undefined;
+  statsMiningAlassPath?: string;
+  getStatsMiningAlassPath?: () => string | null | undefined;
+  resolveRetimedSecondarySubtitleText?: (
+    input: RetimedSecondarySubtitleInput,
+  ) => Promise<string> | string;
  anilistRateLimiter?: AnilistRateLimiter;
  addYomitanNote?: (word: string) => Promise<number | null>;
  resolveAnkiNoteId?: (noteId: number) => number;
+  resolveSentenceSearchHeadwords?: (term: string) => Promise<string[]> | string[];
 }

 const STATS_STATIC_CONTENT_TYPES: Record<string, string> = {
@@ -279,6 +430,52 @@ const STATS_STATIC_CONTENT_TYPES: Record<string, string> = {
  '.woff2': 'font/woff2',
 };
 const ANKI_CONNECT_FETCH_TIMEOUT_MS = 3_000;
+const statsMiningLogger = createLogger('stats:mining');
+
+function defaultNowMs(): number {
+  return Date.now();
+}
+
+function parseBooleanQuery(raw: string | undefined, fallback: boolean): boolean {
+  if (raw === undefined) return fallback;
+  const normalized = raw.trim().toLowerCase();
+  if (!normalized) return fallback;
+  return !['0', 'false', 'no', 'off'].includes(normalized);
+}
+
+function uniqueNonEmptyStrings(values: readonly string[]): string[] {
+  const seen = new Set<string>();
+  const result: string[] = [];
+  for (const value of values) {
+    const normalized = value.trim();
+    if (!normalized || seen.has(normalized)) continue;
+    seen.add(normalized);
+    result.push(normalized);
+  }
+  return result;
+}
+
+async function buildSentenceSearchOptions(
+  query: string,
+  searchByHeadword: boolean,
+  resolveSentenceSearchHeadwords: ((term: string) => Promise<string[]> | string[]) | undefined,
+): Promise<{ headwordTerms: Array<{ term: string; headwords: string[] }> } | undefined> {
+  if (!searchByHeadword) return undefined;
+
+  const terms = splitSentenceSearchTerms(query);
+  const headwordTerms: Array<{ term: string; headwords: string[] }> = [];
+  for (const term of terms) {
+    const resolved = resolveSentenceSearchHeadwords
+      ? await resolveSentenceSearchHeadwords(term)
+      : [term];
+    const headwords = uniqueNonEmptyStrings(resolved);
+    if (headwords.length > 0) {
+      headwordTerms.push({ term, headwords });
+    }
+  }
+
+  return headwordTerms.length > 0 ? { headwordTerms } : undefined;
+}

 function buildAnkiNotePreview(
  fields: Record<string, { value: string }>,
@@ -340,12 +537,81 @@ export function createStatsApp(
    knownWordCachePath?: string;
    mpvSocketPath?: string;
    ankiConnectConfig?: AnkiConnectConfig;
+    getAnkiConnectConfig?: () => AnkiConnectConfig | undefined;
+    getYomitanAnkiDeckName?: () => Promise<string | null | undefined> | string | null | undefined;
+    secondarySubtitleLanguages?: string[];
+    getSecondarySubtitleLanguages?: () => string[] | undefined;
+    statsMiningAlassPath?: string;
+    getStatsMiningAlassPath?: () => string | null | undefined;
+    resolveRetimedSecondarySubtitleText?: (
+      input: RetimedSecondarySubtitleInput,
+    ) => Promise<string> | string;
    anilistRateLimiter?: AnilistRateLimiter;
    addYomitanNote?: (word: string) => Promise<number | null>;
    resolveAnkiNoteId?: (noteId: number) => number;
+    resolveSentenceSearchHeadwords?: (term: string) => Promise<string[]> | string[];
+    createMediaGenerator?: () => StatsServerMediaGenerator;
+    onMiningTiming?: (event: StatsMiningTimingEvent) => void;
+    nowMs?: () => number;
  },
 ) {
  const app = new Hono();
+  const nowMs = options?.nowMs ?? defaultNowMs;
+  const getAnkiConnectConfig = (): AnkiConnectConfig | undefined =>
+    options?.getAnkiConnectConfig?.() ?? options?.ankiConnectConfig;
+  const getSecondarySubtitleLanguages = (): string[] =>
+    options?.getSecondarySubtitleLanguages?.() ?? options?.secondarySubtitleLanguages ?? [];
+  const getStatsMiningAlassPath = (): string | null | undefined =>
+    options?.getStatsMiningAlassPath?.() ?? options?.statsMiningAlassPath;
+  const getEffectiveMiningDeckName = async (ankiConfig: AnkiConnectConfig): Promise<string> => {
+    const configuredDeckName = ankiConfig.deck?.trim() ?? '';
+    if (configuredDeckName) return configuredDeckName;
+
+    try {
+      const yomitanDeckName = await options?.getYomitanAnkiDeckName?.();
+      return typeof yomitanDeckName === 'string' ? yomitanDeckName.trim() : '';
+    } catch (error) {
+      statsMiningLogger.warn(
+        'Failed to resolve Yomitan Anki deck for stats mining:',
+        error instanceof Error ? error.message : String(error),
+      );
+      return '';
+    }
+  };
+
+  const recordMiningTiming = (event: StatsMiningTimingEvent): void => {
+    options?.onMiningTiming?.(event);
+    statsMiningLogger.debug(
+      `[stats:mining] ${event.mode} ${event.phase} ${Math.round(event.elapsedMs)}ms`,
+      event,
+    );
+  };
+
+  const timeMiningPhase = async <T>(
+    mode: StatsMiningTimingEvent['mode'],
+    phase: string,
+    fn: () => Promise<T>,
+    details?: (value: T) => Partial<StatsMiningTimingEvent>,
+  ): Promise<T> => {
+    const startedAtMs = nowMs();
+    try {
+      const value = await fn();
+      recordMiningTiming({
+        mode,
+        phase,
+        elapsedMs: nowMs() - startedAtMs,
+        ...details?.(value),
+      });
+      return value;
+    } catch (err) {
+      recordMiningTiming({
+        mode,
+        phase,
+        elapsedMs: nowMs() - startedAtMs,
+      });
+      throw err;
+    }
+  };

  app.get('/api/stats/overview', async (c) => {
    const [rawSessions, rollups, hints] = await Promise.all([
@@ -509,6 +775,20 @@ export function createStatsApp(
    return c.json(occurrences);
  });

+  app.get('/api/stats/sentences/search', async (c) => {
+    const query = (c.req.query('q') ?? '').trim();
+    if (!query) return c.json([]);
+    const limit = parseIntQuery(c.req.query('limit'), 50, 100);
+    const searchByHeadword = parseBooleanQuery(c.req.query('headword'), true);
+    const searchOptions = await buildSentenceSearchOptions(
+      query,
+      searchByHeadword,
+      options?.resolveSentenceSearchHeadwords,
+    );
+    const rows = await tracker.searchSubtitleSentences(query, limit, searchOptions);
+    return c.json(rows);
+  });
+
  app.get('/api/stats/kanji', async (c) => {
    const limit = parseIntQuery(c.req.query('limit'), 100, 500);
    const kanji = await tracker.getKanjiStats(limit);
@@ -707,14 +987,36 @@ export function createStatsApp(
    return c.json({ ok: true });
  });

+  app.post('/api/stats/covers', async (c) => {
+    const body = (await c.req.json().catch(() => null)) as StatsCoverBatchBody | null;
+    const animeIds = parsePositiveIdList(body?.animeIds);
+    const videoIds = parsePositiveIdList(body?.videoIds);
+    const anime: Record<number, StatsCoverImagePayload> = {};
+    const media: Record<number, StatsCoverImagePayload> = {};
+
+    await Promise.all(
+      animeIds.map(async (animeId) => {
+        anime[animeId] = coverImagePayload(await tracker.getAnimeCoverArt(animeId));
+      }),
+    );
+    await Promise.all(
+      videoIds.map(async (videoId) => {
+        media[videoId] = coverImagePayload(await tracker.getCoverArt(videoId));
+      }),
+    );
+
+    return c.json({ anime, media });
+  });
+
  app.get('/api/stats/anime/:animeId/cover', async (c) => {
    const animeId = parseIntQuery(c.req.param('animeId'), 0);
    if (animeId <= 0) return c.body(null, 404);
    const art = await tracker.getAnimeCoverArt(animeId);
    if (!art?.coverBlob) return c.body(null, 404);
-    return new Response(new Uint8Array(art.coverBlob), {
+    const bytes = new Uint8Array(art.coverBlob);
+    return new Response(bytes, {
      headers: {
-        'Content-Type': 'image/jpeg',
+        'Content-Type': detectImageContentType(bytes),
        'Cache-Control': 'public, max-age=86400',
      },
    });
@@ -729,9 +1031,10 @@ export function createStatsApp(
      art = await tracker.getCoverArt(videoId);
    }
    if (!art?.coverBlob) return c.body(null, 404);
-    return new Response(new Uint8Array(art.coverBlob), {
+    const bytes = new Uint8Array(art.coverBlob);
+    return new Response(bytes, {
      headers: {
-        'Content-Type': 'image/jpeg',
+        'Content-Type': detectImageContentType(bytes),
        'Cache-Control': 'public, max-age=604800',
      },
    });
@@ -754,8 +1057,9 @@ export function createStatsApp(
  app.post('/api/stats/anki/browse', async (c) => {
    const noteId = parseIntQuery(c.req.query('noteId'), 0);
    if (noteId <= 0) return c.body(null, 400);
+    const ankiConfig = getAnkiConnectConfig();
    try {
-      const response = await fetch('http://127.0.0.1:8765', {
+      const response = await fetch(ankiConfig?.url ?? 'http://127.0.0.1:8765', {
        method: 'POST',
        headers: { 'Content-Type': 'application/json' },
        signal: AbortSignal.timeout(ANKI_CONNECT_FETCH_TIMEOUT_MS),
@@ -791,7 +1095,8 @@ export function createStatsApp(
      ),
    );
    try {
-      const response = await fetch('http://127.0.0.1:8765', {
+      const ankiConfig = getAnkiConnectConfig();
+      const response = await fetch(ankiConfig?.url ?? 'http://127.0.0.1:8765', {
        method: 'POST',
        headers: { 'Content-Type': 'application/json' },
        signal: AbortSignal.timeout(ANKI_CONNECT_FETCH_TIMEOUT_MS),
@@ -807,7 +1112,7 @@ export function createStatsApp(
      return c.json(
        (result.result ?? []).map((note) => ({
          ...note,
-          preview: buildAnkiNotePreview(note.fields, options?.ankiConnectConfig),
+          preview: buildAnkiNotePreview(note.fields, ankiConfig),
        })),
      );
    } catch {
@@ -822,7 +1127,8 @@ export function createStatsApp(
    const endMs = typeof body?.endMs === 'number' ? body.endMs : NaN;
    const sentence = typeof body?.sentence === 'string' ? body.sentence.trim() : '';
    const word = typeof body?.word === 'string' ? body.word.trim() : '';
-    const secondaryText = typeof body?.secondaryText === 'string' ? body.secondaryText.trim() : '';
+    const bodySecondaryText =
+      typeof body?.secondaryText === 'string' ? body.secondaryText.trim() : '';
    const videoTitle = typeof body?.videoTitle === 'string' ? body.videoTitle.trim() : '';
    const rawMode = c.req.query('mode');
    const mode = rawMode === 'audio' ? 'audio' : rawMode === 'word' ? 'word' : 'sentence';
@@ -830,18 +1136,51 @@ export function createStatsApp(
    if (!sourcePath || !sentence || !Number.isFinite(startMs) || !Number.isFinite(endMs)) {
      return c.json({ error: 'sourcePath, sentence, startMs, and endMs are required' }, 400);
    }
+    if (endMs <= startMs) {
+      return c.json({ error: 'endMs must be greater than startMs' }, 400);
+    }

    if (!existsSync(sourcePath)) {
      return c.json({ error: 'File not found' }, 404);
    }

-    const ankiConfig = options?.ankiConnectConfig;
+    const ankiConfig = getAnkiConnectConfig();
    if (!ankiConfig) {
      return c.json({ error: 'AnkiConnect is not configured' }, 500);
    }
+    const secondarySubtitleLanguages = getSecondarySubtitleLanguages();
+    let retimedSecondaryText = '';
+    if (mode === 'sentence' && !bodySecondaryText) {
+      try {
+        retimedSecondaryText = await (
+          options?.resolveRetimedSecondarySubtitleText ??
+          resolveRetimedSecondarySubtitleTextFromSidecar
+        )({
+          sourcePath,
+          startMs,
+          endMs,
+          languages: secondarySubtitleLanguages,
+          alassPath: getStatsMiningAlassPath(),
+        });
+      } catch (error) {
+        statsMiningLogger.warn(
+          'Failed to resolve retimed secondary subtitle for stats mining:',
+          error instanceof Error ? error.message : String(error),
+        );
+      }
+    }
+    const secondaryText =
+      bodySecondaryText ||
+      retimedSecondaryText ||
+      resolveSecondarySubtitleTextFromSidecar({
+        sourcePath,
+        startMs,
+        endMs,
+        languages: secondarySubtitleLanguages,
+      });

    const client = new AnkiConnectClient(ankiConfig.url ?? 'http://127.0.0.1:8765');
-    const mediaGen = new MediaGenerator();
+    const mediaGen = options?.createMediaGenerator?.() ?? new MediaGenerator();

    const audioPadding = ankiConfig.media?.audioPadding ?? 0;
    const maxMediaDuration = ankiConfig.media?.maxMediaDuration ?? 30;
@@ -865,7 +1204,9 @@ export function createStatsApp(
      imageType === 'avif' && ankiConfig.media?.syncAnimatedImageToWordAudio !== false;

    const audioPromise = generateAudio
-      ? mediaGen.generateAudio(sourcePath, startSec, clampedEndSec, audioPadding)
+      ? timeMiningPhase(mode, 'generateAudio', () =>
+          mediaGen.generateAudio(sourcePath, startSec, clampedEndSec, audioPadding),
+        )
      : Promise.resolve(null);

    const createImagePromise = (animatedLeadInSeconds = 0): Promise<Buffer | null> => {
@@ -874,22 +1215,26 @@ export function createStatsApp(
      }

      if (imageType === 'avif') {
-        return mediaGen.generateAnimatedImage(sourcePath, startSec, clampedEndSec, audioPadding, {
+        return timeMiningPhase(mode, 'generateAnimatedImage', () =>
+          mediaGen.generateAnimatedImage(sourcePath, startSec, clampedEndSec, audioPadding, {
            fps: ankiConfig.media?.animatedFps ?? 10,
            maxWidth: ankiConfig.media?.animatedMaxWidth ?? 640,
            maxHeight: ankiConfig.media?.animatedMaxHeight,
            crf: ankiConfig.media?.animatedCrf ?? 35,
            leadingStillDuration: animatedLeadInSeconds,
-        });
+          }),
+        );
      }

      const midpointSec = (startSec + clampedEndSec) / 2;
-      return mediaGen.generateScreenshot(sourcePath, midpointSec, {
+      return timeMiningPhase(mode, 'generateScreenshot', () =>
+        mediaGen.generateScreenshot(sourcePath, midpointSec, {
          format: ankiConfig.media?.imageFormat ?? 'jpg',
          quality: ankiConfig.media?.imageQuality ?? 92,
          maxWidth: ankiConfig.media?.imageMaxWidth,
          maxHeight: ankiConfig.media?.imageMaxHeight,
-      });
+        }),
+      );
    };

    const imagePromise =
@@ -899,6 +1244,25 @@ export function createStatsApp(

    const errors: string[] = [];
    let noteId: number;
+    let effectiveDeckNamePromise: Promise<string> | null = null;
+    const getEffectiveDeckNameForRequest = (): Promise<string> => {
+      effectiveDeckNamePromise ??= getEffectiveMiningDeckName(ankiConfig);
+      return effectiveDeckNamePromise;
+    };
+    const moveNoteToConfiguredDeck = async (id: number): Promise<void> => {
+      const deckName = await getEffectiveDeckNameForRequest();
+      if (!deckName) {
+        return;
+      }
+      try {
+        const cardIds = await timeMiningPhase(mode, 'findCards', () =>
+          client.findCards(`nid:${id}`),
+        );
+        await timeMiningPhase(mode, 'changeDeck', () => client.changeDeck(cardIds, deckName));
+      } catch (err) {
+        errors.push(`deck: ${(err as Error).message}`);
+      }
+    };

    if (mode === 'word') {
      if (!options?.addYomitanNote) {
@@ -906,7 +1270,12 @@ export function createStatsApp(
      }

      const [yomitanResult, audioResult, imageResult] = await Promise.allSettled([
-        options.addYomitanNote(word),
+        timeMiningPhase(
+          'word',
+          'addYomitanNote',
+          () => options.addYomitanNote!(word),
+          (noteId) => (typeof noteId === 'number' ? { noteId } : {}),
+        ),
        audioPromise,
        imagePromise,
      ]);
@@ -921,6 +1290,7 @@ export function createStatsApp(
      }

      noteId = yomitanResult.value;
+      await moveNoteToConfiguredDeck(noteId);
      const audioBuffer = audioResult.status === 'fulfilled' ? audioResult.value : null;
      if (audioResult.status === 'rejected')
        errors.push(`audio: ${(audioResult.reason as Error).message}`);
@@ -928,10 +1298,19 @@ export function createStatsApp(
        errors.push(`image: ${(imageResult.reason as Error).message}`);

      let imageBuffer = imageResult.status === 'fulfilled' ? imageResult.value : null;
-      if (syncAnimatedImageToWordAudio && generateImage) {
+      let noteInfo: StatsServerNoteInfo | null = null;
+      if (audioBuffer || (syncAnimatedImageToWordAudio && generateImage)) {
        try {
          const noteInfoResult = (await client.notesInfo([noteId])) as StatsServerNoteInfo[];
-          const noteInfo = noteInfoResult[0] ?? null;
+          noteInfo = noteInfoResult[0] ?? null;
+        } catch (err) {
+          if (syncAnimatedImageToWordAudio && generateImage) {
+            errors.push(`image: ${(err as Error).message}`);
+          }
+        }
+      }
+      if (syncAnimatedImageToWordAudio && generateImage) {
+        try {
          const animatedLeadInSeconds = noteInfo
            ? await resolveAnimatedImageLeadInSeconds({
                config: ankiConfig,
@@ -946,22 +1325,27 @@ export function createStatsApp(
          errors.push(`image: ${(err as Error).message}`);
        }
      }
+      if (generateAudio && !audioBuffer && audioResult.status === 'fulfilled') {
+        errors.push('audio: no audio generated');
+      }
+      if (generateImage && !imageBuffer) {
+        errors.push('image: no image generated');
+      }

      const mediaFields: Record<string, string> = {};
      const timestamp = Date.now();
      const sentenceFieldName = ankiConfig.fields?.sentence ?? 'Sentence';
-      const audioFieldName = ankiConfig.fields?.audio ?? 'ExpressionAudio';
+      const audioFieldName = getStatsWordMiningAudioFieldName(ankiConfig, noteInfo);
      const imageFieldName = ankiConfig.fields?.image ?? 'Picture';

      mediaFields[sentenceFieldName] = highlightedSentence;
-      if (secondaryText) {
-        mediaFields[ankiConfig.fields?.translation ?? 'SelectionText'] = secondaryText;
-      }

      if (audioBuffer) {
        const audioFilename = `subminer_audio_${timestamp}.mp3`;
        try {
-          await client.storeMediaFile(audioFilename, audioBuffer);
+          await timeMiningPhase('word', 'uploadAudio', () =>
+            client.storeMediaFile(audioFilename, audioBuffer),
+          );
          mediaFields[audioFieldName] = `[sound:${audioFilename}]`;
        } catch (err) {
          errors.push(`audio upload: ${(err as Error).message}`);
@@ -972,7 +1356,9 @@ export function createStatsApp(
        const imageExt = imageType === 'avif' ? 'avif' : (ankiConfig.media?.imageFormat ?? 'jpg');
        const imageFilename = `subminer_image_${timestamp}.${imageExt}`;
        try {
-          await client.storeMediaFile(imageFilename, imageBuffer);
+          await timeMiningPhase('word', 'uploadImage', () =>
+            client.storeMediaFile(imageFilename, imageBuffer),
+          );
          mediaFields[imageFieldName] = `<img src="${imageFilename}">`;
        } catch (err) {
          errors.push(`image upload: ${(err as Error).message}`);
@@ -1000,7 +1386,9 @@ export function createStatsApp(

      if (Object.keys(mediaFields).length > 0) {
        try {
-          await client.updateNoteFields(noteId, mediaFields);
+          await timeMiningPhase('word', 'updateNoteFields', () =>
+            client.updateNoteFields(noteId, mediaFields),
+          );
        } catch (err) {
          errors.push(`update fields: ${(err as Error).message}`);
        }
@@ -1009,32 +1397,24 @@ export function createStatsApp(
      return c.json({ noteId, ...(errors.length > 0 ? { errors } : {}) });
    }

-    const [audioResult, imageResult] = await Promise.allSettled([audioPromise, imagePromise]);
-
-    const audioBuffer = audioResult.status === 'fulfilled' ? audioResult.value : null;
-    const imageBuffer = imageResult.status === 'fulfilled' ? imageResult.value : null;
-    if (audioResult.status === 'rejected')
-      errors.push(`audio: ${(audioResult.reason as Error).message}`);
-    if (imageResult.status === 'rejected')
-      errors.push(`image: ${(imageResult.reason as Error).message}`);
-
    const wordFieldName = getConfiguredWordFieldName(ankiConfig);
    const sentenceFieldName = ankiConfig.fields?.sentence ?? 'Sentence';
    const translationFieldName = ankiConfig.fields?.translation ?? 'SelectionText';
-    const audioFieldName = ankiConfig.fields?.audio ?? 'ExpressionAudio';
    const imageFieldName = ankiConfig.fields?.image ?? 'Picture';
    const miscInfoFieldName = ankiConfig.fields?.miscInfo ?? '';

    const fields: Record<string, string> = {
-      [sentenceFieldName]: highlightedSentence,
+      [sentenceFieldName]: mode === 'sentence' ? sentence : highlightedSentence,
    };

-    if (secondaryText) {
+    if (mode === 'sentence' && secondaryText) {
      fields[translationFieldName] = secondaryText;
    }

    if (ankiConfig.isLapis?.enabled || ankiConfig.isKiku?.enabled) {
-      if (word) {
+      if (mode === 'sentence') {
+        fields[wordFieldName] = sentence;
+      } else if (word) {
        fields[wordFieldName] = word;
      }
      if (mode === 'sentence') {
@@ -1045,23 +1425,62 @@ export function createStatsApp(
    }

    const model = ankiConfig.isLapis?.sentenceCardModel || 'Basic';
-    const deck = ankiConfig.deck ?? 'Default';
    const tags = ankiConfig.tags ?? ['SubMiner'];

-    try {
-      noteId = await client.addNote(deck, model, fields, tags);
-    } catch (err) {
-      return c.json({ error: `Failed to add note: ${(err as Error).message}` }, 502);
+    const addNotePromise = timeMiningPhase(
+      mode,
+      'addNote',
+      async () =>
+        client.addNote((await getEffectiveDeckNameForRequest()) || 'Default', model, fields, tags),
+      (id) => ({
+        noteId: id,
+      }),
+    );
+
+    const [audioResult, imageResult, addNoteResult] = await Promise.allSettled([
+      audioPromise,
+      imagePromise,
+      addNotePromise,
+    ]);
+
+    const audioBuffer = audioResult.status === 'fulfilled' ? audioResult.value : null;
+    const imageBuffer = imageResult.status === 'fulfilled' ? imageResult.value : null;
+    if (audioResult.status === 'rejected')
+      errors.push(`audio: ${(audioResult.reason as Error).message}`);
+    if (imageResult.status === 'rejected')
+      errors.push(`image: ${(imageResult.reason as Error).message}`);
+
+    if (addNoteResult.status === 'rejected') {
+      return c.json(
+        { error: `Failed to add note: ${(addNoteResult.reason as Error).message}` },
+        502,
+      );
    }
+    noteId = addNoteResult.value;
+    await moveNoteToConfiguredDeck(noteId);

    const mediaFields: Record<string, string> = {};
    const timestamp = Date.now();
+    let noteInfo: StatsServerNoteInfo | null = null;
+    if (audioBuffer) {
+      try {
+        const noteInfoResult = (await client.notesInfo([noteId])) as StatsServerNoteInfo[];
+        noteInfo = noteInfoResult[0] ?? null;
+      } catch {
+        noteInfo = null;
+      }
+    }

    if (audioBuffer) {
      const audioFilename = `subminer_audio_${timestamp}.mp3`;
      try {
-        await client.storeMediaFile(audioFilename, audioBuffer);
-        mediaFields[audioFieldName] = `[sound:${audioFilename}]`;
+        await timeMiningPhase(mode, 'uploadAudio', () =>
+          client.storeMediaFile(audioFilename, audioBuffer),
+        );
+        const audioValue = `[sound:${audioFilename}]`;
+        for (const fieldName of getStatsDirectMiningAudioFieldNames(ankiConfig, noteInfo, mode)) {
+          mediaFields[fieldName] = audioValue;
+        }
      } catch (err) {
        errors.push(`audio upload: ${(err as Error).message}`);
      }
@@ -1071,7 +1490,9 @@ export function createStatsApp(
      const imageExt = imageType === 'avif' ? 'avif' : (ankiConfig.media?.imageFormat ?? 'jpg');
      const imageFilename = `subminer_image_${timestamp}.${imageExt}`;
      try {
-        await client.storeMediaFile(imageFilename, imageBuffer);
+        await timeMiningPhase(mode, 'uploadImage', () =>
+          client.storeMediaFile(imageFilename, imageBuffer),
+        );
        mediaFields[imageFieldName] = `<img src="${imageFilename}">`;
      } catch (err) {
        errors.push(`image upload: ${(err as Error).message}`);
@@ -1099,7 +1520,9 @@ export function createStatsApp(

    if (Object.keys(mediaFields).length > 0) {
      try {
-        await client.updateNoteFields(noteId, mediaFields);
+        await timeMiningPhase(mode, 'updateNoteFields', () =>
+          client.updateNoteFields(noteId, mediaFields),
+        );
      } catch (err) {
        errors.push(`update fields: ${(err as Error).message}`);
      }
@@ -1139,9 +1562,17 @@ export function startStatsServer(config: StatsServerConfig): { close: () => void
    knownWordCachePath: config.knownWordCachePath,
    mpvSocketPath: config.mpvSocketPath,
    ankiConnectConfig: config.ankiConnectConfig,
+    getAnkiConnectConfig: config.getAnkiConnectConfig,
+    getYomitanAnkiDeckName: config.getYomitanAnkiDeckName,
+    secondarySubtitleLanguages: config.secondarySubtitleLanguages,
+    getSecondarySubtitleLanguages: config.getSecondarySubtitleLanguages,
+    statsMiningAlassPath: config.statsMiningAlassPath,
+    getStatsMiningAlassPath: config.getStatsMiningAlassPath,
+    resolveRetimedSecondarySubtitleText: config.resolveRetimedSecondarySubtitleText,
    anilistRateLimiter: config.anilistRateLimiter,
    addYomitanNote: config.addYomitanNote,
    resolveAnkiNoteId: config.resolveAnkiNoteId,
+    resolveSentenceSearchHeadwords: config.resolveSentenceSearchHeadwords,
  });

  const bunRuntime = globalThis as typeof globalThis & {
@@ -8,6 +8,7 @@ import type { WindowGeometry } from '../../types';
 const DEFAULT_STATS_WINDOW_WIDTH = 900;
 const DEFAULT_STATS_WINDOW_HEIGHT = 700;
 export const STATS_WINDOW_TITLE = 'SubMiner Stats';
+const STATS_POST_SHOW_RECONCILE_DELAYS_MS = [50, 150, 300, 600] as const;

 type StatsWindowLevelController = Pick<BrowserWindow, 'setAlwaysOnTop' | 'moveTop'> &
  Partial<Pick<BrowserWindow, 'setVisibleOnAllWorkspaces' | 'setFullScreenable'>>;
@@ -26,6 +27,14 @@ type StatsNativeConfirmDialogPresenter<WindowT> = {
 type StatsWindowBoundsController = Pick<BrowserWindow, 'getBounds' | 'getContentBounds'>;
 type StatsWindowPresentationController = Pick<BrowserWindow, 'show' | 'focus'> &
  Partial<Pick<BrowserWindow, 'showInactive'>>;
+type StatsWindowReconcileScheduler = {
+  setTimeout: (
+    callback: () => void,
+    delayMs: number,
+  ) => {
+    unref?: () => void;
+  };
+};

 function isBareToggleKeyInput(input: Electron.Input, toggleKey: string): boolean {
  return (
@@ -189,6 +198,16 @@ export function presentStatsWindow(
  window.focus();
 }

+export function scheduleStatsWindowPostShowReconciles(
+  reconcile: () => void,
+  scheduler: StatsWindowReconcileScheduler = globalThis,
+): void {
+  for (const delayMs of STATS_POST_SHOW_RECONCILE_DELAYS_MS) {
+    const timeout = scheduler.setTimeout(reconcile, delayMs);
+    timeout.unref?.();
+  }
+}
+
 export function buildStatsWindowLoadFileOptions(apiBaseUrl?: string): {
  query: Record<string, string>;
 } {
@@ -9,6 +9,7 @@ import {
  promoteVisibleStatsWindowAboveOverlay,
  promoteStatsWindowLevel,
  resolveStatsWindowOuterBoundsForContent,
+  scheduleStatsWindowPostShowReconciles,
  showStatsNativeConfirmDialog,
  shouldHideStatsWindowForInput,
 } from './stats-window-runtime';
@@ -402,3 +403,39 @@ test('presentStatsWindow shows and focuses on non-macOS platforms', () => {

  assert.deepEqual(calls, ['show', 'focus']);
 });
+
+test('scheduleStatsWindowPostShowReconciles retries placement after a reused hidden window is remapped', () => {
+  const calls: string[] = [];
+
+  scheduleStatsWindowPostShowReconciles(
+    () => {
+      calls.push('reconcile');
+    },
+    {
+      setTimeout: (callback, delayMs) => {
+        calls.push(`timer:${delayMs}`);
+        callback();
+        return {
+          unref: () => {
+            calls.push(`unref:${delayMs}`);
+          },
+        };
+      },
+    },
+  );
+
+  assert.deepEqual(calls, [
+    'timer:50',
+    'reconcile',
+    'unref:50',
+    'timer:150',
+    'reconcile',
+    'unref:150',
+    'timer:300',
+    'reconcile',
+    'unref:300',
+    'timer:600',
+    'reconcile',
+    'unref:600',
+  ]);
+});
@@ -10,6 +10,7 @@ import {
  promoteStatsWindowLevel,
  promoteVisibleStatsWindowAboveOverlay,
  resolveStatsWindowOuterBoundsForContent,
+  scheduleStatsWindowPostShowReconciles,
  showStatsNativeConfirmDialog,
  shouldHideStatsWindowForInput,
  STATS_WINDOW_TITLE,
@@ -58,6 +59,25 @@ function syncStatsWindowBounds(
  return outerBounds;
 }

+function reconcileStatsWindowBounds(window: BrowserWindow, options: StatsWindowOptions): void {
+  if (window.isDestroyed() || !window.isVisible()) {
+    return;
+  }
+  const placementBounds = syncStatsWindowBounds(window, options.resolveBounds());
+  if (placementBounds) {
+    ensureHyprlandWindowFloatingByTitle({ title: STATS_WINDOW_TITLE, bounds: placementBounds });
+  }
+}
+
+function scheduleStatsWindowBoundsReconcile(
+  window: BrowserWindow,
+  options: StatsWindowOptions,
+): void {
+  scheduleStatsWindowPostShowReconciles(() => {
+    reconcileStatsWindowBounds(window, options);
+  });
+}
+
 function showStatsWindow(window: BrowserWindow, options: StatsWindowOptions): void {
  const bounds = options.resolveBounds();
  let placementBounds = syncStatsWindowBounds(window, bounds);
@@ -71,6 +91,8 @@ function showStatsWindow(window: BrowserWindow, options: StatsWindowOptions): vo
  }
  options.onVisibilityChanged?.(true);
  promoteStatsOverlayAbovePlayback();
+  reconcileStatsWindowBounds(window, options);
+  scheduleStatsWindowBoundsReconcile(window, options);
 }

 export function promoteStatsOverlayAbovePlayback(): boolean {
@@ -151,6 +151,56 @@ test('syncYomitanDefaultAnkiServer injects force override when enabled', async (
  assert.match(scriptValue, /forceOverride = true/);
 });

+test('syncYomitanDefaultAnkiServer updates the active profile Anki deck', async () => {
+  const optionsFull = {
+    profileCurrent: 0,
+    profiles: [
+      {
+        options: {
+          anki: {
+            server: 'http://127.0.0.1:8766',
+            cardFormats: [
+              { type: 'term', deck: 'Default', model: 'Mining Note', fields: {} },
+              { type: 'kanji', deck: 'Kanji', model: 'Kanji Note', fields: {} },
+            ],
+            terms: { deck: 'Default', model: 'Legacy Note', fields: {} },
+          },
+        },
+      },
+    ],
+  };
+  let savedOptions: typeof optionsFull | null = null;
+  const deps = createDeps((script) =>
+    runInjectedYomitanScript(script, (action, params) => {
+      if (action === 'optionsGetFull') {
+        return JSON.parse(JSON.stringify(optionsFull));
+      }
+      if (action === 'setAllSettings') {
+        savedOptions = (params as { value: typeof optionsFull }).value;
+        return true;
+      }
+      throw new Error(`Unexpected action: ${action}`);
+    }),
+  );
+
+  const synced = await syncYomitanDefaultAnkiServer(
+    'http://127.0.0.1:8766',
+    deps,
+    {
+      error: () => undefined,
+      info: () => undefined,
+    },
+    { deck: 'Minecraft', forceOverride: true },
+  );
+
+  assert.equal(synced, true);
+  assert.ok(savedOptions);
+  const saved = savedOptions as typeof optionsFull;
+  assert.equal(saved.profiles[0]?.options.anki.cardFormats[0]?.deck, 'Minecraft');
+  assert.equal(saved.profiles[0]?.options.anki.cardFormats[1]?.deck, 'Kanji');
+  assert.equal(saved.profiles[0]?.options.anki.terms.deck, 'Minecraft');
+});
+
 test('syncYomitanDefaultAnkiServer logs and returns false on script failure', async () => {
  const deps = createDeps(async () => {
    throw new Error('execute failed');
@@ -1783,6 +1783,7 @@ export async function syncYomitanDefaultAnkiServer(
  logger: LoggerLike,
  options?: {
    forceOverride?: boolean;
+    deck?: string;
  },
 ): Promise<boolean> {
  const normalizedTargetServer = serverUrl.trim();
@@ -1790,6 +1791,7 @@ export async function syncYomitanDefaultAnkiServer(
    return false;
  }
  const forceOverride = options?.forceOverride === true;
+  const normalizedTargetDeck = options?.deck?.trim() ?? '';

  const isReady = await ensureYomitanParserWindow(deps, logger);
  const parserWindow = deps.getYomitanParserWindow();
@@ -1819,6 +1821,7 @@ export async function syncYomitanDefaultAnkiServer(
        });

      const targetServer = ${JSON.stringify(normalizedTargetServer)};
+      const targetDeck = ${JSON.stringify(normalizedTargetDeck)};
      const forceOverride = ${forceOverride ? 'true' : 'false'};
      const optionsFull = await invoke("optionsGetFull", undefined);
      const profiles = Array.isArray(optionsFull.profiles) ? optionsFull.profiles : [];
@@ -1843,9 +1846,8 @@ export async function syncYomitanDefaultAnkiServer(

      const currentServerRaw = targetProfile.options.anki.server;
      const currentServer = typeof currentServerRaw === "string" ? currentServerRaw.trim() : "";
-      if (currentServer === targetServer) {
-        return { updated: false, matched: true, reason: "already-target", currentServer, targetServer };
-      }
+      let changed = false;
+      if (currentServer !== targetServer) {
        const canReplaceCurrent =
          forceOverride || currentServer.length === 0 || currentServer === "http://127.0.0.1:8765";
        if (!canReplaceCurrent) {
@@ -1853,8 +1855,45 @@ export async function syncYomitanDefaultAnkiServer(
        }

        targetProfile.options.anki.server = targetServer;
+        changed = true;
+      }
+
+      if (targetDeck) {
+        const cardFormats = Array.isArray(targetProfile.options.anki.cardFormats)
+          ? targetProfile.options.anki.cardFormats
+          : [];
+        for (const cardFormat of cardFormats) {
+          if (
+            !cardFormat ||
+            typeof cardFormat !== "object" ||
+            cardFormat.type !== "term" ||
+            cardFormat.enabled === false
+          ) {
+            continue;
+          }
+          const currentDeck = typeof cardFormat.deck === "string" ? cardFormat.deck.trim() : "";
+          if (currentDeck !== targetDeck) {
+            cardFormat.deck = targetDeck;
+            changed = true;
+          }
+        }
+
+        const terms = targetProfile.options.anki.terms;
+        if (terms && typeof terms === "object") {
+          const currentTermDeck = typeof terms.deck === "string" ? terms.deck.trim() : "";
+          if (currentTermDeck !== targetDeck) {
+            terms.deck = targetDeck;
+            changed = true;
+          }
+        }
+      }
+
+      if (!changed) {
+        return { updated: false, matched: true, reason: "already-target", currentServer, targetServer, targetDeck };
+      }
+
      await invoke("setAllSettings", { value: optionsFull, source: "subminer" });
-      return { updated: true, matched: true, currentServer, targetServer };
+      return { updated: true, matched: true, currentServer, targetServer, targetDeck };
    })();
  `;

@@ -65,6 +65,8 @@ import {
  tickLinuxOverlayPointerInteraction,
 } from './main/runtime/linux-overlay-pointer-interaction';
 import { createLinuxX11CursorPointReader } from './main/runtime/linux-x11-cursor-point';
+import { focusMacOSOverlayWindow } from './main/runtime/macos-overlay-window-focus';
+import { restoreMacOSMpvFocusAfterModalClose } from './main/runtime/macos-modal-focus-handoff';
 import { resolveFreshPlaybackPaused } from './main/runtime/playback-paused-state';
 import { mergeAiConfig } from './ai/config';

@@ -396,6 +398,8 @@ import {
  acquireYoutubeSubtitleTrack,
  acquireYoutubeSubtitleTracks,
 } from './core/services/youtube/generate';
+import { hasHyprlandWindowPlacementBoundsMismatch } from './core/services/hyprland-window-placement';
+import { normalizeOverlayWindowBoundsForPlatform } from './core/services/overlay-window-bounds';
 import { resolveYoutubePlaybackUrl } from './core/services/youtube/playback-resolve';
 import { probeYoutubeTracks } from './core/services/youtube/track-probe';
 import { startStatsServer } from './core/services/stats-server';
@@ -946,6 +950,25 @@ const bootServices = createMainBootServices({
    return createOverlayModalRuntimeService(buildHandler(), {
      onModalStateChange: (isActive: boolean) =>
        overlayModalInputState.handleModalInputStateChange(isActive),
+      // On macOS, after the last modal closes the post-close visibility sync hides the overlay
+      // when neither it nor mpv is focused, and keyboard focus is left in limbo (mpv keys like
+      // shift-to-unpause stop working). Programmatically focusing mpv from our background helper
+      // is refused by macOS (most visibly in native fullscreen), so instead resign SubMiner's
+      // active status — exactly what a manual click does — handing focus back to the previously
+      // active app (mpv). The overlay is already hidden at this point, so app.hide() hides nothing
+      // visible; once mpv is focused the tracker re-shows the overlay above it.
+      onFinalModalClosed: () => {
+        void restoreMacOSMpvFocusAfterModalClose({
+          platform: process.platform,
+          focusMpv: async () => {
+            app.hide();
+          },
+          getWindowTracker: () => appState.windowTracker,
+          updateVisibleOverlayVisibility: () =>
+            overlayVisibilityRuntime.updateVisibleOverlayVisibility(),
+          warn: (message, details) => logger.warn(message, details),
+        });
+      },
    });
  },
  createAppState,
@@ -1259,6 +1282,16 @@ const autoplayReadyGate = createAutoplayReadyGate({
    if (process.platform !== 'darwin' || !overlayManager.getVisibleOverlayVisible()) {
      return;
    }
+    // Renderer-side recovery alone cannot wake subtitle hover on macOS: the overlay only
+    // receives mouse-moved events while it is the key window of the frontmost app, and mpv
+    // is frontmost once playback starts. Activate the overlay window first so the broadcast's
+    // setIgnoreMouseEvents toggling actually takes effect, mirroring a manual subtitle click.
+    focusMacOSOverlayWindow({
+      platform: process.platform,
+      getOverlayWindow: () => overlayManager.getMainWindow(),
+      stealAppFocus: () => app.focus({ steal: true }),
+      warn: (message, details) => logger.warn(message, details),
+    });
    broadcastToOverlayWindows(IPC_CHANNELS.event.overlayPointerRecoveryRequest);
  },
  isSignalTargetReady: (signal) =>
@@ -1800,6 +1833,31 @@ function getCurrentAutoplaySubtitlePayload(): SubtitleData | null {
  return payload;
 }

+async function resolveSentenceSearchHeadwords(term: string): Promise<string[]> {
+  const fallback = term.trim() ? [term.trim()] : [];
+  try {
+    const tokenized = tokenizeSubtitleDeferred ? await tokenizeSubtitleDeferred(term) : null;
+    const tokens = tokenized?.tokens ?? [];
+    if (tokens.length === 0) return fallback;
+
+    const seen = new Set<string>();
+    const headwords: string[] = [];
+    for (const token of tokens) {
+      const headword = (token.headword || token.surface).trim();
+      if (!headword || seen.has(headword)) continue;
+      seen.add(headword);
+      headwords.push(headword);
+    }
+    return headwords.length > 0 ? headwords : fallback;
+  } catch (error) {
+    logger.debug(
+      'Failed to resolve sentence-search headwords:',
+      error instanceof Error ? error.message : String(error),
+    );
+    return fallback;
+  }
+}
+
 function signalCurrentSubtitleAutoplayReady(): void {
  autoplayReadyGate.flushPendingAutoplayReadySignal();
  const payload = getCurrentAutoplaySubtitlePayload();
@@ -2207,6 +2265,18 @@ const configHotReloadRuntime = createConfigHotReloadRuntime(
  buildConfigHotReloadRuntimeMainDepsHandler(),
 );

+async function getCurrentYomitanAnkiDeckNameForRuntime(): Promise<string> {
+  await yomitanExtensionRuntime.ensureYomitanExtensionLoaded();
+  return getYomitanCurrentAnkiDeckNameCore(getYomitanParserRuntimeDeps(), {
+    error: (message, ...args) => {
+      logger.error(message, ...args);
+    },
+    info: (message, ...args) => {
+      logger.info(message, ...args);
+    },
+  });
+}
+
 const configSettingsRuntime = createConfigSettingsRuntime({
  fields: configSettingsFields,
  getConfigPath: () => configService.getConfigPath(),
@@ -2217,17 +2287,7 @@ const configSettingsRuntime = createConfigSettingsRuntime({
  onHotReloadApplied: applyConfigHotReloadDiff,
  defaultAnkiConnectUrl: DEFAULT_CONFIG.ankiConnect.url,
  createAnkiClient: (url) => new AnkiConnectClient(url),
-  getYomitanAnkiDeckName: async () => {
-    await yomitanExtensionRuntime.ensureYomitanExtensionLoaded();
-    return getYomitanCurrentAnkiDeckNameCore(getYomitanParserRuntimeDeps(), {
-      error: (message, ...args) => {
-        logger.error(message, ...args);
-      },
-      info: (message, ...args) => {
-        logger.info(message, ...args);
-      },
-    });
-  },
+  getYomitanAnkiDeckName: getCurrentYomitanAnkiDeckNameForRuntime,
  getSettingsWindow: () => appState.configSettingsWindow,
  setSettingsWindow: (window) => {
    appState.configSettingsWindow = window as BrowserWindow | null;
@@ -4408,14 +4468,20 @@ const startLocalStatsServer = (): void => {
      tracker,
      knownWordCachePath: path.join(USER_DATA_PATH, 'known-words-cache.json'),
      mpvSocketPath: appState.mpvSocketPath,
-      ankiConnectConfig: getResolvedConfig().ankiConnect,
+      getAnkiConnectConfig: () => getResolvedConfig().ankiConnect,
+      getYomitanAnkiDeckName: getCurrentYomitanAnkiDeckNameForRuntime,
+      getSecondarySubtitleLanguages: () => getResolvedConfig().secondarySub.secondarySubLanguages,
+      getStatsMiningAlassPath: () => getResolvedConfig().subsync.alass_path,
      anilistRateLimiter,
      resolveAnkiNoteId: (noteId: number) =>
        appState.ankiIntegration?.resolveCurrentNoteId(noteId) ?? noteId,
+      resolveSentenceSearchHeadwords,
      addYomitanNote: async (word: string) => {
-        const ankiUrl = getResolvedConfig().ankiConnect.url || 'http://127.0.0.1:8765';
+        const ankiConnectConfig = getResolvedConfig().ankiConnect;
+        const ankiUrl = ankiConnectConfig.url || 'http://127.0.0.1:8765';
        await syncYomitanDefaultAnkiServerCore(ankiUrl, yomitanDeps, yomitanLogger, {
-          forceOverride: true,
+          forceOverride: shouldForceOverrideYomitanAnkiServer(ankiConnectConfig),
+          deck: ankiConnectConfig.deck,
        });
        const result = await addYomitanNoteViaSearch(word, yomitanDeps, yomitanLogger);
        if (result.noteId && result.duplicateNoteIds.length > 0) {
@@ -5429,16 +5495,33 @@ function maybeExitLinuxFullscreenOverrideForTrackedGeometry(geometry: WindowGeom
  syncLinuxVisibleOverlayMpvFullscreenMode(false);
 }

+function hasHyprlandOverlayWindowPlacementMismatch(geometry: WindowGeometry): boolean {
+  if (process.platform !== 'linux') {
+    return false;
+  }
+
+  return [overlayManager.getMainWindow(), overlayManager.getModalWindow()].some((window) => {
+    if (!window || window.isDestroyed()) {
+      return false;
+    }
+    return hasHyprlandWindowPlacementBoundsMismatch({
+      title: window.getTitle(),
+      bounds: normalizeOverlayWindowBoundsForPlatform(geometry, process.platform, screen, window),
+    });
+  });
+}
+
 const buildUpdateVisibleOverlayBoundsMainDepsHandler =
  createBuildUpdateVisibleOverlayBoundsMainDepsHandler({
    getCurrentOverlayWindowBounds: () => lastOverlayWindowGeometry,
    shouldRefreshUnchangedGeometry: (geometry) =>
      shouldExitLinuxFullscreenOverrideForGeometry(geometry) ||
      (process.platform === 'linux' &&
-        hasLiveOverlayWindowBoundsMismatch(
+        (hasLiveOverlayWindowBoundsMismatch(
          [overlayManager.getMainWindow(), overlayManager.getModalWindow()],
          geometry,
-        )),
+        ) ||
+          hasHyprlandOverlayWindowPlacementMismatch(geometry))),
    setOverlayWindowBounds: (geometry) => applyOverlayRegions(geometry),
    afterSetOverlayWindowBounds: () => {
      if (!overlayManager.getVisibleOverlayVisible()) {
@@ -5590,7 +5673,7 @@ async function ensureYomitanExtensionLoaded(): Promise<Extension | null> {
  return extension;
 }

-let lastSyncedYomitanAnkiServer: string | null = null;
+let lastSyncedYomitanAnkiSettingsKey: string | null = null;

 function getPreferredYomitanAnkiServerUrl(): string {
  return getPreferredYomitanAnkiServerUrlRuntime(getResolvedConfig().ankiConnect);
@@ -5621,7 +5704,10 @@ async function syncYomitanDefaultProfileAnkiServer(): Promise<void> {
  }

  const targetUrl = getPreferredYomitanAnkiServerUrl().trim();
-  if (!targetUrl || targetUrl === lastSyncedYomitanAnkiServer) {
+  const ankiConnectConfig = getResolvedConfig().ankiConnect;
+  const targetDeck = ankiConnectConfig?.deck?.trim() ?? '';
+  const targetSettingsKey = `${targetUrl}\n${targetDeck}`;
+  if (!targetUrl || targetSettingsKey === lastSyncedYomitanAnkiSettingsKey) {
    return;
  }

@@ -5637,12 +5723,15 @@ async function syncYomitanDefaultProfileAnkiServer(): Promise<void> {
      },
    },
    {
-      forceOverride: shouldForceOverrideYomitanAnkiServer(getResolvedConfig().ankiConnect),
+      forceOverride: ankiConnectConfig
+        ? shouldForceOverrideYomitanAnkiServer(ankiConnectConfig)
+        : false,
+      deck: targetDeck,
    },
  );

  if (synced) {
-    lastSyncedYomitanAnkiServer = targetUrl;
+    lastSyncedYomitanAnkiSettingsKey = targetSettingsKey;
  }
 }

@@ -237,6 +237,21 @@ test('warm tokenization release reuses current subtitle payload instead of synth
  assert.match(currentPayloadBlock, /payload\.text !== appState\.currentSubText/);
 });

+test('stats server Yomitan note creation honors configured Anki server override policy', () => {
+  const source = readMainSource();
+  const startStatsServerBlock = source.match(
+    /statsServer = startStatsServer\(\{(?<body>[\s\S]*?)\n    \}\);/,
+  )?.groups?.body;
+  const addYomitanNoteBlock = startStatsServerBlock?.match(
+    /addYomitanNote:\s*async\s*\(word: string\)\s*=>\s*\{(?<body>[\s\S]*?)\n      \},/,
+  )?.groups?.body;
+
+  assert.ok(addYomitanNoteBlock);
+  assert.match(addYomitanNoteBlock, /const ankiConnectConfig = getResolvedConfig\(\)\.ankiConnect;/);
+  assert.match(addYomitanNoteBlock, /shouldForceOverrideYomitanAnkiServer\(ankiConnectConfig\)/);
+  assert.doesNotMatch(addYomitanNoteBlock, /forceOverride:\s*true/);
+});
+
 test('Linux visible overlay recreation clears stale input state before creating replacement window', () => {
  const source = readMainSource();
  const actionBlock = source.match(
@@ -230,6 +230,7 @@ test('sendToActiveOverlayWindow targets modal window with full geometry and trac
  runtime.notifyOverlayModalOpened('runtime-options');
  assert.equal(window.getShowCount(), 1);
  assert.equal(window.isFocused(), true);
+  assert.deepEqual(calls, ['bounds:10,20,300,200', 'bounds:10,20,300,200']);
  assert.deepEqual(window.alwaysOnTopCalls, ['top:true:screen-saver:3']);
  assert.deepEqual(window.sent, [['runtime-options:open']]);
 });
@@ -4,6 +4,7 @@ import type { WindowGeometry } from '../types';
 import { OVERLAY_WINDOW_CONTENT_READY_FLAG } from '../core/services/overlay-window-flags';

 const MODAL_REVEAL_FALLBACK_DELAY_MS = 250;
+const MODAL_POST_SHOW_BOUNDS_RECONCILE_DELAY_MS = 50;

 function requestOverlayApplicationFocus(): void {
  try {
@@ -144,6 +145,24 @@ export function createOverlayModalRuntimeService(
    window.moveTop();
  };

+  const reconcileModalWindowBounds = (window: BrowserWindow): void => {
+    const modalWindow = deps.getModalWindow();
+    if (!modalWindow || modalWindow !== window || window.isDestroyed()) {
+      return;
+    }
+    deps.setModalWindowBounds(deps.getModalGeometry());
+  };
+
+  const scheduleModalWindowBoundsReconcile = (window: BrowserWindow): void => {
+    const timeout = setTimeout(() => {
+      if (window.isDestroyed() || !window.isVisible()) {
+        return;
+      }
+      reconcileModalWindowBounds(window);
+    }, MODAL_POST_SHOW_BOUNDS_RECONCILE_DELAY_MS);
+    timeout.unref?.();
+  };
+
  const sendOrQueueForWindow = (
    window: BrowserWindow,
    sendNow: (window: BrowserWindow) => void,
@@ -187,6 +206,8 @@ export function createOverlayModalRuntimeService(
    if (!window.webContents.isFocused()) {
      window.webContents.focus();
    }
+    reconcileModalWindowBounds(window);
+    scheduleModalWindowBoundsReconcile(window);
  };

  const ensureModalWindowInteractive = (window: BrowserWindow): void => {
@@ -198,6 +219,8 @@ export function createOverlayModalRuntimeService(
    if (window.isVisible()) {
      window.focus();
      window.webContents.focus();
+      reconcileModalWindowBounds(window);
+      scheduleModalWindowBoundsReconcile(window);
      return;
    }

@@ -1,6 +1,37 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { composeJellyfinRuntimeHandlers } from './jellyfin-runtime-composer';
+import {
+  composeJellyfinRuntimeHandlers,
+  createRestartJellyfinRemoteSessionAfterSetupLoginHandler,
+} from './jellyfin-runtime-composer';
+
+test('setup login restart uses auto-connect path without an active remote session', async () => {
+  const startOptions: Array<{ explicit?: boolean } | undefined> = [];
+  const restart = createRestartJellyfinRemoteSessionAfterSetupLoginHandler({
+    getCurrentSession: () => null,
+    startJellyfinRemoteSession: async (options) => {
+      startOptions.push(options);
+    },
+  });
+
+  await restart();
+
+  assert.deepEqual(startOptions, [undefined]);
+});
+
+test('setup login restart explicitly refreshes an active remote session', async () => {
+  const startOptions: Array<{ explicit?: boolean } | undefined> = [];
+  const restart = createRestartJellyfinRemoteSessionAfterSetupLoginHandler({
+    getCurrentSession: () => ({ stop: () => {} }),
+    startJellyfinRemoteSession: async (options) => {
+      startOptions.push(options);
+    },
+  });
+
+  await restart();
+
+  assert.deepEqual(startOptions, [{ explicit: true }]);
+});

 test('composeJellyfinRuntimeHandlers returns callable jellyfin runtime handlers', () => {
  let activePlayback: unknown = null;
@@ -153,6 +153,16 @@ export type JellyfinRuntimeComposerResult = ComposerOutputs<{
  openJellyfinSetupWindow: ReturnType<typeof createOpenJellyfinSetupWindowHandler>;
 }>;

+export function createRestartJellyfinRemoteSessionAfterSetupLoginHandler(deps: {
+  getCurrentSession: () => unknown | null;
+  startJellyfinRemoteSession: (options?: { explicit?: boolean }) => Promise<void>;
+}) {
+  return async (): Promise<void> => {
+    const hasActiveSession = deps.getCurrentSession() !== null;
+    await deps.startJellyfinRemoteSession(hasActiveSession ? { explicit: true } : undefined);
+  };
+}
+
 export function composeJellyfinRuntimeHandlers(
  options: JellyfinRuntimeComposerOptions,
 ): JellyfinRuntimeComposerResult {
@@ -268,12 +278,19 @@ export function composeJellyfinRuntimeHandlers(
  const maybeFocusExistingJellyfinSetupWindow = createMaybeFocusExistingJellyfinSetupWindowHandler(
    options.maybeFocusExistingJellyfinSetupWindowMainDeps,
  );
+  const restartJellyfinRemoteSessionAfterSetupLogin =
+    createRestartJellyfinRemoteSessionAfterSetupLoginHandler({
+      getCurrentSession: () => options.startJellyfinRemoteSessionMainDeps.getCurrentSession(),
+      startJellyfinRemoteSession: (startOptions) => startJellyfinRemoteSession(startOptions),
+    });
  const openJellyfinSetupWindow = createOpenJellyfinSetupWindowHandler(
    createBuildOpenJellyfinSetupWindowMainDepsHandler({
      ...options.openJellyfinSetupWindowMainDeps,
      maybeFocusExistingSetupWindow: maybeFocusExistingJellyfinSetupWindow,
      getResolvedJellyfinConfig: () => getResolvedJellyfinConfig(),
      getJellyfinClientInfo: () => getJellyfinClientInfo(),
+      restartRemoteSession: () => restartJellyfinRemoteSessionAfterSetupLogin(),
+      stopRemoteSession: () => stopJellyfinRemoteSession(),
    })(),
  );

@@ -1,6 +1,10 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import { DEFAULT_CONFIG, deepCloneConfig } from '../../config';
+import { resolveConfig } from '../../config/resolve';
 import { IPC_CHANNELS } from '../../shared/ipc/contracts';
 import { createConfigSettingsRuntime } from './config-settings-runtime';

@@ -10,7 +14,13 @@ test('config settings runtime exposes inferred Yomitan Anki deck lookup', async
    fields: [],
    getConfigPath: () => '/tmp/config.jsonc',
    getRawConfig: () => ({}),
-    getConfig: () => deepCloneConfig(DEFAULT_CONFIG),
+    getConfig: () => ({
+      ...deepCloneConfig(DEFAULT_CONFIG),
+      ankiConnect: {
+        ...deepCloneConfig(DEFAULT_CONFIG).ankiConnect,
+        deck: 'Configured',
+      },
+    }),
    getWarnings: () => [],
    reloadConfigStrict: () =>
      ({
@@ -48,3 +58,62 @@ test('config settings runtime exposes inferred Yomitan Anki deck lookup', async
  assert.ok(handler);
  assert.deepEqual(await handler({}, undefined), { ok: true, value: 'Mining' });
 });
+
+test('config settings runtime persists inferred Yomitan Anki deck when config deck is empty', async () => {
+  const handlers = new Map<string, (event: unknown, ...args: unknown[]) => unknown>();
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-settings-'));
+  const configPath = path.join(dir, 'config.jsonc');
+  fs.writeFileSync(configPath, '{"ankiConnect":{"deck":""}}\n', 'utf-8');
+
+  try {
+    let rawConfig = { ankiConnect: { deck: '' } };
+    let resolvedConfig = resolveConfig(rawConfig).resolved;
+    const runtime = createConfigSettingsRuntime({
+      fields: [],
+      getConfigPath: () => configPath,
+      getRawConfig: () => rawConfig,
+      getConfig: () => resolvedConfig,
+      getWarnings: () => [],
+      reloadConfigStrict: () => {
+        rawConfig = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        resolvedConfig = resolveConfig(rawConfig).resolved;
+        return {
+          ok: true,
+          config: resolvedConfig,
+          warnings: [],
+          path: configPath,
+        };
+      },
+      getSettingsWindow: () => null,
+      setSettingsWindow: () => undefined,
+      createSettingsWindow: () => ({}) as never,
+      settingsHtmlPath: '/tmp/settings.html',
+      openPath: async () => '',
+      defaultAnkiConnectUrl: DEFAULT_CONFIG.ankiConnect.url,
+      createAnkiClient: () =>
+        ({
+          deckNames: async () => [],
+          fieldNamesForDeck: async () => [],
+          modelNamesForDeck: async () => [],
+          modelNames: async () => [],
+          modelFieldNames: async () => [],
+        }) as never,
+      getYomitanAnkiDeckName: async () => 'Minecraft',
+      ipcMain: {
+        handle: (channel, listener) => {
+          handlers.set(channel, listener);
+        },
+      },
+      ipcChannels: IPC_CHANNELS.request,
+    });
+
+    runtime.registerHandlers();
+
+    const handler = handlers.get(IPC_CHANNELS.request.getConfigSettingsYomitanAnkiDeckName);
+    assert.ok(handler);
+    assert.deepEqual(await handler({}, undefined), { ok: true, value: 'Minecraft' });
+    assert.equal(JSON.parse(fs.readFileSync(configPath, 'utf-8')).ankiConnect.deck, 'Minecraft');
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
@@ -193,13 +193,38 @@ export function createConfigSettingsRuntime<TWindow extends ConfigSettingsWindow
    };
  }

+  function persistInferredYomitanDeckIfEmpty(deckName: string): void {
+    const normalizedDeckName = deckName.trim();
+    const configuredDeckName = deps.getConfig().ankiConnect?.deck?.trim() ?? '';
+    if (!normalizedDeckName || configuredDeckName) {
+      return;
+    }
+
+    const result = savePatch({
+      operations: [
+        {
+          op: 'set',
+          path: 'ankiConnect.deck',
+          value: normalizedDeckName,
+        },
+      ],
+    });
+    if (!result.ok) {
+      deps.log?.(
+        `Failed to persist inferred Yomitan Anki deck: ${result.error ?? 'unknown error'}`,
+      );
+    }
+  }
+
  async function getYomitanAnkiDeckName(): Promise<ConfigSettingsAnkiDeckResult> {
    if (!deps.getYomitanAnkiDeckName) {
      return { ok: true, value: '' };
    }
    try {
      const value = await deps.getYomitanAnkiDeckName();
-      return { ok: true, value: typeof value === 'string' ? value.trim() : '' };
+      const deckName = typeof value === 'string' ? value.trim() : '';
+      persistInferredYomitanDeckIfEmpty(deckName);
+      return { ok: true, value: deckName };
    } catch (error) {
      return {
        ok: false,
@@ -40,6 +40,10 @@ test('open jellyfin setup window main deps builder maps callbacks', async () =>
    clearStoredSession: () => calls.push('clear-session'),
    patchJellyfinConfig: () => calls.push('patch'),
    persistAuthenticatedSession: () => calls.push('persist'),
+    restartRemoteSession: () => {
+      calls.push('restart-remote');
+    },
+    stopRemoteSession: () => calls.push('stop-remote'),
    logInfo: (message) => calls.push(`info:${message}`),
    logError: (message) => calls.push(`error:${message}`),
    showMpvOsd: (message) => calls.push(`osd:${message}`),
@@ -95,6 +99,8 @@ test('open jellyfin setup window main deps builder maps callbacks', async () =>
    },
    deps.getJellyfinClientInfo(),
  );
+  await deps.restartRemoteSession?.();
+  deps.stopRemoteSession?.();
  deps.logInfo('ok');
  deps.logError('bad', null);
  deps.showMpvOsd('toast');
@@ -110,6 +116,8 @@ test('open jellyfin setup window main deps builder maps callbacks', async () =>
    'clear-session',
    'patch',
    'persist',
+    'restart-remote',
+    'stop-remote',
    'info:ok',
    'error:bad',
    'osd:toast',
@@ -20,6 +20,10 @@ export function createBuildOpenJellyfinSetupWindowMainDepsHandler(
    persistAuthenticatedSession: deps.persistAuthenticatedSession
      ? (session, clientInfo) => deps.persistAuthenticatedSession?.(session, clientInfo)
      : undefined,
+    restartRemoteSession: deps.restartRemoteSession
+      ? () => deps.restartRemoteSession?.()
+      : undefined,
+    stopRemoteSession: deps.stopRemoteSession ? () => deps.stopRemoteSession?.() : undefined,
    logInfo: (message: string) => deps.logInfo(message),
    logError: (message: string, error: unknown) => deps.logError(message, error),
    showMpvOsd: (message: string) => deps.showMpvOsd(message),
@@ -160,6 +160,9 @@ test('createHandleJellyfinSetupSubmissionHandler applies successful login', asyn
      patchPayload = session;
      calls.push('patch');
    },
+    restartRemoteSession: async () => {
+      calls.push('restart-remote');
+    },
    logInfo: () => calls.push('info'),
    logError: () => calls.push('error'),
    showMpvOsd: (message) => calls.push(`osd:${message}`),
@@ -172,7 +175,14 @@ test('createHandleJellyfinSetupSubmissionHandler applies successful login', asyn
    'b',
  );
  assert.equal(handled, true);
-  assert.deepEqual(calls, ['save', 'patch', 'info', 'osd:Jellyfin login success', 'reload']);
+  assert.deepEqual(calls, [
+    'save',
+    'patch',
+    'restart-remote',
+    'info',
+    'osd:Jellyfin login success',
+    'reload',
+  ]);
  assert.equal(authPassword, 'b');
  assert.deepEqual(savedSession, { accessToken: 'token', userId: 'uid' });
  assert.deepEqual(patchPayload, {
@@ -329,6 +339,7 @@ test('createHandleJellyfinSetupSubmissionHandler handles logout and done', async
    saveStoredSession: () => calls.push('save'),
    clearStoredSession: () => calls.push('clear'),
    patchJellyfinConfig: () => calls.push('patch'),
+    stopRemoteSession: () => calls.push('stop-remote'),
    logInfo: (message) => calls.push(message),
    logError: () => calls.push('error'),
    showMpvOsd: (message) => calls.push(`osd:${message}`),
@@ -340,6 +351,7 @@ test('createHandleJellyfinSetupSubmissionHandler handles logout and done', async
  assert.equal(await handler('subminer://jellyfin-setup?action=done'), true);
  assert.deepEqual(calls, [
    'clear',
+    'stop-remote',
    'Cleared stored Jellyfin auth session.',
    'osd:Jellyfin logged out',
    'reload',
@@ -425,6 +425,8 @@ export function createHandleJellyfinSetupSubmissionHandler(deps: {
  clearStoredSession: () => void;
  patchJellyfinConfig: (session: JellyfinSession) => void;
  persistAuthenticatedSession?: (session: JellyfinSession, clientInfo: JellyfinClientInfo) => void;
+  restartRemoteSession?: () => Promise<void> | void;
+  stopRemoteSession?: () => void;
  logInfo: (message: string) => void;
  logError: (message: string, error: unknown) => void;
  showMpvOsd: (message: string) => void;
@@ -447,6 +449,7 @@ export function createHandleJellyfinSetupSubmissionHandler(deps: {
    if (submission.action === 'logout') {
      try {
        deps.clearStoredSession();
+        deps.stopRemoteSession?.();
        deps.logInfo('Cleared stored Jellyfin auth session.');
        deps.showMpvOsd('Jellyfin logged out');
        deps.reloadSetupWindow({
@@ -491,6 +494,7 @@ export function createHandleJellyfinSetupSubmissionHandler(deps: {
        deps.saveStoredSession({ accessToken: session.accessToken, userId: session.userId });
        deps.patchJellyfinConfig(session);
      }
+      await deps.restartRemoteSession?.();
      deps.logInfo(`Jellyfin setup saved for ${session.username}.`);
      deps.showMpvOsd('Jellyfin login success');
      deps.reloadSetupWindow({
@@ -593,6 +597,8 @@ export function createOpenJellyfinSetupWindowHandler<
  clearStoredSession: () => void;
  patchJellyfinConfig: (session: JellyfinSession) => void;
  persistAuthenticatedSession?: (session: JellyfinSession, clientInfo: JellyfinClientInfo) => void;
+  restartRemoteSession?: () => Promise<void> | void;
+  stopRemoteSession?: () => void;
  logInfo: (message: string) => void;
  logError: (message: string, error: unknown) => void;
  showMpvOsd: (message: string) => void;
@@ -633,6 +639,10 @@ export function createOpenJellyfinSetupWindowHandler<
      persistAuthenticatedSession: deps.persistAuthenticatedSession
        ? (session, clientInfo) => deps.persistAuthenticatedSession?.(session, clientInfo)
        : undefined,
+      restartRemoteSession: deps.restartRemoteSession
+        ? () => deps.restartRemoteSession?.()
+        : undefined,
+      stopRemoteSession: deps.stopRemoteSession ? () => deps.stopRemoteSession?.() : undefined,
      logInfo: (message) => deps.logInfo(message),
      logError: (message, error) => deps.logError(message, error),
      showMpvOsd: (message) => deps.showMpvOsd(message),
@@ -1,33 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import { focusMacOSMpvProcess } from './macos-mpv-focus';
-
-test('focusMacOSMpvProcess fronts the running mpv process with osascript', async () => {
-  const calls: Array<{ command: string; args: string[]; timeout?: number }> = [];
-
-  await focusMacOSMpvProcess({
-    execFile: (command, args, options, callback) => {
-      calls.push({ command, args, timeout: options.timeout });
-      callback(null);
-    },
-  });
-
-  assert.equal(calls.length, 1);
-  assert.equal(calls[0]?.command, '/usr/bin/osascript');
-  assert.equal(calls[0]?.timeout, 2000);
-  assert.deepEqual(calls[0]?.args, [
-    '-e',
-    'tell application "System Events" to set frontmost of the first process whose name is "mpv" to true',
-  ]);
-});
-
-test('focusMacOSMpvProcess rejects when osascript fails', async () => {
-  await assert.rejects(
-    focusMacOSMpvProcess({
-      execFile: (_command, _args, _options, callback) => {
-        callback(new Error('not allowed'));
-      },
-    }),
-    /not allowed/,
-  );
-});
@@ -1,35 +0,0 @@
-import { execFile as nodeExecFile } from 'node:child_process';
-
-const FOCUS_MPV_PROCESS_SCRIPT =
-  'tell application "System Events" to set frontmost of the first process whose name is "mpv" to true';
-
-type ExecFileForMacOSFocus = (
-  command: string,
-  args: string[],
-  options: { timeout: number },
-  callback: (error: Error | null) => void,
-) => void;
-
-export type MacOSMpvFocusDeps = {
-  execFile?: ExecFileForMacOSFocus;
-};
-
-export async function focusMacOSMpvProcess(deps: MacOSMpvFocusDeps = {}): Promise<void> {
-  const execFile: ExecFileForMacOSFocus =
-    deps.execFile ??
-    ((command, args, options, callback) => {
-      nodeExecFile(command, args, options, (error) => {
-        callback(error);
-      });
-    });
-
-  await new Promise<void>((resolve, reject) => {
-    execFile('/usr/bin/osascript', ['-e', FOCUS_MPV_PROCESS_SCRIPT], { timeout: 2000 }, (error) => {
-      if (error) {
-        reject(error);
-        return;
-      }
-      resolve();
-    });
-  });
-}
@@ -0,0 +1,131 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { focusMacOSOverlayWindow } from './macos-overlay-window-focus';
+
+function createOverlayWindowStub(
+  overrides: Partial<{
+    destroyed: boolean;
+    visible: boolean;
+    focused: boolean;
+    webContentsFocused: boolean;
+  }> = {},
+  calls: string[] = [],
+) {
+  return {
+    isDestroyed: () => overrides.destroyed ?? false,
+    isVisible: () => overrides.visible ?? true,
+    isFocused: () => overrides.focused ?? false,
+    setFocusable: (focusable: boolean) => {
+      calls.push(`setFocusable:${focusable}`);
+    },
+    focus: () => {
+      calls.push('window.focus');
+    },
+    webContents: {
+      isFocused: () => overrides.webContentsFocused ?? false,
+      focus: () => {
+        calls.push('webContents.focus');
+      },
+    },
+  };
+}
+
+test('focusMacOSOverlayWindow activates the overlay window on macOS', () => {
+  const calls: string[] = [];
+  const overlayWindow = createOverlayWindowStub({}, calls);
+
+  focusMacOSOverlayWindow({
+    platform: 'darwin',
+    getOverlayWindow: () => overlayWindow,
+    stealAppFocus: () => calls.unshift('app.focus'),
+    warn: () => {},
+  });
+
+  assert.deepEqual(calls, ['app.focus', 'setFocusable:true', 'window.focus', 'webContents.focus']);
+});
+
+test('focusMacOSOverlayWindow skips re-focusing the web contents when already focused', () => {
+  const calls: string[] = [];
+  const overlayWindow = createOverlayWindowStub({ webContentsFocused: true }, calls);
+
+  focusMacOSOverlayWindow({
+    platform: 'darwin',
+    getOverlayWindow: () => overlayWindow,
+    stealAppFocus: () => calls.unshift('app.focus'),
+    warn: () => {},
+  });
+
+  assert.deepEqual(calls, ['app.focus', 'setFocusable:true', 'window.focus']);
+});
+
+test('focusMacOSOverlayWindow no-ops on non-macOS platforms', () => {
+  const calls: string[] = [];
+
+  focusMacOSOverlayWindow({
+    platform: 'win32',
+    getOverlayWindow: () => createOverlayWindowStub({}, calls),
+    stealAppFocus: () => calls.push('app.focus'),
+    warn: () => {},
+  });
+
+  assert.deepEqual(calls, []);
+});
+
+test('focusMacOSOverlayWindow no-ops when the overlay is already focused', () => {
+  const calls: string[] = [];
+
+  focusMacOSOverlayWindow({
+    platform: 'darwin',
+    getOverlayWindow: () => createOverlayWindowStub({ focused: true }, calls),
+    stealAppFocus: () => calls.push('app.focus'),
+    warn: () => {},
+  });
+
+  assert.deepEqual(calls, []);
+});
+
+test('focusMacOSOverlayWindow no-ops when the overlay is hidden, destroyed, or missing', () => {
+  const calls: string[] = [];
+
+  focusMacOSOverlayWindow({
+    platform: 'darwin',
+    getOverlayWindow: () => createOverlayWindowStub({ visible: false }, calls),
+    stealAppFocus: () => calls.push('app.focus'),
+    warn: () => {},
+  });
+  focusMacOSOverlayWindow({
+    platform: 'darwin',
+    getOverlayWindow: () => createOverlayWindowStub({ destroyed: true }, calls),
+    stealAppFocus: () => calls.push('app.focus'),
+    warn: () => {},
+  });
+  focusMacOSOverlayWindow({
+    platform: 'darwin',
+    getOverlayWindow: () => null,
+    stealAppFocus: () => calls.push('app.focus'),
+    warn: () => {},
+  });
+
+  assert.deepEqual(calls, []);
+});
+
+test('focusMacOSOverlayWindow still focuses the window when stealing app focus throws', () => {
+  const calls: string[] = [];
+  const overlayWindow = createOverlayWindowStub({}, calls);
+
+  focusMacOSOverlayWindow({
+    platform: 'darwin',
+    getOverlayWindow: () => overlayWindow,
+    stealAppFocus: () => {
+      throw new Error('steal failed');
+    },
+    warn: (message) => calls.push(`warn:${message}`),
+  });
+
+  assert.deepEqual(calls, [
+    'warn:Failed to steal app focus for overlay window',
+    'setFocusable:true',
+    'window.focus',
+    'webContents.focus',
+  ]);
+});
@@ -0,0 +1,54 @@
+type FocusableOverlayWebContents = {
+  isFocused: () => boolean;
+  focus: () => void;
+};
+
+type FocusableOverlayWindow = {
+  isDestroyed: () => boolean;
+  isVisible: () => boolean;
+  isFocused: () => boolean;
+  setFocusable?: (focusable: boolean) => void;
+  focus: () => void;
+  webContents: FocusableOverlayWebContents;
+};
+
+export type MacOSOverlayWindowFocusDeps = {
+  platform: NodeJS.Platform;
+  getOverlayWindow: () => FocusableOverlayWindow | null;
+  stealAppFocus: () => void;
+  warn: (message: string, details?: unknown) => void;
+};
+
+// macOS only delivers mouse-moved/hover events to the key window of the frontmost application.
+// After autoplay warmup completes mpv is the frontmost process, so the transparent overlay window
+// receives no pointer events until the user physically clicks a subtitle (which activates the app
+// via acceptFirstMouse). Renderer-side pointer recovery can toggle setIgnoreMouseEvents but cannot
+// make the window key, so it cannot wake hover on its own. Activating the overlay window from the
+// main process reproduces that manual click and keeps subtitles interactive.
+// (Modal close takes the opposite path — see restoreMacOSMpvFocusAfterModalClose — because the user
+// needs keyboard focus back on mpv, with the overlay floating passively above it.)
+export function focusMacOSOverlayWindow(deps: MacOSOverlayWindowFocusDeps): void {
+  if (deps.platform !== 'darwin') {
+    return;
+  }
+
+  const overlayWindow = deps.getOverlayWindow();
+  if (!overlayWindow || overlayWindow.isDestroyed() || !overlayWindow.isVisible()) {
+    return;
+  }
+  if (overlayWindow.isFocused()) {
+    return;
+  }
+
+  try {
+    deps.stealAppFocus();
+  } catch (error) {
+    deps.warn('Failed to steal app focus for overlay window', error);
+  }
+
+  overlayWindow.setFocusable?.(true);
+  overlayWindow.focus();
+  if (!overlayWindow.webContents.isFocused()) {
+    overlayWindow.webContents.focus();
+  }
+}
@@ -159,6 +159,30 @@ test('mpv subtitle timing handler runs AniList without timing tracker and passes
  assert.deepEqual(calls, ['immersion:line:899:901', 'post-watch:901']);
 });

+test('mpv subtitle timing handler skips invalid cue pairs until timing is complete', () => {
+  const calls: string[] = [];
+  const handler = createHandleMpvSubtitleTimingHandler({
+    recordImmersionSubtitleLine: (text, start, end) =>
+      calls.push(`immersion:${text}:${start}:${end}`),
+    hasSubtitleTimingTracker: () => true,
+    recordSubtitleTiming: (text, start, end) => calls.push(`timing:${text}:${start}:${end}`),
+    maybeRunAnilistPostWatchUpdate: async (options) => {
+      calls.push(`post-watch:${options?.watchedSeconds}`);
+    },
+    logError: () => calls.push('error'),
+  });
+
+  handler({ text: 'line', start: 953.991, end: 953.891 });
+  handler({ text: 'line', start: 953.991, end: 956.56 });
+
+  assert.deepEqual(calls, [
+    'post-watch:953.991',
+    'immersion:line:953.991:956.56',
+    'timing:line:953.991:956.56',
+    'post-watch:956.56',
+  ]);
+});
+
 test('mpv event bindings register all expected events', () => {
  const seenEvents: string[] = [];
  const bindHandlers = createBindMpvClientEventHandlers({
@@ -72,7 +72,7 @@ export function createHandleMpvSubtitleTimingHandler(deps: {
      Number.isFinite(end) ? end : 0,
    );
    const options = watchedSeconds > 0 ? { watchedSeconds } : undefined;
-    if (text.trim()) {
+    if (text.trim() && Number.isFinite(start) && Number.isFinite(end) && end > start) {
      deps.recordImmersionSubtitleLine(text, start, end);
      if (deps.hasSubtitleTimingTracker()) {
        deps.recordSubtitleTiming(text, start, end);
@@ -99,6 +99,37 @@ test('live overlay bounds mismatch forces refresh after window manager restore d
  );
 });

+test('live overlay bounds mismatch compares content bounds when compositor adds insets', () => {
+  const geometry = { x: 0, y: 0, width: 3440, height: 1440 };
+
+  assert.equal(
+    hasLiveOverlayWindowBoundsMismatch(
+      [
+        {
+          isDestroyed: () => false,
+          getBounds: () => ({ ...geometry }),
+          getContentBounds: () => ({ x: 0, y: 14, width: 3440, height: 1426 }),
+        },
+      ],
+      geometry,
+    ),
+    true,
+  );
+  assert.equal(
+    hasLiveOverlayWindowBoundsMismatch(
+      [
+        {
+          isDestroyed: () => false,
+          getBounds: () => ({ x: 0, y: -14, width: 3440, height: 1454 }),
+          getContentBounds: () => ({ ...geometry }),
+        },
+      ],
+      geometry,
+    ),
+    false,
+  );
+});
+
 test('ensure overlay window level handler delegates to core', () => {
  const calls: string[] = [];
  const ensureLevel = createEnsureOverlayWindowLevelHandler({
@@ -3,12 +3,25 @@ import type { WindowGeometry } from '../../types';
 type OverlayBoundsWindow = {
  isDestroyed: () => boolean;
  getBounds: () => WindowGeometry;
+  getContentBounds?: () => WindowGeometry;
 };

 function sameGeometry(a: WindowGeometry | null | undefined, b: WindowGeometry): boolean {
  return a?.x === b.x && a.y === b.y && a.width === b.width && a.height === b.height;
 }

+function getWindowAlignmentBounds(window: OverlayBoundsWindow): WindowGeometry | null {
+  try {
+    return window.getContentBounds?.() ?? window.getBounds();
+  } catch {
+    try {
+      return window.getBounds();
+    } catch {
+      return null;
+    }
+  }
+}
+
 export function hasLiveOverlayWindowBoundsMismatch(
  windows: Array<OverlayBoundsWindow | null | undefined>,
  geometry: WindowGeometry,
@@ -17,7 +30,7 @@ export function hasLiveOverlayWindowBoundsMismatch(
    if (!window || window.isDestroyed()) {
      return false;
    }
-    return !sameGeometry(window.getBounds(), geometry);
+    return !sameGeometry(getWindowAlignmentBounds(window), geometry);
  });
 }

@@ -56,14 +56,14 @@ function readFfmpegArgs(argsPath: string): string[] {
  return fs.readFileSync(argsPath, 'utf8').trim().split('\n');
 }

-test('buildAnimatedImageVideoFilter prepends a cloned first frame when lead-in is provided', () => {
+test('buildAnimatedImageVideoFilter holds lead-in until the next frame after the audio boundary', () => {
  assert.equal(
    buildAnimatedImageVideoFilter({
-      fps: 10,
+      fps: 24,
      maxWidth: 640,
      leadingStillDuration: 1.25,
    }),
-    'tpad=start_duration=1.25:start_mode=clone,fps=10,scale=w=640:h=-2',
+    'tpad=start_duration=1.2916666666666667:start_mode=clone,fps=24,scale=w=640:h=-2',
  );
 });

@@ -76,12 +76,12 @@ test('generateAnimatedImage includes leading audio padding in the source range',

    const args = readFfmpegArgs(argsPath);
    assert.equal(args[args.indexOf('-ss') + 1], '9.5');
-    assert.equal(args[args.indexOf('-t') + 1], '3');
+    assert.equal(args[args.indexOf('-t') + 1], '3.1');
    assert.equal(args[args.indexOf('-vf') + 1], 'fps=10,scale=w=640:h=-2');
  });
 });

-test('generateAnimatedImage defaults to unpadded sentence timing', async () => {
+test('generateAnimatedImage defaults to unpadded source start and holds through the next frame', async () => {
  await withStubbedFfmpeg(async (generator, argsPath) => {
    await generator.generateAnimatedImage('/video.mp4', 10, 12, undefined, {
      fps: 10,
@@ -90,7 +90,21 @@ test('generateAnimatedImage defaults to unpadded sentence timing', async () => {

    const args = readFfmpegArgs(argsPath);
    assert.equal(args[args.indexOf('-ss') + 1], '10');
-    assert.equal(args[args.indexOf('-t') + 1], '2');
+    assert.equal(args[args.indexOf('-t') + 1], '2.1');
+    assert.equal(args[args.indexOf('-vf') + 1], 'fps=10,scale=w=640:h=-2');
+  });
+});
+
+test('generateAnimatedImage rounds fractional source duration through the next frame boundary', async () => {
+  await withStubbedFfmpeg(async (generator, argsPath) => {
+    await generator.generateAnimatedImage('/video.mp4', 10, 12.04, undefined, {
+      fps: 10,
+      maxWidth: 640,
+    });
+
+    const args = readFfmpegArgs(argsPath);
+    assert.equal(args[args.indexOf('-ss') + 1], '10');
+    assert.equal(args[args.indexOf('-t') + 1], '2.1');
    assert.equal(args[args.indexOf('-vf') + 1], 'fps=10,scale=w=640:h=-2');
  });
 });
@@ -105,10 +119,10 @@ test('generateAnimatedImage keeps word-audio lead-in separate from audio padding

    const args = readFfmpegArgs(argsPath);
    assert.equal(args[args.indexOf('-ss') + 1], '9.5');
-    assert.equal(args[args.indexOf('-t') + 1], '3');
+    assert.equal(args[args.indexOf('-t') + 1], '3.1');
    assert.equal(
      args[args.indexOf('-vf') + 1],
-      'tpad=start_duration=1.25:start_mode=clone,fps=10,scale=w=640:h=-2',
+      'tpad=start_duration=1.3:start_mode=clone,fps=10,scale=w=640:h=-2',
    );
  });
 });
@@ -122,7 +136,7 @@ test('generateAnimatedImage clips padded source range at the start of media', as

    const args = readFfmpegArgs(argsPath);
    assert.equal(args[args.indexOf('-ss') + 1], '0');
-    assert.equal(args[args.indexOf('-t') + 1], '1.7');
+    assert.equal(args[args.indexOf('-t') + 1], '1.8');
    assert.equal(args[args.indexOf('-vf') + 1], 'fps=10,scale=w=640:h=-2');
  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sudacode	d5bfdcae7b	fix(stats): repair legacy combined-season anime rows on startup (#116 )	2026-06-09 12:41:07 -07:00
sudacode	311f1e8ee5	feat(stats): speed up session maintenance and improve stats UI (#111 )	2026-06-08 02:20:52 -07:00
sudacode	e6a16a069b	fix(anilist): mark entry completed when final episode is reached (#115 )	2026-06-07 23:45:09 -07:00
Autumn (Bee)	af67c53dd6	[codex] Restart Jellyfin remote session after setup login (#112 )	2026-06-06 11:52:16 -07:00
sudacode	ea79e331fa	build: make deps initializes submodules before installing JS deps - Add `submodules` target that runs `git submodule update --init --recursive` - `deps` now depends on `submodules` so fresh checkouts work out of the box - Update docs to replace manual install steps with `make deps` - Fix Windows build-from-source steps to include stats and submodule init	2026-06-06 01:25:01 -07:00
sudacode	ee89b0c8a9	feat(release): add contributor attribution to release notes (#114 )	2026-06-06 01:07:47 -07:00
sudacode	f2fd58cd2b	docs(changelog): require reconciled fragments, not just new ones (#113 )	2026-06-06 00:55:34 -07:00
sudacode	1280a30216	chore(release): prepare 0.15.2	2026-06-02 23:45:03 -07:00
sudacode	a80ed72b2d	docs: replace em-dashes with hyphens across docs-site	2026-06-02 23:36:44 -07:00
sudacode	4cc6c12dc7	chore(vendor): update subminer-yomitan submodule (#109 )	2026-06-02 00:37:45 -07:00
sudacode	425004879a	fix(anki): align animated AVIF clip bounds to frame boundaries (#108 )	2026-06-01 15:20:06 -07:00
sudacode	76f99e6518	fix(overlay): correct Hyprland fullscreen overlay alignment on Linux (#107 )	2026-06-01 02:12:16 -07:00
sudacode	f1e260e996	fix(overlay): fix macOS overlay interactivity and focus after autoplay (#106 )	2026-06-01 01:34:27 -07:00