fix(release): resolve style.css asar lookup with native separators

The shared-font check still handed asar a forward-slash path, which fails on Windows the same way the inventory listing did.
fix(release): unbreak packaging workflow on all three platforms
2026-09-22 05:16:22 -07:00 · 2026-09-22 02:29:28 -07:00 · 2026-09-22 02:15:49 -07:00 · 2026-09-22 01:29:58 -07:00 · 2026-09-21 20:53:26 -07:00 · 2026-09-21 20:40:57 -07:00
145 changed files with 1011 additions and 3876 deletions
@@ -20,8 +20,6 @@ coverage/
 /main-entry.js
 /main-entry.js.map

-/build/hachidori/
-
 # Logs
 *.log
 npm-debug.log*
@@ -8,7 +8,3 @@
 [submodule "vendor/subminer-yomitan"]
 	path = vendor/subminer-yomitan
 	url = https://github.com/ksyasuda/subminer-yomitan
-[submodule "vendor/hachidori"]
-	path = vendor/hachidori
-	url = https://github.com/ksyasuda/hachidori.git
-	branch = subminer
@@ -4,7 +4,7 @@

 # SubMiner

-Integrates Yomitan or Hachidori with mpv - on-screen lookups, mine to Anki, and track immersion without leaving the player
+Integrates Yomitan and mpv - on-screen lookups, mine to Anki, and track immersion without leaving the player

 [Installation](#quick-start) · [Requirements](#requirements) · [Usage](https://docs.subminer.moe/usage) · [Documentation](https://docs.subminer.moe)

@@ -25,8 +25,6 @@ Integrates Yomitan or Hachidori with mpv - on-screen lookups, mine to Anki, and

 Hover over any word and trigger a lookup to get the full Yomitan popup - definitions, pitch accent, and frequency data - without ever leaving mpv.

-Yomitan remains the default. Select the bundled Hachidori backend with `dictionaryBackend: "hachidori"` and restart SubMiner. The tray opens the selected backend's settings. See [dictionary setup](https://docs.subminer.moe/usage#hachidori-setup) for importing dictionaries, linking an external Hachidori host, and configuring Anki.
-
 <div align="center">
  <img src="docs-site/public/screenshots/yomitan-lookup.png" width="800" alt="Yomitan dictionary popup over annotated subtitles in mpv">
 </div>
@@ -277,8 +275,7 @@ SubMiner builds on the work of these open-source projects:
 | [jellyfin-mpv-shim](https://github.com/jellyfin/jellyfin-mpv-shim)                          | Jellyfin integration                                                    |
 | [Jimaku.cc](https://jimaku.cc)                                                              | Japanese subtitle search and downloads                                  |
 | [Renji's Texthooker Page](https://github.com/Renji-XD/texthooker-ui)                        | Base for the WebSocket texthooker integration                           |
-| [Yomitan](https://github.com/yomidevs/yomitan)                                              | Default dictionary engine and morphological parser                     |
-| [Hachidori](https://github.com/bee-san/hachidori)                                           | Alternative dictionary backend, powered by HoshiDicts                   |
+| [Yomitan](https://github.com/yomidevs/yomitan)                                              | Dictionary engine powering all lookups and the morphological parser     |
 | [yomitan-jlpt-vocab](https://github.com/stephenmk/yomitan-jlpt-vocab)                       | JLPT level tags for vocabulary                                          |

 ## License
@@ -22,7 +22,7 @@
        "@types/node": "^24.10.0",
        "@types/ws": "^8.18.1",
        "electron": "42.6.0",
-        "electron-builder": "26.15.3",
+        "electron-builder": "26.16.1",
        "esbuild": "^0.25.12",
        "eslint": "^10.8.0",
        "prettier": "^3.8.1",
@@ -36,9 +36,9 @@
  },
  "overrides": {
    "@xmldom/xmldom": "0.8.15",
-    "app-builder-lib": "26.15.3",
+    "app-builder-lib": "26.16.1",
    "brace-expansion": "5.0.9",
-    "electron-builder-squirrel-windows": "26.15.3",
+    "electron-builder-squirrel-windows": "26.16.1",
    "fast-uri": "3.1.6",
    "form-data": "4.0.6",
    "ip-address": "10.2.0",
@@ -181,7 +181,7 @@

    "@neon-rs/load": ["@neon-rs/load@0.0.4", "", {}, "sha512-kTPhdZyTQxB+2wpiRcFWrDcejc4JI6tkPuS7UZCG4l6Zvc5kU/gGQ/ozvHTh1XR5tS+UlfAfGuPajjzQjCiHCw=="],

-    "@noble/hashes": ["@noble/hashes@2.2.0", "", {}, "sha512-IYqDGiTXab6FniAgnSdZwgWbomxpy9FtYvLKs7wCUs2a8RkITG+DFGO1DM9cr+E3/RgADRpFjrKVaJ1z6sjtEg=="],
+    "@noble/hashes": ["@noble/hashes@1.8.0", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],

    "@peculiar/asn1-schema": ["@peculiar/asn1-schema@2.8.0", "", { "dependencies": { "@peculiar/utils": "^2.0.2", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-7YT0U/ze0tF2QOBbE15gKZwy5tvgGyLRiRHLzhlbOpf7BT032oBSd0haZqXn5W6l26WLlu3dyxzjM+2638/z2Q=="],

@@ -243,7 +243,7 @@

    "ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],

-    "app-builder-lib": ["app-builder-lib@26.15.3", "", { "dependencies": { "@electron/asar": "3.4.1", "@electron/fuses": "^1.8.0", "@electron/get": "^3.0.0", "@electron/notarize": "2.5.0", "@electron/osx-sign": "1.3.3", "@electron/rebuild": "^4.0.4", "@electron/universal": "2.0.3", "@malept/flatpak-bundler": "^0.4.0", "@noble/hashes": "^2.2.0", "@peculiar/webcrypto": "^1.7.1", "@types/fs-extra": "9.0.13", "ajv": "^8.18.0", "asn1js": "^3.0.10", "async-exit-hook": "^2.0.1", "builder-util": "26.15.3", "builder-util-runtime": "9.7.0", "chromium-pickle-js": "^0.2.0", "ci-info": "4.3.1", "debug": "^4.3.4", "dotenv": "^16.4.5", "dotenv-expand": "^11.0.6", "ejs": "^3.1.8", "electron-publish": "26.15.3", "fs-extra": "^10.1.0", "hosted-git-info": "^4.1.0", "isbinaryfile": "^5.0.0", "jiti": "^2.4.2", "js-yaml": "^4.1.0", "json5": "^2.2.3", "lazy-val": "^1.0.5", "minimatch": "^10.2.5", "pkijs": "^3.4.0", "plist": "3.1.0", "proper-lockfile": "^4.1.2", "resedit": "^1.7.0", "semver": "~7.7.3", "tar": "^7.5.7", "temp-file": "^3.4.0", "tiny-async-pool": "1.3.0", "unzipper": "^0.12.3", "which": "^5.0.0" }, "peerDependencies": { "dmg-builder": "26.15.3", "electron-builder-squirrel-windows": "26.15.3" } }, "sha512-2VnyWkqsP5v5XbBhL3tD5Syx8iNPBYsoU7kY4S2fz7wg8Rj/nztWKCUzGKaFRTv0Xwf3/H058CR1Kvtd/3lRow=="],
+    "app-builder-lib": ["app-builder-lib@26.16.1", "", { "dependencies": { "@electron/asar": "3.4.1", "@electron/fuses": "^1.8.0", "@electron/get": "^3.0.0", "@electron/notarize": "2.5.0", "@electron/osx-sign": "1.3.3", "@electron/rebuild": "^4.0.4", "@electron/universal": "2.0.3", "@malept/flatpak-bundler": "^0.4.0", "@noble/hashes": "^1.8.0", "@peculiar/webcrypto": "^1.7.1", "@types/fs-extra": "9.0.13", "ajv": "^8.18.0", "asn1js": "^3.0.10", "async-exit-hook": "^2.0.1", "builder-util": "26.16.0", "builder-util-runtime": "9.7.0", "chromium-pickle-js": "^0.2.0", "ci-info": "4.3.1", "debug": "^4.3.4", "dotenv": "^16.4.5", "dotenv-expand": "^11.0.6", "ejs": "^3.1.8", "electron-publish": "26.16.0", "fs-extra": "^10.1.0", "hosted-git-info": "^4.1.0", "isbinaryfile": "^5.0.0", "jiti": "^2.4.2", "js-yaml": "^4.1.0", "json5": "^2.2.3", "lazy-val": "^1.0.5", "minimatch": "^10.2.5", "pkijs": "^3.4.0", "plist": "3.1.0", "proper-lockfile": "^4.1.2", "resedit": "^1.7.0", "semver": "~7.7.3", "tar": "^7.5.7", "temp-file": "^3.4.0", "tiny-async-pool": "1.3.0", "unzipper": "^0.12.3", "which": "^5.0.0" }, "peerDependencies": { "dmg-builder": "26.16.1", "electron-builder-squirrel-windows": "26.16.1" } }, "sha512-FhaO6YOup01ZfQW0Z6gt3AyukJjv1gW4uFK47jTgwcHZKqyN/fSlK2LqPf9tAeZYLP2bRJLDzeOkRImsw2X4Pg=="],

    "argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],

@@ -273,7 +273,7 @@

    "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="],

-    "builder-util": ["builder-util@26.15.3", "", { "dependencies": { "@types/debug": "^4.1.6", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "cross-spawn": "^7.0.6", "debug": "^4.3.4", "fs-extra": "^10.1.0", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.0", "js-yaml": "^4.1.0", "sanitize-filename": "^1.6.3", "source-map-support": "^0.5.19", "stat-mode": "^1.0.0", "temp-file": "^3.4.0", "tiny-async-pool": "1.3.0" } }, "sha512-q2hn7Mbo2nFNkVekPiHFx6Nfo3hURmES3tfBn+k5Pqxl2RkmP3QGqZUhH/q9Pch/4G05NRhPjDlVj1O8q4Txvw=="],
+    "builder-util": ["builder-util@26.16.0", "", { "dependencies": { "@types/debug": "^4.1.6", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "cross-spawn": "^7.0.6", "debug": "^4.3.4", "fs-extra": "^10.1.0", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.0", "js-yaml": "^4.1.0", "sanitize-filename": "^1.6.3", "source-map-support": "^0.5.19", "stat-mode": "^1.0.0", "temp-file": "^3.4.0", "tiny-async-pool": "1.3.0" } }, "sha512-RLyJhB7Si3YkzKR9ubQslWuXW3Vhs3CGe1i+SeixBZ0qTd1mk3XBmssvY22TlB6CS5blyko8Gu1JzpYk8UkYAg=="],

    "builder-util-runtime": ["builder-util-runtime@9.7.0", "", { "dependencies": { "debug": "^4.3.4", "sax": "^1.2.4" } }, "sha512-g/kR520giAFYkSXTzcmF3kqQq7wi8F6N6SzeDgZrqTBN+VHdmgWOyTdD1yD7AATDId/yXLvuP34CxW46/BwCdw=="],

@@ -335,7 +335,7 @@

    "discord-api-types": ["discord-api-types@0.38.49", "", {}, "sha512-XnqcWmnFZFAE8ZM8SHAw9DIV8D3Or00rMQ8iQLotrEA2PmXhl+ykaf6L6q4l474hrSUH1JaYcv+iOMRWp2p6Tg=="],

-    "dmg-builder": ["dmg-builder@26.15.3", "", { "dependencies": { "app-builder-lib": "26.15.3", "builder-util": "26.15.3", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0" } }, "sha512-O3zJUFUYHJKgzPqioHxfxzBzlSC1eXCSr79gMSBKBP5AgjjpmrydMsMLotEg9fAJF36vdUncb+4ndRNxoPdlSQ=="],
+    "dmg-builder": ["dmg-builder@26.16.1", "", { "dependencies": { "app-builder-lib": "26.16.1", "builder-util": "26.16.0", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0" } }, "sha512-pnI/3Qb24Uk+rMTgIUrsVUKosVgwmBUdF8Zeb8TexOSbpq8MWc7v6l+n+FrEqVkjNZwzBN+XpDS9ENgZ/rkWAw=="],

    "dotenv": ["dotenv@16.6.1", "", {}, "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow=="],

@@ -349,11 +349,11 @@

    "electron": ["electron@42.6.0", "", { "dependencies": { "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", "install-electron": "install.js" } }, "sha512-axGNgd+yCTg+vi1VEGrQqAj9WVWkePKwbICSAvMiT2eTaxhij9a/xhBHD6rXV8wrlW9ZfJzE5+xg752ImxrmTw=="],

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

-    "electron-builder-squirrel-windows": ["electron-builder-squirrel-windows@26.15.3", "", { "dependencies": { "app-builder-lib": "26.15.3", "builder-util": "26.15.3", "electron-winstaller": "5.4.0" } }, "sha512-Jc19XPV9y9+2bAdZPkXuVNGNIEFBq9poHC61l8Kv6FdK7DRG3+Ic0rerC0DXOaeHNz8yW0fg/JnF8GQROOF5MA=="],
+    "electron-builder-squirrel-windows": ["electron-builder-squirrel-windows@26.16.1", "", { "dependencies": { "app-builder-lib": "26.16.1", "builder-util": "26.16.0", "electron-winstaller": "5.4.0" } }, "sha512-w0y44wSaT1l6R7CAGmeHn4nHPfvzDyCAU1xJyi1w9SbPYJpYn76SmHDzqHf8Y7l91cPWTdPYBpGQtB2T5mJ08A=="],

-    "electron-publish": ["electron-publish@26.15.3", "", { "dependencies": { "@types/fs-extra": "^9.0.11", "aws4": "^1.13.2", "builder-util": "26.15.3", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "form-data": "^4.0.5", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "mime": "^2.5.2" } }, "sha512-g/2bn8YTavY4cuS5F+jOS7zmZbXXBV8KZ8yHKfJjFPoKtzBqrpCdNPxBd3tqdBwP7BVd0lGzf7Bk2s0KesWZ4Q=="],
+    "electron-publish": ["electron-publish@26.16.0", "", { "dependencies": { "@types/fs-extra": "^9.0.11", "aws4": "^1.13.2", "builder-util": "26.16.0", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "form-data": "^4.0.5", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "mime": "^2.5.2" } }, "sha512-Vt3KzQIiw9BImvNOYtndg9Mjki+tl4+1sQiC/+G5j8khWaENOJFWodiB+sUl6yyHwtd37avehskdtPw7f8y/+Q=="],

    "electron-updater": ["electron-updater@6.8.9", "", { "dependencies": { "builder-util-runtime": "9.7.0", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", "semver": "~7.7.3", "tiny-typed-emitter": "^2.1.0" } }, "sha512-ZhVxM9iGONUpZGI1FxdMRgJjUFXi7AYGVa5PwKlO1tV1/4zDxQmfKpXOHVztKrd6L9rLcFjERvi1Mf2vxyTkig=="],

@@ -1,5 +1,4 @@
 type: docs
 area: launcher

- Documented private-runtime launcher installation, simplified first-run setup, custom app locations, legacy launcher migration, and package-managed updates. Updated release-note download guidance for the bundled runtime and Windows launcher.
- Documented the bundled Bun runtime's MIT and LGPL licensing, where the notices live in the app, and the corresponding-source release asset. The AUR package now lists the bundled runtime licenses and installs their notices under `/usr/share/licenses/subminer-bin`, and `subminer-assets.tar.gz` includes the same notices.
+- Documented the bundled-runtime launcher install, legacy launcher migration, package-managed updates, and the bundled Bun runtime's MIT and LGPL notices (installed under `/usr/share/licenses/subminer-bin` by the AUR package and included in `subminer-assets.tar.gz`).
@@ -1,5 +1,4 @@
 type: changed
 area: launcher

- Made every installed and downloadable launcher use the Bun runtime included with SubMiner. Added a Windows `subminer.cmd` download, persistent private runtime caches for Linux and Windows, and migration for recognized legacy launchers. Deferred migrations survive overlapping update checks and remain pending when startup cannot safely refresh the launcher.
- Simplified first-run setup to a single optional launcher control, with runtime repair guidance shown only when needed.
+- Every installed and downloadable launcher now uses the Bun runtime bundled with SubMiner instead of a system Bun. Recognized legacy launchers migrate automatically, Windows gets a `subminer.cmd` download, and first-run setup is reduced to a single optional launcher control with runtime repair guidance shown only when needed.
@@ -1,6 +1,4 @@
 type: changed
 area: sync

- Sync uses compressed, incremental rsync transfers on compatible macOS and Linux machines, caching the last received snapshot per peer to reduce traffic on subsequent syncs. Cache helpers work through the launcher; older apps and launchers fall back to compressed transfers without an upload cache.
- Machines without compatible rsync, including Windows endpoints, automatically use compressed scp transfers.
- Rsync explicitly uses SSH and aborts transfers that exceed 30 minutes before merging.
+- Sync now uses compressed, incremental rsync transfers between compatible macOS and Linux machines, caching the last received snapshot per peer to cut traffic on later syncs. Machines without compatible rsync (including Windows) fall back to compressed scp, and older peers still work without the upload cache. Transfers abort after 30 minutes.
@@ -1,4 +1,4 @@
 type: fixed
 area: anki

- Added `ankiConnect.fields.wordAudio` to read word audio separately from the generated sentence-audio destination, fixing animated images that start moving immediately when `fields.audio` points to `SentenceAudio`.
+- Added `ankiConnect.fields.wordAudio` so word audio is read separately from the sentence-audio destination, fixing animated images that started moving immediately when `fields.audio` pointed to `SentenceAudio`.
@@ -1,7 +1,4 @@
 type: fixed
 area: jellyfin

- Set the mpv title before loading Jellyfin streams and reject URL-derived titles from metadata lookups, Anki source fields, Discord presence, and stats.
- Keep authenticated stream URLs out of stats identities even when playback metadata has not arrived.
- Remove previously cached credential-bearing Jellyfin stream parser metadata without changing unrelated anime metadata, watch history, or library assignments.
- Use safe media identities for persisted AniList retry keys, discard URL-derived queued searches, and skip updates and retries whose media identity is empty.
+- Jellyfin streams no longer leak URL-derived titles or credential-bearing stream URLs into metadata lookups, Anki source fields, Discord presence, stats identities, or AniList retry keys. Previously cached credential-bearing parser metadata is cleaned up without touching watch history or library assignments.
@@ -0,0 +1,7 @@
+type: fixed
+area: jellyfin
+
+- Jellyfin playback, subtitle, artwork, and remote-control URLs now authenticate with the `ApiKey` query parameter instead of the legacy `X-Emby-*` headers, so the integration works on Jellyfin 12 where legacy authorization is disabled by default.
+- "Play on SubMiner" keeps working on Jellyfin 12: the cast-target websocket answers keep-alive requests and reconnects when the server stops replying instead of silently dying after about a minute.
+- The Jellyfin "now playing" bar clears when you close or finish a cast video instead of running on to the end of the episode.
+- Anki cards mined from Jellyfin playback get the episode title in the misc info field again instead of "Unknown media".
@@ -1,5 +1,4 @@
 type: fixed
 area: stats

- Stats server startup reports port conflicts without crashing SubMiner, shares concurrent startup requests, and shows in-app startup errors through configured status notifications.
- Background stop cancels pending background startup without disconnecting foreground-only dashboards. Shutdown bounds the wait for active HTTP requests and awaits tracker finalization before exit, with a deadline for forced application exit.
+- Stats server port conflicts are reported through status notifications instead of crashing SubMiner. Startup and shutdown are also more robust: concurrent startup requests are shared, background stop no longer disconnects foreground dashboards, and shutdown bounds how long it waits for active requests.
@@ -1,14 +0,0 @@
-type: added
-area: dictionary
-
- Added a bundled Hachidori dictionary backend alongside the default Yomitan backend. Select it with `dictionaryBackend` and restart SubMiner.
- The tray and dictionary-settings shortcut follow the selected backend. `--hachidori` opens Hachidori settings, while `--yomitan` continues to open Yomitan settings.
- Hachidori integrates with subtitle scanning, popup controls, lookup tracking, character dictionaries, and Anki media enrichment, with separate dictionaries and settings for each backend.
- Hachidori auto-populates its first Anki template from SubMiner's deck, tags, and field mappings, detects an unambiguous matching note type, and preserves existing custom templates. Anki discovery retries after an unavailable connection.
- Hachidori saves downloadable word audio before sending a note through SubMiner's Anki proxy, so freshly mined animated cards include the word-audio delay.
- Hachidori reloads its background code on startup so extension updates take effect while preserving installed dictionaries and settings.
- First-run setup remembers each backend that finished it, so switching back does not repeat setup, and the launcher gates playback on the backend the running app started with. Current incomplete or cancelled setup takes precedence over stale completion history.
- Stats dashboard mining and deck lookup use the selected backend. Settings labels for popup pause and the dictionary deck no longer name Yomitan, and the backend selector sits with the other dictionary settings.
- Hachidori scans, dictionary counts, and settings reads wait for the dictionary engine to finish loading or importing instead of caching empty results.
- First-run setup can link an external Hachidori dictionary host in an app, browser, or Docker container, verify its library, and unlink back to local dictionaries. The optional host controls are collapsed by default and explain which apps or containers must stay running. Unresponsive connection checks time out so setup remains usable. Anki mining and media enrichment stay in SubMiner.
- Hachidori frequency highlighting reuses dictionary-entry ranks and fills missing ranks through its existing API. Entries without a matching definition may remain unranked. The bundled integration is maintained in a pinned fork submodule using upstream HoshiDicts and WASM binaries.
@@ -1,4 +0,0 @@
-type: docs
-area: dictionary
-
- Documented backend selection, separate Hachidori dictionary and Anki setup, the settings flags and shortcuts, and external host linking with local Anki mining and the running requirements for each host type.
@@ -1,5 +1,4 @@
 type: docs
 area: subtitles

- Explain how dialogue generation retains uncertain audible sections, why songs may also be transcribed, how detected speech starts guide long-passage cuts to reduce early subtitles, and why each passage uses a fresh Whisper process.
- Document automatic loaded subtitle references, English dialogue preference, signs/songs filtering, fallback behavior, and the limits of reference-guided timing.
+- Documented subtitle generation: model choice, VAD behavior, reference-track guided splitting, fallback behavior, and known limits.
@@ -1,8 +1,7 @@
 type: added
 area: subtitles

- Generate local Japanese SRT subtitles with whisper.cpp from a standalone modal opened with Ctrl+Shift+G, the empty subtitle sidebar's generation button, or `subminer generate-subs`, with shared progress reporting, cancellation, safe output files, and automatic loading into the matching mpv video. The sidebar button hides while subtitle lines are loaded.
- Configure an existing multilingual model in Settings or choose an official multilingual model, including quantized variants, in the modal or launcher. The modal shows download sizes, speed and accuracy guidance, and a recommended starting model before explicitly downloading a verified SubMiner-managed model. Executable paths are optional overrides; empty fields find whisper-cli, ffmpeg, and ffprobe on PATH. The modal's Local tools check and the launcher name any missing executable and its setting before downloading a model or extracting audio, and generation confirms the destination directory grants write and search permissions up front.
- Optionally select Focus on spoken dialogue in the modal and use Download speech detection model to install the separate Silero model with progress and cancellation. The choice lasts for the session; a configured VAD model path sets the default. Retain uncertain audible sections so VAD rejection does not discard dialogue under music, accepting that songs may also be transcribed. Keep passages intact within Whisper's audio window, split longer passages near detected speech starts or quiet pauses with overlapping context to reduce early subtitle timing, and combine overlapping duplicate cues even when punctuation differs. Run each passage in a fresh Whisper process to prevent repeated-character output caused by state carried between files, at the cost of reloading the model per passage. Preserve original media timing and separate repeated dialogue.
- Recommend large-v3-turbo in the model picker when NVIDIA hardware and CUDA device support in the selected Whisper executable are confirmed; recommend small otherwise. Preserve configured and session model selections. Use a wider generation modal to reduce text wrapping and scrolling, while keeping it within smaller player windows.
- Automatically use an eligible embedded or external subtitle track loaded in mpv to guide long-passage cuts, preferring English dialogue and excluding tracks marked signs, songs, forced, or generated. Honor active subtitle delays, retain unreferenced audio, and fall back to audio timing when references cannot be read. Available in the overlay and launcher, with or without VAD. The launcher captures audio selection, reference tracks, and delays before model setup so playback changes during a download do not mix inputs from different times, and rejects an unverified media snapshot before using mpv's selected audio stream.
+- Generate Japanese SRT subtitles locally with whisper.cpp from a modal (Ctrl+Shift+G), the empty subtitle sidebar's generation button, or `subminer generate-subs`, with progress, cancellation, and automatic loading into mpv.
+- Pick an official multilingual model (including quantized variants) with size and accuracy guidance and download it in-app, or point Settings at an existing model. `large-v3-turbo` is recommended when CUDA support is detected, `small` otherwise. whisper-cli, ffmpeg, and ffprobe are found on PATH unless overridden, and missing tools are named before any download starts.
+- Optional "Focus on spoken dialogue" mode uses a separately downloadable Silero VAD model, keeping uncertain audible sections so dialogue under music is not dropped (songs may be transcribed too).
+- Long passages are split near detected speech starts or quiet pauses, guided by an eligible embedded or external subtitle track already loaded in mpv when one is available, to reduce early subtitle timing. Each passage runs in a fresh Whisper process to avoid repeated-character output.
@@ -1,5 +1,4 @@
 type: docs
 area: jellyfin

- Explain how Jellyfin media titles, unknown-title fallbacks, and stats identities keep stream credentials out of metadata.
- Document AniList rejection of empty media identities and the conditions for clearing cached Jellyfin parser metadata.
+- Documented how Jellyfin media titles and stats identities keep stream credentials out of metadata.
@@ -1,4 +1,4 @@
 type: added
 area: overlay

- The overlay discovers non-conflicting keyboard bindings from mpv defaults, input.conf, and loaded scripts in the background. SubMiner controls and explicitly disabled bindings take precedence. Discovered bindings stay session-only and do not appear in SubMiner's help menu.
+- The overlay picks up non-conflicting keyboard bindings from mpv defaults, `input.conf`, and loaded scripts. SubMiner controls and explicitly disabled bindings take precedence; discovered bindings are session-only and not listed in the help menu.
@@ -1,4 +0,0 @@
-type: fixed
-area: overlay
-
- Overlay modals such as the media timing review open on the first attempt when their dedicated window is created on demand, instead of after a four-second retry.
@@ -1,5 +1,4 @@
 type: changed
 area: release

- Reduced installer and unpacked app size by excluding documentation demo media, dependency source maps, TypeScript files, test and fixture directories, other development files, and unused Koffi platform binaries, and sharing the existing Japanese UI font across windows.
- Added package content checks, published size reports with release comparisons, and packaged asset/native-module smoke checks to the shared stable and prerelease build workflow. Size growth is reported without blocking releases.
+- Reduced installer and unpacked app size by dropping demo media, source maps, TypeScript sources, test fixtures, and unused Koffi binaries from the package, and sharing one Japanese UI font across windows. Release builds now publish package size reports with comparisons against the previous release.
@@ -1,4 +1,4 @@
 type: added
 area: overlay

- Select dialogue across subtitle sidebar rows and copy it without timestamps using Ctrl/Cmd+C or the Copy button. Selection keeps the excerpt in view during playback and does not seek or require mining a card.
+- Select dialogue across subtitle sidebar rows and copy it without timestamps using Ctrl/Cmd+C or the Copy button. Selecting does not seek or require mining a card.
@@ -1,6 +1,4 @@
 type: changed
-breaking: true
 area: stats

- Reject requests from untrusted browser origins and hosts before stats data, media, or Anki operations run, and require JSON for mutation bodies.
- Load the in-app stats overlay from the local server so it uses the same origin protection as the browser dashboard.
+- The stats server now rejects requests from non-loopback hosts and browser origins and requires `application/json` for mutation bodies. The in-app stats overlay loads from the local server so it shares the same protection. Reverse-proxied or Tailscale Serve dashboards are unsupported; scripts that POST must set a JSON content type.
@@ -1,4 +1,4 @@
 type: docs
 area: stats

- Documented provider reassignment, merge compatibility, and TMDB credential command caching and retry cooldown.
+- Documented TMDB linking, provider reassignment, merge compatibility, and credential command caching.
@@ -1,8 +1,6 @@
 type: added
 area: stats

- Live-action dramas and movies in the stats Library now get posters, synopses, and titles from TMDB. Release builds include a project key, so it works out of the box; `tmdb.apiKey` (or `tmdb.apiKeyCommand`) overrides it, and is required when running from source.
- Unlinked titles that AniList cannot match are looked up on TMDB automatically when the parsed filename matches a Japanese live-action title exactly; otherwise use the new **Link to TMDB** action on a title to pick it by hand.
- Entries linked to the same TMDB title are merged into one card even when they came from different season folders, and the Library kind selector gained a Live Action option alongside Anime and YouTube.
- Provider reassignment preserves the previous link and artwork if the replacement download fails, and refreshes completion totals when the episode count changes. Merges and sync keep conflicting AniList and TMDB identities separate, and the merge dialog explains when a selection mixes the two instead of failing.
- TMDB credential commands cache successful output and wait 30 seconds before retrying failed or empty output, using the bundled key in the meantime when available.
+- Live-action dramas and movies in the stats Library get posters, synopses, and titles from TMDB. Release builds include a project key; `tmdb.apiKey` (or `tmdb.apiKeyCommand`) overrides it and is required when running from source.
+- Titles AniList cannot match are looked up on TMDB automatically when the parsed filename matches a Japanese live-action title exactly; otherwise use the new **Link to TMDB** action. Entries linked to the same TMDB title merge into one card, and the Library kind selector gained a Live Action option.
+- Provider reassignment keeps the previous link and artwork if the replacement download fails. Merges and sync keep AniList and TMDB identities separate, and the merge dialog explains mixed selections instead of failing.
@@ -1,4 +1,4 @@
 type: docs
 area: anki

- Documented the separate word-audio mapping for animated-image synchronization and that existing images need regeneration to pick up the corrected freeze.
+- Documented the separate word-audio field mapping; existing animated images need regeneration to pick up the fix.
@@ -1,7 +1,5 @@
 type: added
 area: stats

- Store YouTube channels as a separate media kind and migrate existing channel entries without changing viewing history or manual video assignments, including channels created after temporarily returning to an older build.
- Add All Titles, Anime, and YouTube Library filters, identify channel pages, and keep channels out of AniList matching, season repair, and duplicate recommendations.
- Keep same-title anime and YouTube records separate in storage and sync while repairing legacy channel classification.
- Refuse merges and video moves that would mix an anime entry with a YouTube channel; the move picker and merge selection only combine entries of the same kind.
+- YouTube channels are now a separate Library media kind. Existing channel entries migrate automatically without changing viewing history or manual video assignments.
+- Added All Titles, Anime, and YouTube Library filters. Channels stay out of AniList matching, season repair, and duplicate recommendations, and merges or video moves cannot mix an anime entry with a YouTube channel.
@@ -6,13 +6,6 @@
 */
 {

-  // ==========================================
-  // Dictionary Backend
-  // Select the dictionary lookup backend: yomitan or hachidori.
-  // Restart SubMiner after changing the backend. Each backend keeps separate settings and dictionaries.
-  // ==========================================
-  "dictionaryBackend": "yomitan", // Dictionary lookup backend. Restart SubMiner after changing this setting. Values: yomitan | hachidori
-
  // ==========================================
  // Japanese Subtitle Generation
  // Generate timed Japanese subtitles from local audio using whisper.cpp.
@@ -21,14 +21,6 @@ AnkiConnect listens on `http://127.0.0.1:8765` by default. If you changed the po

 AnkiConnect and Kiku/Senren settings follow the [configuration validation rules](/configuration#configuration-file): invalid values produce a warning and fall back to the option's default. Use JSON booleans such as `true`, not strings such as `"true"`, and a positive number for `ankiConnect.pollingRate`.

-### Reusing SubMiner settings in Hachidori
-
-When Hachidori is the selected backend, SubMiner uses its Anki settings to populate Hachidori's first Anki template on startup and when opening its settings. It copies the configured deck and tags into untouched defaults, then fills missing word, sentence, pronunciation-audio, and picture mappings with fields that exist in Anki. Pronunciation uses `ankiConnect.fields.wordAudio`, falling back to `fields.audio` when no word-audio field is set.
-
-If the note type is unset, SubMiner looks for a unique match containing its configured word and sentence fields. Enabled Lapis, Kiku, or Senren integration narrows the search; Lapis uses its configured model name. A fresh mapping also receives Hachidori's matching preset for readings, definitions, and other recognized fields. If several note types match, choose one in Hachidori Settings. If Anki is closed, open Hachidori Settings again after starting Anki to retry.
-
-Existing custom decks, tags, field mappings, advanced templates, and additional templates stay intact. This fills missing settings rather than continually overwriting Hachidori choices. The Anki endpoint continues to follow SubMiner's proxy configuration. Sentence audio, image timing, translation, metadata, and duplicate field grouping remain controlled by SubMiner; pronunciation sources are configured in Hachidori. Linking an external dictionary host does not change this behavior.
-
 ## Auto-enrichment transport

 When you add a word via Yomitan, SubMiner detects the new card and fills in the sentence, audio, and image fields automatically. Two detection methods are available:
@@ -149,8 +141,6 @@ Field names are matched against your Anki note type case-insensitively (an exact

 `fields.wordAudio` selects the existing dictionary-audio field used to calculate the animated image's opening freeze. This mapping only reads audio; `fields.audio` still controls where generated sentence audio is written. See [config.example.jsonc](/config.example.jsonc) for defaults.

-When Hachidori mines through SubMiner's Anki proxy, it prepares downloadable word audio before saving the note so the animation delay can be measured on the first mine. Configure a downloadable pronunciation source in Hachidori's Audio settings; browser speech cannot be saved into Anki by the SubMiner overlay. If pronunciation is unavailable, Hachidori reports a warning and the card has no word-audio hold.
-
 These mappings always control normal word-card enrichment, including Yomitan proxy/polling updates and manual clipboard updates. Enabling Lapis or Kiku does not replace the configured word-card sentence and audio fields with `Sentence` and `SentenceAudio`. The dedicated sentence-card and audio-card shortcuts still use those Lapis/Kiku field names.

 Two related options live alongside `fields`: `ankiConnect.deck` (target deck; empty falls back as described above) and `ankiConnect.tags` (tags added to mined cards, default `["SubMiner"]`; set `[]` to disable tagging). The `miscInfo` content is controlled by `ankiConnect.metadata.pattern` (default `[SubMiner] %f (%t)`; tokens: `%f` filename, `%F` filename with extension, `%t` timestamp, `%T` timestamp with milliseconds, `<br>` newline).
@@ -325,8 +315,6 @@ Word cards get a card-type flag when SubMiner fills their sentence, whether that

 When you mine the same word multiple times, SubMiner can merge the cards instead of creating duplicates. This is designed for note types that support grouped fields: [Kiku](https://github.com/youyoumu/kiku) and [Senren](https://github.com/BrenoAqua/Senren) (which calls the feature scene switching).

-Field grouping runs when a new note is added with known duplicates. With the Hachidori backend that is the popup's **Add anyway** choice; **Overwrite** updates the existing note in place and only receives media enrichment.
-
 ```jsonc
 "ankiConnect": {
  "isKiku": {
@@ -171,12 +171,6 @@ The configuration file includes several main sections:

 ## Core settings

-### Dictionary backend
-
-`dictionaryBackend` accepts `"yomitan"` or `"hachidori"`. The default is defined in the [generated configuration example](/config.example.jsonc). Restart SubMiner after changing it. The tray shows the selected backend's settings, and the global dictionary-settings shortcut follows the same selection.
-
-Each backend stores its own dictionaries and mining settings. `yomitan.externalProfilePath` applies only to Yomitan. See [Hachidori setup](./usage.md#hachidori-setup) before switching an existing installation.
-
 ### Logging

 Control the minimum log level for runtime output:
@@ -12,7 +12,7 @@ This is the recommended way to use Jellyfin with SubMiner. A terminal-only optio

 ## Requirements

- A Jellyfin server plus your username and password
+- A Jellyfin server plus your username and password (Jellyfin 12, which disables legacy authorization by default, is supported)
 - SubMiner installed and running (see [Installation](/installation))
 - On Linux, the session token is stored with `gnome-libsecret` by default

@@ -6,13 +6,6 @@
 */
 {

-  // ==========================================
-  // Dictionary Backend
-  // Select the dictionary lookup backend: yomitan or hachidori.
-  // Restart SubMiner after changing the backend. Each backend keeps separate settings and dictionaries.
-  // ==========================================
-  "dictionaryBackend": "yomitan", // Dictionary lookup backend. Restart SubMiner after changing this setting. Values: yomitan | hachidori
-
  // ==========================================
  // Japanese Subtitle Generation
  // Generate timed Japanese subtitles from local audio using whisper.cpp.
@@ -15,7 +15,7 @@ All shortcuts are configurable in `config.jsonc` under `shortcuts` and `keybindi
 | Shortcut      | Action                 | Scope                                       | Configurable                           |
 | ------------- | ---------------------- | -------------------------------------------- | -------------------------------------- |
 | `Alt+Shift+O` | Toggle visible overlay | Works while the overlay or mpv has focus     | `shortcuts.toggleVisibleOverlayGlobal` |
-| `Alt+Shift+Y` | Open active dictionary settings | OS-global (registered with the OS)           | Fixed (not configurable)               |
+| `Alt+Shift+Y` | Open Yomitan settings  | OS-global (registered with the OS)           | Fixed (not configurable)               |

 ::: tip
 `Alt+Shift+O` is dispatched by the overlay window and the mpv plugin, so it works from either surface without OS registration. Only `Alt+Shift+Y` is registered with the OS; if it conflicts with another application, that binding cannot be changed. All `shortcuts.*` keys hot-reload - no restart needed.
@@ -124,7 +124,7 @@ When the mpv plugin is installed, all commands use a `y` chord prefix - press `y
 | `y-S` | Stop overlay                                               |
 | `y-t` | Toggle visible overlay                                     |
 | `v`   | Cycle primary subtitle bar mode (hidden → visible → hover) |
-| `y-o` | Open active dictionary settings                           |
+| `y-o` | Open Yomitan settings                                      |
 | `y-r` | Restart overlay                                            |
 | `y-c` | Check overlay status                                       |
 | `y-h` | Open session help                                          |
@@ -15,8 +15,8 @@ That is the whole setup. The `subminer` launcher starts mpv, opens the IPC socke
 Every current launcher wrapper uses the Bun runtime included with the SubMiner app. This includes setup installs, release downloads, `make install`, and the AUR package. You only need the wrapper directory on your terminal `PATH`. Building SubMiner from source still requires Bun on the development machine.

 > [!IMPORTANT]
-> SubMiner requires at least one dictionary in the selected lookup backend.
-> See [Yomitan setup](#yomitan-setup) or [Hachidori setup](#hachidori-setup).
+> SubMiner requires the bundled Yomitan instance to have at least one dictionary imported for lookups to work.
+> See [Yomitan setup](#yomitan-setup) for details.

 ::: tip Anki card enrichment
 If you want sentence, audio, and screenshot fields on your Anki cards, add this to your config:
@@ -174,7 +174,6 @@ SubMiner.AppImage --toggle-primary-subtitle-bar  # Toggle the primary subtitle b
 SubMiner.AppImage --toggle-subtitle-sidebar      # Toggle the subtitle sidebar
 SubMiner.AppImage --open-tsukihime        # Open TsukiHime subtitle search
 SubMiner.AppImage --yomitan               # Open Yomitan settings
-SubMiner.AppImage --hachidori             # Open Hachidori settings
 SubMiner.AppImage --settings              # Open the SubMiner settings window
 SubMiner.AppImage --jellyfin              # Open the Jellyfin setup window
 SubMiner.AppImage --dictionary            # Generate a character dictionary ZIP
@@ -209,7 +208,7 @@ The tray menu also includes `View Changelog`, which opens the in-app changelog m

 ### Windows mpv shortcut

-First-run setup creates the config file, then requires dictionaries in the selected backend before it can finish.
+First-run setup creates the config file, then requires Yomitan dictionaries before it can finish.

 If you enabled the optional Windows shortcut during install, SubMiner creates a `SubMiner mpv` shortcut in the Start menu and/or on the desktop. On Windows, that shortcut is the recommended way to launch local files with SubMiner because it starts `mpv.exe` with the right defaults directly.
 After setup completes, the shortcut is the normal Windows playback entry point.
@@ -315,26 +314,6 @@ For SubMiner overlay lookups to work, open Yomitan settings (`subminer app --yom

 If you also use Yomitan in a browser, set that profile up separately. It inherits nothing from the bundled instance.

-### Hachidori setup
-
-Set `dictionaryBackend` to `"hachidori"` in SubMiner settings or `config.jsonc`, then restart SubMiner. The tray's dictionary settings entry changes to **Open Hachidori Settings**. Switching to `"yomitan"` restores the Yomitan entry after restarting.
-
-Open Hachidori settings with `subminer app --hachidori` or `SubMiner.AppImage --hachidori`. Import your dictionary ZIPs or use Hachidori's recommended dictionary installer, then configure its Anki templates. Yomitan and Hachidori keep separate dictionaries and settings. Yomitan profiles, custom Handlebars templates, and `yomitan.externalProfilePath` do not transfer to Hachidori.
-
-First-run setup also offers **Dictionary source → Use an external dictionary host → Link host**. Enable sharing in the other Hachidori app or browser, or start a compatible Docker dictionary host, then enter its sharing address, such as `127.0.0.1:8771` or `ws://host:8771/link`. Use the WebSocket sharing port, not the management page or HTTP API port. The external host section is collapsed until you expand it or a host is linked. Browser hosts need the browser, Hachidori extension, and relay running. Electron hosts need the host app and any required relay running. Docker hosts need the container running; no browser needs to stay open.
-
-Setup checks the host connection and dictionary inventory before enabling Finish. Import at least one dictionary on the host and refresh status. The link persists across restarts. **Unlink and use local dictionaries** restores SubMiner's local library. Anki templates, pronunciation sources, custom buttons, and SubMiner's audio/image processing remain local while linked. Dictionary settings and dictionary edits use the host. Frequency annotations use the frequencies returned with Hachidori dictionary entries. SubMiner keeps ranks found during scanning and queries the existing term-entry API for missing ranks. Words without a matching definition entry may remain unranked, even if a frequency dictionary contains them.
-
-Both named settings flags work independently of the selected backend. Opening settings does not switch the overlay backend. The global dictionary-settings shortcut opens the selected backend.
-
-Hachidori uses SubMiner's subtitle scanning, lookup counter, popup pause behavior, controller commands, character dictionaries, and Anki media enrichment. Keep SubMiner's AnkiConnect proxy enabled for screenshots and sentence audio. SubMiner routes Hachidori to that proxy when it is active; Hachidori's own screen recorder and screenshot capture are disabled in the embedded app.
-
-Existing controls such as `startupWarmups.yomitanExtension` and `subtitleStyle.autoPauseVideoOnYomitanPopup` apply to the selected backend. Hachidori has one dictionary configuration, so character-dictionary profile scope applies to that configuration.
-
-First-run setup remembers each backend that finished it. Switching to a backend for the first time asks for that backend's dictionaries; switching back to one that already finished does not repeat setup. Until SubMiner restarts, it keeps running the backend it started with, and the launcher gates playback on that running backend and logs a restart reminder.
-
-Hachidori's own duplicate handling differs from Yomitan's. Choosing **Overwrite** in the Hachidori popup updates the existing note and SubMiner enriches its media, while **Add anyway** creates a new note and runs SubMiner's Kiku/Senren [field grouping](./anki-integration.md#field-grouping-kiku-senren). Mining from the stats dashboard uses the selected backend as well.
-
 ### YouTube playback

 `subminer` accepts direct URLs (for example, YouTube links) and `ytsearch:` targets.
@@ -429,7 +408,7 @@ See [Keyboard Shortcuts](/shortcuts) for the full reference, including mining sh
 | Keybind       | Action                 | Scope                                                                                              |
 | ------------- | ---------------------- | -------------------------------------------------------------------------------------------------- |
 | `Alt+Shift+O` | Toggle visible overlay | Works while the overlay or mpv has focus (configurable via `shortcuts.toggleVisibleOverlayGlobal`) |
-| `Alt+Shift+Y` | Open active dictionary settings | OS-global - registered with the system, works from any window                                      |
+| `Alt+Shift+Y` | Open Yomitan settings  | OS-global - registered with the system, works from any window                                      |

 `Alt+Shift+Y` is fixed and not configurable. All other shortcuts can be changed under `shortcuts` in your config.

@@ -44,12 +44,6 @@ Update checks and startup launcher migration share a serialized update-state sto

 ## Architecture Intent

-The dictionary backend is selected once at startup by `dictionaryBackend`. Yomitan keeps its existing session and external-profile policy. Hachidori uses `persist:hachidori`; overlay windows select that session before extension loading, including deferred startup. Named settings flags can open either backend without injecting a second reader into the active overlay. The detached stats word helper reads the same config key so dashboard mining uses the active backend.
-
-`setup-state.json` records one backend's status at a time plus `completedDictionaryBackends`, the backends that finished setup before. The app projects the file onto its active backend on startup and stamps that backend into the file. The launcher gates playback on the stamped backend when an app is already running, since a config edit takes effect only after restart.
-
-`vendor/hachidori/` is a submodule of `ksyasuda/hachidori`, tracking the `subminer` branch and pinned to a tested commit. Its nested HoshiDicts submodule and WASM binaries remain upstream versions. Initialize sources with `git submodule update --init --recursive`; merge upstream updates in the fork, test them, then update SubMiner's submodule commit. `SOURCE.json` records the upstream base and artifact checksums; the submodule commit identifies the integrated version. `build:hachidori` verifies recorded artifact checksums and stages the extension for development and packaging. Before loading the extension, its session clears service worker registrations so Electron uses the current bundled code; dictionary databases and settings remain intact. First-run setup uses Hachidori sharing messages to link or unlink external dictionary hosts and checks their live inventory. Linked dictionaries and dictionary edits use the host, while Anki configuration, pronunciation sources, custom buttons, and mining stay local to SubMiner. The parser bridge adapts its runtime messages to the existing subtitle scanner and dictionary automation. Scanning retains term-entry frequencies, and only tokens without ranks need further frequency lookups through the existing term-entry API. This requires a matching definition entry and does not preserve the frequency source's reading provenance. Its local content bridge implements SubMiner's existing popup events and commands. The Anki proxy strips local duplicate/overwrite metadata before forwarding requests and enriches only confirmed writes.
-
 - Small units, explicit boundaries
 - Composition over monoliths
 - Pure helpers where possible
@@ -63,7 +63,6 @@ bun run docs:build
  Content checks and informational size reporting run inside electron-builder hooks. See the
  [release guide](../RELEASING.md#package-contents-and-size-checks) for size reports
  and the installed-app verification checklist.
- Dictionary backend windows: after a full build, run `xvfb-run -a bun run test:dictionary:electron` on headless Linux. It uses temporary profiles to check both named settings commands, backend session isolation, the overlay's external-link bridge, and Hachidori's native dictionary parser.
 - Coverage for the maintained source lane: `bun run test:coverage:src`
 - Deep/local full gate: default handoff gate above

@@ -26,10 +26,7 @@ import {
  readSetupState,
 } from '../../src/shared/setup-state.js';
 import { detectInstalledFirstRunPluginCandidates } from '../../src/main/runtime/first-run-setup-plugin.js';
-import {
-  hasLauncherExternalYomitanProfileConfig,
-  loadLauncherDictionaryBackend,
-} from '../config.js';
+import { hasLauncherExternalYomitanProfileConfig } from '../config.js';

 const SETUP_WAIT_TIMEOUT_MS = 10 * 60 * 1000;
 const SETUP_POLL_INTERVAL_MS = 500;
@@ -118,9 +115,6 @@ async function ensurePlaybackSetupReady(context: LauncherCommandContext): Promis
  const configDir = getLauncherConfigDir();
  const statePath = getSetupStatePath(configDir);
  const ready = await ensureLauncherSetupReady({
-    dictionaryBackend: loadLauncherDictionaryBackend(),
-    isAppRunning: () => isRunningAppControlServerAvailable(args.logLevel, configDir),
-    warn: (message) => log('warn', args.logLevel, message),
    readSetupState: () => readSetupState(statePath),
    isExternalYomitanConfigured: () => hasLauncherExternalYomitanProfileConfig(),
    hasLegacyMpvPlugin: () =>
@@ -1,5 +1,4 @@
 import { fail } from './log.js';
-import type { DictionaryBackend } from '../src/types/config.js';
 import type {
  Args,
  LauncherLoggingConfig,
@@ -101,17 +100,8 @@ export function loadLauncherLoggingConfig(): LauncherLoggingConfig {
  };
 }

-export function loadLauncherDictionaryBackend(): DictionaryBackend {
-  return readLauncherMainConfigObject()?.dictionaryBackend === 'hachidori'
-    ? 'hachidori'
-    : 'yomitan';
-}
-
 export function hasLauncherExternalYomitanProfileConfig(): boolean {
-  const config = readLauncherMainConfigObject();
-  return (
-    config?.dictionaryBackend !== 'hachidori' && readExternalYomitanProfilePath(config) !== null
-  );
+  return readExternalYomitanProfilePath(readLauncherMainConfigObject()) !== null;
 }

 export function readPluginRuntimeConfig(logLevel: LogLevel): PluginRuntimeConfig {
@@ -241,10 +241,6 @@ export function applyRootOptionsToArgs(
  if (options.update === true) parsed.update = true;
  if (options.version === true) parsed.version = true;
  if (options.settings === true) parsed.settings = true;
-  if (options.yomitan === true || options.hachidori === true) {
-    parsed.appPassthrough = true;
-    parsed.appArgs = [options.yomitan === true ? '--yomitan' : '--hachidori'];
-  }
  if (options.startOverlay === true) parsed.autoStartOverlay = true;
  if (options.texthooker === false) parsed.useTexthooker = false;
  if (typeof options.args === 'string') parsed.mpvArgs = options.args;
@@ -86,8 +86,6 @@ function applyRootOptions(program: Command): void {
    .option('--log-level <level>', 'Log level')
    .option('-v, --version', 'Show SubMiner version')
    .option('--settings', 'Open settings window')
-    .option('--yomitan', 'Open Yomitan settings window')
-    .option('--hachidori', 'Open Hachidori settings window')
    .option('-u, --update', 'Check for updates')
    .option('-R, --rofi', 'Use rofi picker')
    .option('-H, --history', 'Browse local watch history')
@@ -89,7 +89,6 @@ export async function jellyfinApiRequest<T>(
  const url = `${session.serverUrl}${requestPath}`;
  const response = await fetch(url, {
    headers: {
-      'X-Emby-Token': session.accessToken,
      Authorization: `MediaBrowser Token="${session.accessToken}"`,
    },
  });
@@ -103,7 +102,7 @@ export async function jellyfinApiRequest<T>(
 }

 function itemPreviewUrl(session: JellyfinSessionConfig, id: string): string {
-  return `${session.serverUrl}/Items/${id}/Images/Primary?maxHeight=720&quality=85&api_key=${encodeURIComponent(session.accessToken)}`;
+  return `${session.serverUrl}/Items/${id}/Images/Primary?maxHeight=720&quality=85&ApiKey=${encodeURIComponent(session.accessToken)}`;
 }

 function jellyfinIconCacheDir(session: JellyfinSessionConfig): string {
@@ -282,31 +282,29 @@ test('doctor refresh-known-words forwards app refresh command without requiring
  });
 });

-for (const flag of ['--settings', '--yomitan', '--hachidori']) {
-  test(`launcher ${flag} forwards the matching app settings command`, () => {
-    withTempDir((root) => {
-      const homeDir = path.join(root, 'home');
-      const xdgConfigHome = path.join(root, 'xdg');
-      const appPath = path.join(root, 'fake-subminer.sh');
-      const capturePath = path.join(root, 'captured-args.txt');
-      fs.writeFileSync(
-        appPath,
-        `#!/bin/sh\n${RUNTIME_PLUGIN_PREFLIGHT_SH}if [ -n "$SUBMINER_TEST_CAPTURE" ]; then printf "%s\\n" "$@" > "$SUBMINER_TEST_CAPTURE"; fi\nexit 0\n`,
-      );
-      fs.chmodSync(appPath, 0o755);
+test('launcher settings option forwards app settings window command', () => {
+  withTempDir((root) => {
+    const homeDir = path.join(root, 'home');
+    const xdgConfigHome = path.join(root, 'xdg');
+    const appPath = path.join(root, 'fake-subminer.sh');
+    const capturePath = path.join(root, 'captured-args.txt');
+    fs.writeFileSync(
+      appPath,
+      `#!/bin/sh\n${RUNTIME_PLUGIN_PREFLIGHT_SH}if [ -n "$SUBMINER_TEST_CAPTURE" ]; then printf "%s\\n" "$@" > "$SUBMINER_TEST_CAPTURE"; fi\nexit 0\n`,
+    );
+    fs.chmodSync(appPath, 0o755);

-      const env = {
-        ...makeTestEnv(homeDir, xdgConfigHome),
-        SUBMINER_APPIMAGE_PATH: appPath,
-        SUBMINER_TEST_CAPTURE: capturePath,
-      };
-      const result = runLauncher([flag], env);
+    const env = {
+      ...makeTestEnv(homeDir, xdgConfigHome),
+      SUBMINER_APPIMAGE_PATH: appPath,
+      SUBMINER_TEST_CAPTURE: capturePath,
+    };
+    const result = runLauncher(['--settings'], env);

-      assert.equal(result.status, 0);
-      assert.equal(fs.readFileSync(capturePath, 'utf8'), `${flag}\n`);
-    });
+    assert.equal(result.status, 0);
+    assert.equal(fs.readFileSync(capturePath, 'utf8'), '--settings\n');
  });
-}
+});

 test('launcher settings command forwards app settings window command', () => {
  withTempDir((root) => {
@@ -344,12 +344,3 @@ test('parseArgs requires an explicit logs action', () => {
  assert.equal(exit.code, 1);
  assert.match(exit.stderr, /Logs command requires -e or --export/);
 });
-
-for (const flag of ['--yomitan', '--hachidori']) {
-  test(`parseArgs forwards ${flag} to the app`, () => {
-    const parsed = parseArgs([flag], 'subminer', {});
-    assert.equal(parsed.appPassthrough, true);
-    assert.deepEqual(parsed.appArgs, [flag]);
-    assert.equal(parsed.settings, false);
-  });
-}
@@ -228,7 +228,7 @@ export function pickLibrary(
    commandExists('chafa') && commandExists('curl')
      ? `
 id={1}
-url=${escapeShellSingle(session.serverUrl)}/Items/$id/Images/Primary?maxHeight=720\\&quality=85\\&api_key=${escapeShellSingle(session.accessToken)}
+url=${escapeShellSingle(session.serverUrl)}/Items/$id/Images/Primary?maxHeight=720\\&quality=85\\&ApiKey=${escapeShellSingle(session.accessToken)}
 curl -fsSL "$url" 2>/dev/null | chafa --format=symbols --symbols=vhalf+wide --size=${'${FZF_PREVIEW_COLUMNS}'}x${'${FZF_PREVIEW_LINES}'} - 2>/dev/null
 `.trim()
      : 'echo "Install curl + chafa for image preview"';
@@ -266,7 +266,7 @@ export function pickItem(
    commandExists('chafa') && commandExists('curl')
      ? `
 id={1}
-url=${escapeShellSingle(session.serverUrl)}/Items/$id/Images/Primary?maxHeight=720\\&quality=85\\&api_key=${escapeShellSingle(session.accessToken)}
+url=${escapeShellSingle(session.serverUrl)}/Items/$id/Images/Primary?maxHeight=720\\&quality=85\\&ApiKey=${escapeShellSingle(session.accessToken)}
 curl -fsSL "$url" 2>/dev/null | chafa --format=symbols --symbols=vhalf+wide --size=${'${FZF_PREVIEW_COLUMNS}'}x${'${FZF_PREVIEW_LINES}'} - 2>/dev/null
 `.trim()
      : 'echo "Install curl + chafa for image preview"';
@@ -304,7 +304,7 @@ export function pickGroup(
    commandExists('chafa') && commandExists('curl')
      ? `
 id={1}
-url=${escapeShellSingle(session.serverUrl)}/Items/$id/Images/Primary?maxHeight=720\\&quality=85\\&api_key=${escapeShellSingle(session.accessToken)}
+url=${escapeShellSingle(session.serverUrl)}/Items/$id/Images/Primary?maxHeight=720\\&quality=85\\&ApiKey=${escapeShellSingle(session.accessToken)}
 curl -fsSL "$url" 2>/dev/null | chafa --format=symbols --symbols=vhalf+wide --size=${'${FZF_PREVIEW_COLUMNS}'}x${'${FZF_PREVIEW_LINES}'} - 2>/dev/null
 `.trim()
      : 'echo "Install curl + chafa for image preview"';
@@ -1,11 +1,7 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import {
-  ensureLauncherSetupReady,
-  resolveLauncherGateBackend,
-  waitForSetupCompletion,
-} from './setup-gate';
-import { createDefaultSetupState, type SetupState } from '../src/shared/setup-state';
+import { ensureLauncherSetupReady, waitForSetupCompletion } from './setup-gate';
+import type { SetupState } from '../src/shared/setup-state';

 const commandLineSetupDefaults = {
  bunInstallStatus: 'unknown',
@@ -299,101 +295,3 @@ test('ensureLauncherSetupReady ignores stale cancelled state after launching set

  assert.equal(result, true);
 });
-
-test('Hachidori setup ignores completed Yomitan state and external Yomitan profiles', async () => {
-  let state: SetupState = { ...createDefaultSetupState(), status: 'completed' };
-  let launched = 0;
-  let polls = 0;
-  const ready = await ensureLauncherSetupReady({
-    dictionaryBackend: 'hachidori',
-    readSetupState: () => state,
-    isExternalYomitanConfigured: () => true,
-    launchSetupApp: () => {
-      launched += 1;
-    },
-    sleep: async () => {
-      polls += 1;
-      state = { ...state, dictionaryBackend: 'hachidori', lastSeenYomitanDictionaryCount: 1 };
-    },
-    now: () => polls,
-    timeoutMs: 5,
-    pollIntervalMs: 1,
-  });
-  assert.equal(ready, true);
-  assert.equal(launched, 1);
-  assert.equal(polls, 1);
-});
-
-test('matching Hachidori completion resumes playback without launching setup', async () => {
-  const ready = await ensureLauncherSetupReady({
-    dictionaryBackend: 'hachidori',
-    readSetupState: () => ({
-      ...createDefaultSetupState(),
-      dictionaryBackend: 'hachidori',
-      status: 'completed',
-      lastSeenYomitanDictionaryCount: 1,
-    }),
-    launchSetupApp: () => assert.fail('setup should not open'),
-    sleep: async () => undefined,
-    now: () => 0,
-    timeoutMs: 5,
-    pollIntervalMs: 1,
-  });
-  assert.equal(ready, true);
-});
-
-test('a backend that finished setup earlier passes the gate after switching back', async () => {
-  const ready = await ensureLauncherSetupReady({
-    dictionaryBackend: 'yomitan',
-    readSetupState: () => ({
-      ...createDefaultSetupState(),
-      dictionaryBackend: 'hachidori',
-      status: 'incomplete',
-      completedDictionaryBackends: ['yomitan'],
-    }),
-    launchSetupApp: () => assert.fail('setup should not open'),
-    sleep: async () => undefined,
-    now: () => 0,
-    timeoutMs: 5,
-    pollIntervalMs: 1,
-  });
-  assert.equal(ready, true);
-});
-
-test('gate follows the running app backend until it restarts into the configured one', async () => {
-  const warnings: string[] = [];
-  const state = {
-    ...createDefaultSetupState(),
-    dictionaryBackend: 'yomitan' as const,
-    status: 'completed' as const,
-  };
-  assert.equal(
-    await resolveLauncherGateBackend({
-      configuredBackend: 'hachidori',
-      state,
-      isAppRunning: async () => true,
-      warn: (message) => warnings.push(message),
-    }),
-    'yomitan',
-  );
-  assert.match(warnings[0] ?? '', /restart it to switch to hachidori/);
-  assert.equal(
-    await resolveLauncherGateBackend({
-      configuredBackend: 'hachidori',
-      state,
-      isAppRunning: async () => false,
-    }),
-    'hachidori',
-  );
-  const ready = await ensureLauncherSetupReady({
-    dictionaryBackend: 'hachidori',
-    isAppRunning: async () => true,
-    readSetupState: () => state,
-    launchSetupApp: () => assert.fail('the running Yomitan app already completed setup'),
-    sleep: async () => undefined,
-    now: () => 0,
-    timeoutMs: 5,
-    pollIntervalMs: 1,
-  });
-  assert.equal(ready, true);
-});
@@ -1,13 +1,7 @@
-import type { DictionaryBackend } from '../src/types/config.js';
-import {
-  getSetupStateDictionaryBackend,
-  isSetupCompleted,
-  type SetupState,
-} from '../src/shared/setup-state.js';
+import { isSetupCompleted, type SetupState } from '../src/shared/setup-state.js';

 export async function waitForSetupCompletion(deps: {
  readSetupState: () => SetupState | null;
-  dictionaryBackend?: DictionaryBackend;
  sleep: (ms: number) => Promise<void>;
  now: () => number;
  timeoutMs: number;
@@ -19,7 +13,7 @@ export async function waitForSetupCompletion(deps: {

  while (deps.now() <= deadline) {
    const state = deps.readSetupState();
-    if (isSetupCompleted(state, deps.dictionaryBackend)) {
+    if (isSetupCompleted(state)) {
      return 'completed';
    }
    if (ignoringCancelled && state != null && state.status !== 'cancelled') {
@@ -40,7 +34,6 @@ export async function waitForSetupCompletion(deps: {

 export async function waitForLegacyMpvPluginPromptResolution(deps: {
  readSetupState: () => SetupState | null;
-  dictionaryBackend?: DictionaryBackend;
  sleep: (ms: number) => Promise<void>;
  now: () => number;
  timeoutMs: number;
@@ -48,13 +41,13 @@ export async function waitForLegacyMpvPluginPromptResolution(deps: {
  initialState?: SetupState | null;
 }): Promise<'acknowledged' | 'cancelled' | 'timeout'> {
  const deadline = deps.now() + deps.timeoutMs;
-  const initialCompleted = isSetupCompleted(deps.initialState, deps.dictionaryBackend);
+  const initialCompleted = isSetupCompleted(deps.initialState);
  const initialCompletedAt = deps.initialState?.completedAt ?? null;

  while (deps.now() <= deadline) {
    const state = deps.readSetupState();
    if (
-      isSetupCompleted(state, deps.dictionaryBackend) &&
+      isSetupCompleted(state) &&
      (!initialCompleted || state?.completedAt !== initialCompletedAt)
    ) {
      return 'acknowledged';
@@ -69,34 +62,8 @@ export async function waitForLegacyMpvPluginPromptResolution(deps: {
  return 'timeout';
 }

-/**
- * The app pins its dictionary backend at startup while the config file can change
- * underneath it. When an app is already running, gate on the backend it recorded
- * in the setup state rather than the config value it has not restarted into.
- */
-export async function resolveLauncherGateBackend(deps: {
-  configuredBackend: DictionaryBackend;
-  state: SetupState | null;
-  isAppRunning?: () => Promise<boolean>;
-  warn?: (message: string) => void;
-}): Promise<DictionaryBackend> {
-  const runningBackend = deps.state
-    ? getSetupStateDictionaryBackend(deps.state)
-    : deps.configuredBackend;
-  if (runningBackend === deps.configuredBackend || !(await deps.isAppRunning?.())) {
-    return deps.configuredBackend;
-  }
-  deps.warn?.(
-    `SubMiner is running with the ${runningBackend} dictionary backend; restart it to switch to ${deps.configuredBackend}.`,
-  );
-  return runningBackend;
-}
-
 export async function ensureLauncherSetupReady(deps: {
  readSetupState: () => SetupState | null;
-  dictionaryBackend?: DictionaryBackend;
-  isAppRunning?: () => Promise<boolean>;
-  warn?: (message: string) => void;
  isExternalYomitanConfigured?: () => boolean;
  hasLegacyMpvPlugin?: () => boolean;
  launchSetupApp: () => void;
@@ -106,12 +73,6 @@ export async function ensureLauncherSetupReady(deps: {
  pollIntervalMs: number;
 }): Promise<boolean> {
  const initialState = deps.readSetupState();
-  const dictionaryBackend = await resolveLauncherGateBackend({
-    configuredBackend: deps.dictionaryBackend ?? 'yomitan',
-    state: initialState,
-    isAppRunning: deps.isAppRunning,
-    warn: deps.warn,
-  });
  let setupLaunched = false;
  const launchSetupApp = () => {
    if (setupLaunched) return;
@@ -123,7 +84,6 @@ export async function ensureLauncherSetupReady(deps: {
    launchSetupApp();
    const result = await waitForLegacyMpvPluginPromptResolution({
      readSetupState: deps.readSetupState,
-      dictionaryBackend,
      sleep: deps.sleep,
      now: deps.now,
      timeoutMs: deps.timeoutMs,
@@ -135,18 +95,17 @@ export async function ensureLauncherSetupReady(deps: {
    }
  }

-  if (dictionaryBackend !== 'hachidori' && deps.isExternalYomitanConfigured?.()) {
+  if (deps.isExternalYomitanConfigured?.()) {
    return true;
  }
  const stateAfterLegacyPrompt = deps.readSetupState();
-  if (isSetupCompleted(stateAfterLegacyPrompt, dictionaryBackend)) {
+  if (isSetupCompleted(stateAfterLegacyPrompt)) {
    return true;
  }

  launchSetupApp();
  const result = await waitForSetupCompletion({
    ...deps,
-    dictionaryBackend,
    ignoreInitialCancelledState: stateAfterLegacyPrompt?.status === 'cancelled',
  });
  return result === 'completed';
@@ -2,7 +2,7 @@
  "name": "subminer",
  "productName": "SubMiner",
  "desktopName": "SubMiner.desktop",
-  "version": "0.19.6",
+  "version": "0.20.0-beta.1",
  "description": "All-in-one sentence mining overlay with AnkiConnect and dictionary integration",
  "packageManager": "bun@1.3.5",
  "main": "dist/main-entry.js",
@@ -12,7 +12,6 @@
    "get-frequency": "bun run scripts/get_frequency.ts --pretty --color-top-x 10000 --yomitan-user-data ~/.config/SubMiner --colorized-line",
    "get-frequency:electron": "bun run build:yomitan && bun build scripts/get_frequency.ts --format=cjs --target=node --outfile dist/scripts/get_frequency.js --external electron && env -u ELECTRON_RUN_AS_NODE electron dist/scripts/get_frequency.js --pretty --color-top-x 10000 --yomitan-user-data ~/.config/SubMiner --colorized-line",
    "test-yomitan-parser": "bun run scripts/test-yomitan-parser.ts",
-    "test:dictionary:electron": "env -u ELECTRON_RUN_AS_NODE electron --no-sandbox scripts/check-dictionary-backends.cjs && env -u ELECTRON_RUN_AS_NODE electron --no-sandbox scripts/check-dictionary-backends.cjs --backend=yomitan && env -u ELECTRON_RUN_AS_NODE electron --no-sandbox --ozone-platform=x11 scripts/check-hachidori-parser.cjs",
    "test-yomitan-parser:electron": "bun run build:yomitan && bun build scripts/test-yomitan-parser.ts --format=cjs --target=node --outfile dist/scripts/test-yomitan-parser.js --external electron && env -u ELECTRON_RUN_AS_NODE electron dist/scripts/test-yomitan-parser.js",
    "verify-known-word-highlights:electron": "bun run build:yomitan && bun build scripts/verify-known-word-highlights.ts --format=cjs --target=node --outfile dist/scripts/verify-known-word-highlights.js --packages=external && env -u ELECTRON_RUN_AS_NODE electron dist/scripts/verify-known-word-highlights.js",
    "record-tokenizer-fixture:electron": "bun run build:yomitan && bun build scripts/record-tokenizer-fixture.ts --format=cjs --target=node --outfile dist/scripts/record-tokenizer-fixture.js --external electron && env -u ELECTRON_RUN_AS_NODE electron dist/scripts/record-tokenizer-fixture.js",
@@ -22,7 +21,7 @@
    "build:launcher": "bun run scripts/build-launcher.ts",
    "build:stats": "cd stats && bun run build",
    "dev:stats": "cd stats && bun run dev",
-    "build": "bun run build:yomitan && bun run build:hachidori && bun run build:stats && tsc -p tsconfig.json && bun run build:renderer && bun run build:settings && bun run build:syncui && bun run build:launcher && bun run build:assets",
+    "build": "bun run build:yomitan && bun run build:stats && tsc -p tsconfig.json && bun run build:renderer && bun run build:settings && bun run build:syncui && bun run build:launcher && bun run build:assets",
    "build:renderer": "esbuild src/renderer/renderer.ts --bundle --platform=browser --format=esm --target=es2022 --outfile=dist/renderer/renderer.js --sourcemap",
    "build:settings": "esbuild src/settings/settings.ts --bundle --platform=browser --format=esm --target=es2022 --outfile=dist/settings/settings.js --sourcemap",
    "build:syncui": "esbuild src/syncui/syncui.ts --bundle --platform=browser --format=esm --target=es2022 --outfile=dist/syncui/syncui.js --sourcemap && esbuild src/preload-syncui.ts --bundle --platform=node --format=cjs --target=node20 --external:electron --outfile=dist/preload-syncui.js --sourcemap",
@@ -82,14 +81,13 @@
    "build:mac:zip": "bun run build && electron-builder --mac zip --publish never",
    "build:win": "bun run build && electron-builder --win nsis zip --publish never",
    "build:win:unsigned": "bun run build && node scripts/build-win-unsigned.mjs",
-    "test:package": "bun scripts/run-package-smoke.mjs",
-    "build:hachidori": "bun scripts/build-hachidori.mjs"
+    "test:package": "bun scripts/run-package-smoke.mjs"
  },
  "overrides": {
    "@xmldom/xmldom": "0.8.15",
-    "app-builder-lib": "26.15.3",
+    "app-builder-lib": "26.16.1",
    "brace-expansion": "5.0.9",
-    "electron-builder-squirrel-windows": "26.15.3",
+    "electron-builder-squirrel-windows": "26.16.1",
    "fast-uri": "3.1.6",
    "form-data": "4.0.6",
    "ip-address": "10.2.0",
@@ -131,7 +129,7 @@
    "@types/node": "^24.10.0",
    "@types/ws": "^8.18.1",
    "electron": "42.6.0",
-    "electron-builder": "26.15.3",
+    "electron-builder": "26.16.1",
    "esbuild": "^0.25.12",
    "eslint": "^10.8.0",
    "prettier": "^3.8.1",
@@ -234,10 +232,6 @@
        "from": "build/yomitan",
        "to": "yomitan"
      },
-      {
-        "from": "build/hachidori",
-        "to": "hachidori"
-      },
      {
        "from": "vendor/yomitan-jlpt-vocab",
        "to": "yomitan-jlpt-vocab"
@@ -1,68 +1,107 @@
 > This is a prerelease build for testing. Stable changelog and docs-site updates remain pending until the final stable release.

-<!-- prerelease-base-version: 0.19.4 -->
+<!-- prerelease-version: 0.20.0-beta.1 -->

 ## Highlights
 ### Added

- Library Merge & Reassignment
-  - Duplicate library cards for the same show can be combined: select entries in "Select" mode and use "Merge Selected" to combine their sessions, mined cards, and watch time onto one card.
-  - Episodes can be moved to a different entry with a per-episode "→" button, fixing stray files that split off their own entry; manual assignments now survive later filename parsing, Jellyfin refreshes, and season repair.
-  - Exact AniList matches with compatible seasons merge automatically, while likely (fuzzy) matches surface as a dismissible "Possible duplicate" suggestion instead of merging silently.
+- **Japanese Subtitle Generation**:
+  - Generate Japanese subtitles locally with whisper.cpp, right from a modal (`Ctrl+Shift+G`), the subtitle sidebar's generation button when no subtitles are loaded, or `subminer generate-subs`, with progress, cancellation, and automatic loading into mpv when it's done.
+  - Pick and download an official multilingual Whisper model in-app (including smaller quantized variants), or point Settings at one you already have. SubMiner recommends `large-v3-turbo` when CUDA is available and `small` otherwise, and tells you up front if `whisper-cli`, `ffmpeg`, or `ffprobe` can't be found.
+  - An optional "Focus on spoken dialogue" mode uses a Silero VAD model to keep quiet or music-covered dialogue that would otherwise get dropped.
+  - Long passages split near natural speech pauses, guided by an existing subtitle track when one is loaded, giving tighter timing and fewer repeated-word glitches.

- Duplicate Line Cleanup
-  - The Vocabulary tab's new **Duplicates** button scans a chosen time window for the repeated-line bursts described under Fixed below and collapses each burst to a single line once confirmed.
-  - A matching `subminer stats cleanup --duplicate-lines` command (with `--dry-run` and `--lookback-days <n>`) is available from the terminal.
-  - Only the affected subtitle lines and the vocabulary counts they inflated are touched; watch time and lines-seen totals are left as recorded.
+- **Media Timing Review Frame Picker**:
+  - The screenshot used for a mined card can now be chosen independently of the audio clip, with its own live preview, time slider, and frame-by-frame stepping.
+  - Works for local video and for seekable remote streams like Jellyfin.
+
+- **Overlay Keybinding Pickup**: The overlay now recognizes your mpv keybindings (from mpv's defaults, `input.conf`, and loaded scripts) as long as they don't conflict with SubMiner's own controls. Picked-up bindings work for the session but won't show up in the help menu.
+
+- **Subtitle Sidebar Selection & Copy**: You can now select dialogue across multiple subtitle sidebar rows and copy it, without timestamps, using Ctrl/Cmd+C or the Copy button, without seeking or mining a card.
+
+- **Jimaku Live Action Search**: The Jimaku modal has separate Anime and Live Action tabs (switch with Arrow Left/Right) so you can search Jimaku's live-action subtitle catalogue directly.
+
+- **Live-Action TMDB Library**:
+  - Live-action dramas and movies in the stats Library now get posters, synopses, and titles from TMDB.
+  - Titles AniList can't match are looked up on TMDB automatically when the parsed filename matches a title exactly; otherwise use the new **Link to TMDB** action. Entries linked to the same TMDB title merge into one card, and the Library kind selector gained a Live Action option.
+  - Release builds already include a TMDB key; if you run from source, set `tmdb.apiKey` (or `tmdb.apiKeyCommand`) yourself.
+
+- **YouTube Library Kind**:
+  - YouTube channels are now their own Library media kind, with new All Titles, Anime, and YouTube filters. Existing channel entries migrate automatically with viewing history and manual video assignments intact.
+  - Channels stay out of AniList matching, season repair, and duplicate recommendations, and can't be merged or moved into an anime entry.
+
+### Changed
+
+- **Bundled Bun Runtime**: Every SubMiner launcher, installed or downloaded, now runs on the Bun runtime bundled with the app instead of a system-wide Bun install. Recognized legacy launchers migrate automatically, Windows users get a new `subminer.cmd` download, and first-run setup now shows a single optional launcher control with runtime repair guidance only when something actually needs it.
+
+- **Compressed Incremental Sync**: Cross-machine sync between compatible macOS/Linux machines now transfers only what changed, compressed, using a cached snapshot from the last sync to cut traffic further. Machines without a compatible rsync (including Windows) fall back to compressed scp automatically, older peers keep working, and transfers now time out after 30 minutes instead of hanging indefinitely.
+
+- **Smaller Install Size**: Installers and the unpacked app are smaller after dropping demo media, source maps, TypeScript sources, test fixtures, and unused binaries, and sharing one Japanese UI font across windows. Release builds now publish a package-size comparison against the previous release.
+
+- **Stats Server Request Safety**: The stats server, including the in-app stats overlay which now loads through it, only accepts requests from the local machine and requires a JSON content type for anything that changes data. If you were exposing the dashboard through a reverse proxy or Tailscale Serve, that's no longer supported, and any script posting to the stats API needs to send `Content-Type: application/json`.
+
+- **Yomitan Updated**: Bundled Yomitan is updated to upstream 26.9.8, adding historical Japanese kana transformations and Ukrainian language support, plus improvements to Anki duplicate search and audio retrieval.

 ### Fixed

- Subtitle Duplication from Karaoke & Animated Signs
-  - Typeset ASS karaoke and animated signs no longer flood the overlay, subtitle sidebar, immersion history, mined cards, or stats with repeated glyph fragments or per-frame duplicates; the complete authored line is recovered instead, without merging genuinely repeated dialogue or separately positioned signs.
-  - Fragmented karaoke now preserves the spaces the author placed between words instead of joining them together, and lyric transitions (including seeking into the middle of a line) resolve to the clean line instead of a stray entrance or exit frame.
-  - The secondary overlay shares the same deduplication logic as the primary overlay, including collapsing lines that differ only by whitespace or trailing punctuation, and sidebar navigation moves between clean lyric lines while keeping the right line selected.
+- **Jellyfin**:
+  - Playback, subtitles, artwork, and remote control now authenticate with an `ApiKey` parameter instead of legacy headers, so Jellyfin 12 works correctly even with legacy authorization disabled.
+  - "Play on SubMiner" no longer silently drops the connection after about a minute on Jellyfin 12.
+  - The "now playing" bar clears when you close or finish a cast video instead of running to the end of the episode.
+  - Anki cards mined from Jellyfin now get the real episode title in the misc info field instead of "Unknown media".
+  - Jellyfin streams no longer leak URL-derived titles or credential-bearing URLs into metadata, Anki fields, Discord presence, stats, or AniList lookups; previously cached data that had credentials in it is cleaned up automatically.

- Anki Media Generation
-  - Sentence-audio generation no longer times out on slow network-mounted video files with many subtitle and font streams, and a failed extraction now reports a clear error instead of a raw `ENOENT`.
-  - Mined audio and animated AVIF clips now capture the subtitle line you actually mined, instead of whatever line happened to be on screen once slow audio extraction finished.
+- **Anki & Mining**:
+  - Word audio now reads from its own configured field (`ankiConnect.fields.wordAudio`) instead of the sentence-audio field, fixing animated word images that started moving immediately instead of on demand.
+  - Setting `ankiConnect.media.maxMediaDuration` to `0` for unlimited duration now also applies when mining from the stats dashboard, matching overlay mining.
+  - Closing the overlay while a media timing review is still loading now properly cancels setup, restores playback if the review had paused it, and cleans up the hidden preview player.

- Character Dictionary Performance & Notifications
-  - Character dictionary generation, merged rebuilds, and imports no longer freeze the app on large dictionaries, and cached results (including character portraits) are reused across launches instead of regenerating everything every time.
-  - Portraits also now display correctly if their cache finishes loading after subtitles have already started showing.
-  - Desktop progress notifications, including on Linux AppImage installs, now update in place instead of flickering closed and reopening.
+- **Settings**:
+  - AnkiConnect, Kiku, and Senren settings are now validated before use, with a warning and a safe default for anything invalid instead of a bad value reaching runtime.
+  - Settings marked as applying live now correctly avoid showing a restart warning, and mixed saves apply the live parts immediately while listing only the sections that actually need a restart.

- Overlay Reliability
-  - Overlay modals (settings, stats, etc.) now open promptly on the first shortcut press, including on repeated sessions on Windows, and appear above fullscreen mpv on macOS instead of switching Spaces or opening off-screen.
-  - The macOS window-tracking helper is now built for macOS 12.0+, so the overlay attaches to mpv on older systems like Ventura instead of crashing and getting stuck on "Overlay loading."
-  - The overlay no longer gets stuck on "Overlay loading" indefinitely if mpv's connection stalls; it now retries and shows an actionable error after 30 seconds.
-  - Fixed native Wayland drag-and-drop from file managers like Thunar, and fixed system-wide mouse lag on Windows caused by the overlay's click-through handling.
+- **Overlay**:
+  - Clicking a subtitle sidebar cue no longer leaves Space bound to seeking back to it; Enter still seeks the focused cue, and Space keeps whatever playback action you've configured.
+  - Hyprland recovery dialogs now stay above SubMiner windows instead of being covered by overlay placement updates.
+  - Fixed a rare case on Linux where a delayed window-close callback could reopen the overlay after it was torn down.

- Stats Dashboard
-  - Deletes, library merges, video moves, and AniList reassignments no longer freeze the stats dashboard or rebuild lifetime totals from scratch; large deletes that used to take minutes now finish in milliseconds.
-  - Vocabulary totals and charts now count all tracked vocabulary instead of just the first page, and new-word history uses corrected daily rollups.
-  - Calendar labels respect time zones west of UTC, and vocabulary cards refresh automatically after editing the word exclusion list (with a Retry option if a load fails).
+- **Stats**:
+  - Malformed or partly invalid resource IDs are now rejected before they can affect library mutations or cover-art backfills.
+  - Stats server port conflicts now surface as a status notification instead of crashing SubMiner, and startup/shutdown are more robust: concurrent startup requests share one attempt, stopping a background instance no longer disconnects an open dashboard, and shutdown no longer waits indefinitely on active requests.

- Linux Launcher Thumbnails
-  - Fixed missing MKV thumbnails in the Linux rofi picker when the system thumbnailer only registers legacy Matroska MIME aliases.
+- **Subtitle Sidebar Gap Follow**: The subtitle sidebar now stays near actual playback position during gaps in files where a cue starts at time zero.
+
+- **First Launch on macOS**: Fixed first launch exiting immediately when the SubMiner config directory didn't exist yet.

 ## What's Changed

- feat(stats): add library entry merge and episode move by @ksyasuda in #190
- fix(stats): stop counting duplicate typeset subtitle lines by @ksyasuda in #191
- fix(media): tolerate slow MKV audio extraction by @ksyasuda in #195
- fix(stats): subtract lifetime totals incrementally on delete by @ksyasuda in #196
- fix(anki): snapshot mining media clip timing by @ksyasuda in #197
- fix(notifications): replace Linux progress updates in place by @ksyasuda in #198
- fix(overlay): support native Wayland file drag-and-drop by @ksyasuda in #199
- fix(overlay): keep macOS modal windows on fullscreen Spaces by @ksyasuda in #200
- fix(overlay): prevent Windows mouse lag during click-through tracking by @ksyasuda in #201
- fix(stats): report complete vocabulary totals and new-word history by @ksyasuda in #202
- fix(mpv): recover from stalled IPC connects by @ksyasuda in #204
- fix(dictionary): prevent freezes and restore AppImage notifications by @ksyasuda in #205
- fix(subtitles): recover canonical lines from ASS animation by @ksyasuda in #207
- fix(overlay): deduplicate secondary subtitle rendering by @ksyasuda in #208
- fix(launcher): restore Matroska thumbnails in Linux rofi picker by @ksyasuda in #210
- fix(character-dictionary): cache completed MeCab refreshes by @ksyasuda in #212
+- feat(sidebar): add dialogue selection and copying by @ksyasuda in #238
+- feat(subtitles): add local Japanese subtitle generation by @ksyasuda in #240
+- perf(stats): use compressed incremental snapshot transfers by @ksyasuda in #241
+- fix(startup): create config directory before singleton lock by @ksyasuda in #242
+- feat(launcher): bundle Bun and use it across all launchers by @ksyasuda in #243
+- build(release): reduce package size and report release sizes by @ksyasuda in #244
+- fix(overlay): keep Hyprland recovery dialogs above overlays by @ksyasuda in #245
+- feat(overlay): discover unclaimed mpv key bindings by @ksyasuda in #246
+- fix(sidebar): preserve Space playback after cue seeking by @ksyasuda in #247
+- fix(jellyfin): fix jellyfin media metadata by @ksyasuda in #250
+- feat(jimaku): add live-action subtitle search by @ksyasuda in #251
+- feat(stats): add TMDB metadata for live-action dramas in the Library by @ksyasuda in #252
+- feat(stats): separate YouTube channels in the Library by @ksyasuda in #253
+- feat(mining): add a screenshot frame picker to media review by @aalhendi in #254
+- fix(config): align live save feedback with hot reload policy by @ksyasuda in #255
+- fix(anki): separate word audio mapping for animation sync by @ksyasuda in #256
+- fix(config): validate AnkiConnect and field grouping settings by @ksyasuda in #257
+- fix(anki): honor unlimited duration in stats mining by @ksyasuda in #258
+- fix(stats): reject malformed resource IDs before mutations by @ksyasuda in #259
+- fix(stats): harden server lifecycle and verify compiled runtime by @ksyasuda in #261
+- fix(overlay): cancel pending window transitions and timing reviews by @ksyasuda in #262
+- fix(stats): restrict local requests and serve the dashboard over HTTP by @ksyasuda in #263
+- fix(jellyfin): support modern authentication by @ksyasuda in #264
+
+## New Contributors
+
+- @aalhendi made their first contribution in #254

 ## Installation

@@ -1,36 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { createHash } from 'node:crypto';
-import { fileURLToPath } from 'node:url';
-
-const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
-const source = path.join(repoRoot, 'vendor', 'hachidori');
-const output = path.join(repoRoot, 'build', 'hachidori');
-const provenance = JSON.parse(fs.readFileSync(path.join(source, 'SOURCE.json'), 'utf8'));
-
-// Upstream commits the engine binaries. Verify the pinned bytes before staging
-// so ordinary app builds need neither Emscripten nor network access.
-for (const [file, expected] of Object.entries(provenance.artifacts)) {
-  const actual = createHash('sha256')
-    .update(fs.readFileSync(path.join(source, file)))
-    .digest('hex');
-  if (actual !== expected) throw new Error(`Hachidori artifact checksum mismatch: ${file}`);
-}
-const extension = path.join(source, 'extension');
-const manifest = JSON.parse(fs.readFileSync(path.join(extension, 'manifest.json'), 'utf8'));
-for (const file of [
-  manifest.options_page,
-  manifest.background.service_worker,
-  'offscreen.html',
-  ...manifest.content_scripts.flatMap(({ js, css }) => [...js, ...css]),
-]) {
-  if (!fs.existsSync(path.join(extension, file)))
-    throw new Error(`Missing Hachidori asset: ${file}`);
-}
-fs.rmSync(output, { recursive: true, force: true });
-fs.mkdirSync(output, { recursive: true });
-fs.cpSync(extension, output, { recursive: true });
-for (const file of ['LICENSE', 'SOURCE.json', 'README.md']) {
-  fs.copyFileSync(path.join(source, file), path.join(output, file));
-}
-process.stdout.write(`Hachidori ${provenance.revision} staged in ${output}\n`);
@@ -1,110 +0,0 @@
-// Exercises the real entry point with disposable Linux config and data directories.
-const { app, BrowserWindow, session, shell } = require('electron');
-const fs = require('node:fs');
-const path = require('node:path');
-const assert = require('node:assert/strict');
-if (process.platform !== 'linux')
-  throw new Error('This app-entry smoke requires Linux XDG isolation.');
-const root = process.cwd();
-const backend = process.argv.includes('--backend=yomitan') ? 'yomitan' : 'hachidori';
-const profile = fs.mkdtempSync('/tmp/subminer-hachi-settings-');
-process.env.XDG_CONFIG_HOME = profile;
-process.env.XDG_DATA_HOME = path.join(profile, 'data');
-fs.mkdirSync(path.join(profile, 'SubMiner'));
-fs.writeFileSync(
-  path.join(profile, 'SubMiner', 'config.json'),
-  JSON.stringify({
-    dictionaryBackend: backend,
-    mpv: { socketPath: path.join(profile, 'missing-mpv.sock') },
-    ankiConnect: { enabled: false },
-    startupWarmups: { lowPowerMode: true },
-    discordPresence: { enabled: false },
-    updates: { enabled: false },
-  }),
-);
-const openedLinks = [];
-shell.openExternal = async (url) => {
-  openedLinks.push(url);
-};
-app.setAppPath(root);
-app.getVersion = () => require(path.join(root, 'package.json')).version;
-process.env.SUBMINER_APP_LOG = path.join(profile, 'app.log');
-app.commandLine.appendSwitch('ozone-platform', 'x11');
-app.commandLine.appendSwitch('disable-gpu');
-app.commandLine.appendSwitch('disable-dev-shm-usage');
-process.argv = [process.execPath, root, '--hachidori', '--log-level', 'debug'];
-require(path.join(root, 'dist/main-entry.js'));
-const deadline = setTimeout(() => {
-  console.error(
-    'FAIL timeout',
-    BrowserWindow.getAllWindows().map((w) => w.webContents.getURL()),
-  );
-  app.exit(1);
-}, 60000);
-(async () => {
-  await app.whenReady();
-  let window;
-  for (let i = 0; i < 300; i++) {
-    window = BrowserWindow.getAllWindows().find(
-      (w) => w.getTitle().includes('Hachidori') && w.isVisible(),
-    );
-    if (window) break;
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  assert.ok(window, 'Hachidori settings window opens from actual app flag');
-  assert.equal(window.webContents.session, session.fromPartition('persist:hachidori'));
-  assert.match(window.webContents.getURL(), /settings.html/);
-  const status = await window.webContents.executeJavaScript(
-    `chrome.runtime.sendMessage({target:'hoshidicts-offscreen',type:'hd_status',requestId:'app-settings-smoke'})`,
-  );
-  assert.equal(status.ok, true);
-  assert.equal(status.ready, true);
-
-  console.log(
-    'PASS actual --hachidori startup, visible settings, isolated backend session, native engine ready',
-  );
-  app.emit('second-instance', {}, [process.execPath, root, '--yomitan'], root);
-  let yomi;
-  for (let i = 0; i < 200; i++) {
-    yomi = BrowserWindow.getAllWindows().find(
-      (w) => w.getTitle().includes('Yomitan') && w.isVisible(),
-    );
-    if (yomi) break;
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  assert.ok(yomi, 'inactive --yomitan settings opens');
-  assert.equal(yomi.webContents.session, session.defaultSession);
-  assert.equal(window.webContents.session, session.fromPartition('persist:hachidori'));
-  app.emit('second-instance', {}, [process.execPath, root, '--toggle-visible-overlay'], root);
-  let overlay;
-  for (let i = 0; i < 200; i++) {
-    overlay = BrowserWindow.getAllWindows().find((w) =>
-      w.webContents.getURL().includes('/renderer/index.html?'),
-    );
-    if (overlay && !overlay.webContents.isLoading()) break;
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  assert.ok(overlay, 'actual overlay initialized');
-  assert.equal(
-    overlay.webContents.session,
-    backend === 'hachidori' ? session.fromPartition('persist:hachidori') : session.defaultSession,
-  );
-  const requestLink = (url) =>
-    overlay.webContents.executeJavaScript(`new Promise((resolve,reject)=>{
-  const timer=setTimeout(()=>reject(Error('No external link acknowledgment')),3000);
-  window.addEventListener('hachidori-open-external-result',e=>{clearTimeout(timer);resolve(e.detail);},{once:true});
-  window.dispatchEvent(new CustomEvent('hachidori-open-external',{detail:{requestId:'smoke-link',url:${JSON.stringify(url)}}}));
- })`);
-  assert.equal((await requestLink('file:///tmp/private')).ok, false);
-  assert.equal((await requestLink('https://example.com/word')).ok, backend === 'hachidori');
-  assert.deepEqual(openedLinks, backend === 'hachidori' ? ['https://example.com/word'] : []);
-  console.log(
-    `PASS ${backend} overlay session, independent settings windows, real preload external link bridge`,
-  );
-
-  clearTimeout(deadline);
-  app.exit(0);
-})().catch((error) => {
-  console.error(error);
-  app.exit(1);
-});
@@ -1,239 +0,0 @@
-// Run after bun run build. This uses a temporary profile and small local ZIPs.
-const { app, BrowserWindow, protocol, session } = require('electron');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const os = require('node:os');
-const path = require('node:path');
-const http = require('node:http');
-const root = path.resolve(__dirname, '..');
-const parser = require(path.join(root, 'dist/core/services/tokenizer/yomitan-parser-runtime.js'));
-const { writeStoredZip } = require(path.join(root, 'dist/shared/stored-zip.js'));
-const profile = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-hachidori-parser-'));
-
-protocol.registerSchemesAsPrivileged([
-  {
-    scheme: 'chrome-extension',
-    privileges: {
-      standard: true,
-      secure: true,
-      supportFetchAPI: true,
-      corsEnabled: true,
-      bypassCSP: true,
-    },
-  },
-]);
-app.setPath('userData', profile);
-app.setAppPath(root);
-app.disableHardwareAcceleration();
-app.on('window-all-closed', () => {});
-const deadline = setTimeout(() => {
-  console.error('Hachidori parser verification timed out', profile);
-  app.exit(1);
-}, 120_000);
-
-function fixture(name, title, bankName, entries, frequencyMode = 'rank-based') {
-  const zipPath = path.join(profile, name + '.zip');
-  writeStoredZip(zipPath, [
-    {
-      name: 'index.json',
-      data: Buffer.from(JSON.stringify({ title, revision: '1', format: 3, frequencyMode })),
-    },
-    { name: bankName, data: Buffer.from(JSON.stringify(entries)) },
-  ]);
-  return zipPath;
-}
-
-app
-  .whenReady()
-  .then(async () => {
-    const targetSession = session.fromPartition('persist:hachidori-check');
-    const extension = await targetSession.extensions.loadExtension(
-      path.join(root, 'build/hachidori'),
-      { allowFileAccess: true },
-    );
-    // Keep a host window alive while the dictionary importer opens/closes its
-    // temporary settings windows, matching the running app's window lifecycle.
-    const host = new BrowserWindow({
-      show: false,
-      webPreferences: { session: targetSession, contextIsolation: true, nodeIntegration: false },
-    });
-    await host.loadURL(`chrome-extension://${extension.id}/settings.html`);
-    let parserWindow = null;
-    let readyPromise = null;
-    let initPromise = null;
-    const deps = {
-      getYomitanExt: () => extension,
-      getYomitanSession: () => targetSession,
-      getYomitanParserWindow: () => parserWindow,
-      setYomitanParserWindow: (value) => {
-        parserWindow = value;
-      },
-      getYomitanParserReadyPromise: () => readyPromise,
-      setYomitanParserReadyPromise: (value) => {
-        readyPromise = value;
-      },
-      getYomitanParserInitPromise: () => initPromise,
-      setYomitanParserInitPromise: (value) => {
-        initPromise = value;
-      },
-    };
-    const errors = [];
-    const logger = {
-      error: (...args) => {
-        errors.push(args);
-        console.error(...args);
-      },
-    };
-    assert.deepEqual(await parser.getYomitanDictionaryInfo(deps, logger), []);
-    assert.equal(
-      await parser.syncYomitanDefaultAnkiServer('http://127.0.0.1:18766', deps, logger, {
-        forceOverride: true,
-        deck: 'Test Mining',
-      }),
-      true,
-    );
-    // Exercise discovery and revisioned options writes in the real extension,
-    // without creating a note or changing the user's Anki collection.
-    const fields = ['Term', 'Reading', 'Definition', 'Context', 'Pronunciation', 'Image'];
-    const metadataServer = http.createServer((request, response) => {
-      let body = '';
-      request.on('data', (chunk) => {
-        body += chunk;
-      });
-      request.on('end', () => {
-        const message = JSON.parse(body);
-        assert.equal(message.action, 'multi');
-        const result = message.params.actions.map(({ action }) => ({
-          result:
-            action === 'deckNames'
-              ? ['Test Mining']
-              : action === 'modelNames'
-                ? ['Custom Japanese']
-                : fields,
-          error: null,
-        }));
-        response.setHeader('Content-Type', 'application/json');
-        response.end(JSON.stringify({ result, error: null }));
-      });
-    });
-    await new Promise((resolve) => metadataServer.listen(0, '127.0.0.1', resolve));
-    try {
-      const url = `http://127.0.0.1:${metadataServer.address().port}`;
-      const ankiConfig = {
-        tags: ['SubMiner', 'Autofill'],
-        fields: {
-          word: 'Term',
-          sentence: 'Context',
-          wordAudio: 'Pronunciation',
-          image: 'Image',
-        },
-      };
-      assert.equal(
-        await parser.syncYomitanDefaultAnkiServer(url, deps, logger, {
-          forceOverride: true,
-          deck: 'Test Mining',
-          ankiConfig,
-        }),
-        true,
-      );
-      const anki = await parserWindow.webContents.executeJavaScript(
-        `(async () => (await chrome.storage.local.get('options')).options.anki)()`,
-      );
-      assert.equal(anki.model, 'Custom Japanese');
-      assert.equal(anki.deck, 'Test Mining');
-      assert.deepEqual(anki.tags, ankiConfig.tags);
-      assert.equal(anki.fieldTemplates.Term.value, '{expression}');
-      assert.equal(anki.fieldTemplates.Pronunciation.value, '{audio}');
-      assert.equal(anki.fieldTemplates.Context.value, '{sentence}');
-      assert.deepEqual(anki.templates[0].fieldTemplates, anki.fieldTemplates);
-      console.log('Hachidori Anki auto-population passed with an empty dictionary library');
-    } finally {
-      await new Promise((resolve) => metadataServer.close(resolve));
-    }
-    const archives = [
-      fixture('terms', 'SubMiner Test Terms', 'term_bank_1.json', [
-        ['食べる', 'たべる', '', 'v1', 0, ['to eat'], 1, ''],
-      ]),
-      fixture('names', 'SubMiner Character Dictionary (AniList 1)', 'term_bank_1.json', [
-        ['ミナト', 'みなと', '', 'n', 0, ['name'], 1, ''],
-      ]),
-      fixture('frequency', 'SubMiner Test Frequency', 'term_meta_bank_1.json', [
-        ['食べる', 'freq', { reading: 'たべる', frequency: 42 }],
-        ['頻度だけ', 'freq', { reading: 'ひんどだけ', frequency: 120 }],
-        ['頻度だけ', 'freq', { reading: 'べつのよみ', frequency: 250 }],
-        ['頻度だけ', 'freq', 17],
-      ]),
-      fixture(
-        'occurrences',
-        'SubMiner Test Occurrences',
-        'term_meta_bank_1.json',
-        [['頻度だけ', 'freq', 9000]],
-        'occurrence-based',
-      ),
-    ];
-    for (const archive of archives)
-      assert.equal(await parser.importYomitanDictionaryFromZip(archive, deps, logger), true);
-    const dictionaries = await parser.getYomitanDictionaryInfo(deps, logger);
-    assert.equal(dictionaries.length, 4);
-    parser.clearYomitanParserCachesForWindow(parserWindow);
-    const tokens = await parser.requestYomitanScanTokens('ミナト 食べた', deps, logger, {
-      includeNameMatchMetadata: true,
-      currentCharacterDictionaryMediaId: 1,
-    });
-    assert.equal(tokens[0].isNameMatch, true);
-    assert.equal(tokens[1].headword, '食べる');
-    assert.equal(tokens[1].reading, 'たべた');
-    assert.equal(tokens[1].startPos, 4);
-    assert.equal(tokens[1].endPos, 7);
-    assert.equal(tokens[1].frequencyRank, 42);
-    assert.deepEqual(tokens[1].wordClasses, ['v1']);
-    const exact = await parser.requestYomitanTermFrequencies(
-      [{ term: '食べる', reading: 'たべる' }],
-      deps,
-      logger,
-    );
-    assert.equal(exact.length, 1);
-    assert.equal(exact[0].frequency, 42);
-    assert.equal(exact[0].reading, 'たべる');
-    assert.equal(exact[0].hasReading, false);
-    const otherReading = await parser.requestYomitanTermFrequencies(
-      [{ term: '食べる', reading: 'べつのよみ' }],
-      deps,
-      logger,
-    );
-    // The shared frequency pipeline retries a missing reading as a term-only query.
-    assert.equal(otherReading[0]?.frequency, 42);
-    const unmatched = await parser.requestYomitanTermFrequencies(
-      [{ term: '頻度だけ', reading: null }],
-      deps,
-      logger,
-    );
-    assert.deepEqual(unmatched, []);
-    assert.equal(await parser.getYomitanCurrentAnkiDeckName(deps, logger), 'Test Mining');
-    assert.equal((await targetSession.extensions.getAllExtensions()).length, 1);
-    assert.equal(
-      await parser.syncYomitanDefaultAnkiServer('http://127.0.0.1:8765', deps, logger),
-      true,
-    );
-    const directSettings = await parser.getYomitanSettingsFull(deps, logger);
-    assert.equal(directSettings.profiles[0].options.anki.server, 'http://127.0.0.1:8765');
-    const proxyState = await host.webContents.executeJavaScript(
-      "chrome.storage.local.get('subminerAnkiProxyUrl')",
-    );
-    assert.equal(proxyState.subminerAnkiProxyUrl, null);
-    for (const entry of await parser.getYomitanDictionaryInfo(deps, logger)) {
-      assert.equal(await parser.deleteYomitanDictionaryByTitle(entry.title, deps, logger), true);
-    }
-    assert.deepEqual(await parser.getYomitanDictionaryInfo(deps, logger), []);
-    assert.equal(errors.length, 0);
-    console.log(
-      'PASS Hachidori native import, scanner, character names, term-entry API frequencies, settings and removal',
-    );
-    clearTimeout(deadline);
-    app.exit(0);
-  })
-  .catch((error) => {
-    console.error(error);
-    clearTimeout(deadline);
-    app.exit(1);
-  });
@@ -1,137 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import '../vendor/hachidori/extension/reader-options.js';
-import { createAnkiGateway } from '../vendor/hachidori/extension/anki.js';
-import { createAnkiWorkerService } from '../vendor/hachidori/extension/anki-worker.js';
-
-async function mine({ proxy = true, audioFails = false } = {}) {
-  const events: string[] = [];
-  const filename = `hachidori_${'a'.repeat(64)}.mp3`;
-  let fields: Record<string, string> = {};
-  let initialAudio = '';
-  let stored = false;
-  const gateway = createAnkiGateway({
-    readSubminerProxyUrl: async () => (proxy ? 'http://127.0.0.1:8766' : null),
-    fetch: async (_url: string, options: RequestInit) => {
-      const { action, params } = JSON.parse(String(options.body));
-      events.push(action);
-      let result: unknown;
-      switch (action) {
-        case 'multi':
-          result = [
-            { result: ['Default'], error: null },
-            { result: ['Basic'], error: null },
-            { result: ['Expression', 'ExpressionAudio'], error: null },
-          ];
-          break;
-        case 'canAddNotes':
-          result = [true];
-          break;
-        case 'canAddNotesWithErrorDetail':
-          result = [{ canAdd: true, error: null }];
-          break;
-        case 'getMediaFilesNames':
-          result = stored ? [filename] : [];
-          break;
-        case 'storeMediaFile':
-          stored = true;
-          result = filename;
-          break;
-        case 'addNote':
-          fields = { ...params.note.fields };
-          initialAudio = fields.ExpressionAudio ?? '';
-          if (initialAudio) assert.ok(stored, 'audio must exist before the note references it');
-          result = 123;
-          break;
-        case 'notesInfo':
-          result = [
-            {
-              noteId: 123,
-              fields: Object.fromEntries(
-                Object.entries(fields).map(([key, value]) => [key, { value }]),
-              ),
-            },
-          ];
-          break;
-        case 'updateNoteFields':
-          Object.assign(fields, params.note.fields);
-          result = null;
-          break;
-        default:
-          throw new Error(`Unexpected action: ${action}`);
-      }
-      return Response.json({ result, error: null });
-    },
-  });
-  const service = createAnkiWorkerService({
-    gateway,
-    readOptions: async () => ({
-      anki: {
-        url: 'http://127.0.0.1:8766',
-        apiKey: '',
-        templates: [
-          {
-            id: 'default',
-            name: 'Default',
-            deck: 'Default',
-            model: 'Basic',
-            tags: [],
-            fields: {},
-            duplicateScope: 'model',
-            duplicateBehavior: 'prevent',
-            captureScreenshot: false,
-            fieldTemplates: {
-              Expression: { value: '{expression}', overwriteMode: 'overwrite' },
-              ExpressionAudio: { value: '{audio}', overwriteMode: 'overwrite' },
-            },
-          },
-        ],
-      },
-      audioSources: [
-        { id: 'test', enabled: true, type: 'custom', url: 'https://example.test/{term}' },
-      ],
-      mediaCapture: { enabled: false },
-    }),
-    readDictionaries: async () => [],
-    engine: async () => ({ ready: true, loading: false, generation: 1 }),
-    offscreen: async (message: { type: string; audio?: string }) => {
-      if (message.type === 'hd_anki_audio') {
-        events.push('pronunciation');
-        if (audioFails) throw new Error('No pronunciation available');
-        return { filename, data: 'YXVkaW8=' };
-      }
-      return { fields: { Expression: '猫', ExpressionAudio: message.audio ?? '' }, media: [] };
-    },
-    duplicateIndex: { source: async () => null, recordWrite: async () => {} },
-  });
-  const status = await service.status();
-  assert.equal(status.available, true, status.error);
-  const result = await service.submit({
-    configKey: status.configKey,
-    generation: 1,
-    term: { expression: '猫', reading: 'ねこ' },
-  });
-  return { result, initialAudio, fields, events, filename };
-}
-
-test('SubMiner receives pronunciation in the initial Hachidori note, before enrichment starts', async () => {
-  const value = await mine();
-  assert.equal(value.result.state, 'added');
-  assert.equal(value.initialAudio, `[sound:${value.filename}]`);
-  assert.equal(value.events.filter((event) => event === 'pronunciation').length, 1);
-});
-
-test('direct Hachidori keeps deferred pronunciation', async () => {
-  const value = await mine({ proxy: false });
-  assert.equal(value.initialAudio, '');
-  assert.equal(value.fields.ExpressionAudio, `[sound:${value.filename}]`);
-});
-
-test('unavailable pronunciation remains a warning without a late audio write', async () => {
-  const value = await mine({ audioFails: true });
-  assert.equal(value.result.state, 'added');
-  assert.match(value.result.warnings.join(' '), /No pronunciation available/);
-  assert.equal(value.initialAudio, '');
-  assert.equal(value.events.filter((event) => event === 'pronunciation').length, 1);
-  assert.equal(value.events.includes('updateNoteFields'), false);
-});
@@ -1,132 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import { runInNewContext } from 'node:vm';
-import test from 'node:test';
-import { CHARACTER_DICTIONARY_TITLE_PREFIX } from '../src/core/services/tokenizer/character-dictionary-title';
-import { createAnkiGateway } from '../vendor/hachidori/extension/anki.js';
-
-const bridge = readFileSync(
-  new URL('../vendor/hachidori/extension/subminer-host.js', import.meta.url),
-  'utf8',
-);
-
-function run(code: string) {
-  runInNewContext(`${bridge}\n${code}`, {
-    window: new EventTarget(),
-    EventTarget,
-    CustomEvent,
-    assert,
-    characterPrefix: CHARACTER_DICTIONARY_TITLE_PREFIX,
-    KeyboardEvent: class {
-      constructor(_type: string, options: KeyboardEventInit = {}) {
-        Object.assign(this, options);
-      }
-    },
-  });
-}
-
-test('Hachidori publishes popup state independently from successful lookups', () => {
-  run(`
-    const events = [];
-    for (const name of ['yomitan-popup-shown', 'yomitan-popup-hidden', 'subminer-yomitan-lookup']) {
-      window.addEventListener(name, () => events.push(name));
-    }
-    const attributes = new Map();
-    const host = { setAttribute: (name, value) => attributes.set(name, value) };
-    SubMinerHachidori.attention(host, true);
-    assert.equal(attributes.get('data-subminer-yomitan-popup-visible'), 'true');
-    assert.equal(events.join(','), 'yomitan-popup-shown');
-    SubMinerHachidori.lookup();
-    SubMinerHachidori.attention(host, false);
-    assert.equal(attributes.get('data-subminer-yomitan-popup-visible'), 'false');
-    assert.equal(events.join(','), 'yomitan-popup-shown,subminer-yomitan-lookup,yomitan-popup-hidden');
-  `);
-});
-
-test('Hachidori promotes character glossaries and results without overriding linguistic rank', () => {
-  run(`
-    const result = (id, matched, dictionary, options = {}) => ({
-      matched, deinflected: matched, trace: [], preprocessorSteps: 0,
-      term: { expression: matched, reading: 'reading', glossaries: [{ dictionary }] }, ...options, id,
-    });
-    const character = characterPrefix + ' - Current show';
-    const longer = result('longer', '花子さん', 'General');
-    const normal = result('normal', '花子', 'General');
-    const person = result('person', '花子', character);
-    const shorter = result('shorter', '花', character);
-    const output = SubMinerHachidori.prioritizeCharacterResults([longer, normal, person, shorter]);
-    assert.equal(output.map(entry => entry.id).join(','), 'longer,person,normal,shorter');
-    const merged = result('merged', '花子', 'General');
-    merged.term.glossaries.push({ dictionary: character }, { dictionary: 'Second general' });
-    const [promoted] = SubMinerHachidori.prioritizeCharacterResults([merged]);
-    assert.equal(promoted.term.glossaries.map(g => g.dictionary).join(','), character + ',General,Second general');
-    assert.equal(merged.term.glossaries[0].dictionary, 'General');
-    for (const change of [{ preprocessorSteps: 1 }, { trace: [{}] }, { deinflected: '別の語' }]) {
-      const transformed = { ...person, ...change };
-      assert.equal(SubMinerHachidori.prioritizeCharacterResults([normal, transformed])[0].id, 'normal');
-    }
-    const preferredReading = { ...normal, term: { ...normal.term, reading: 'preferred' } };
-    assert.equal(SubMinerHachidori.prioritizeCharacterResults([person, preferredReading], {primaryReading: 'preferred'})[0].id, 'normal');
-    const aliased = result('aliased', '花子', 'Imported character data');
-    assert.equal(SubMinerHachidori.prioritizeCharacterResults([normal, aliased], {}, [{title: 'Imported character data', displayName: character}])[0].id, 'aliased');
-  `);
-});
-
-test('Hachidori sends private mining metadata only to the configured SubMiner proxy', async () => {
-  const requests: Array<{ url: string; body: string }> = [];
-  const proxy = 'http://127.0.0.1:8766';
-  const gateway = createAnkiGateway({
-    readSubminerProxyUrl: async () => proxy,
-    fetch: async (url: string, options: RequestInit) => {
-      assert.equal(typeof options.body, 'string');
-      requests.push({ url, body: String(options.body) });
-      return Response.json({ result: 123, error: null });
-    },
-  });
-  const params = {
-    note: { fields: { Expression: '花子' } },
-    subminerDuplicateNoteIds: [456],
-    subminerEnrich: true,
-  };
-  await gateway.invoke('addNote', params, '', 1000, proxy);
-  await gateway.invoke('addNote', params, '', 1000, 'http://127.0.0.1:8765');
-  assert.deepEqual(
-    requests.map((request) => JSON.parse(request.body).params),
-    [params, { note: params.note }],
-  );
-  assert.equal(params.subminerEnrich, true);
-  const direct = createAnkiGateway({
-    readSubminerProxyUrl: async () => null,
-    fetch: async (_url: string, options: RequestInit) => {
-      assert.deepEqual(JSON.parse(String(options.body)).params, { note: params.note });
-      return Response.json({ result: null, error: null });
-    },
-  });
-  await direct.invoke('updateNoteFields', params, '', 1000, proxy);
-});
-
-test('Hachidori routes host commands, validates keyboard input and disconnects', () => {
-  run(`
-    const calls = [];
-    const disconnect = SubMinerHachidori.connect({
-      hide: () => calls.push('hide'), clear: () => calls.push('clear'),
-      action: name => calls.push(name), cycleAudio: direction => calls.push(direction),
-      scroll: (x, y) => calls.push(x + ':' + y),
-      keydown: event => calls.push(event.key + ':' + event.ctrlKey + ':' + event.shiftKey),
-    });
-    const send = detail => window.dispatchEvent(new CustomEvent('subminer-yomitan-popup-command', {detail}));
-    send(null);
-    send({ type: 'forwardKeyDown', key: 12, modifiers: [] });
-    send({ type: 'mineSelected' });
-    send({ type: 'playCurrentAudio' });
-    send({ type: 'scanSelectedText' });
-    send({ type: 'cycleAudioSource', direction: -1 });
-    send({ type: 'scrollBy', deltaX: Infinity, deltaY: 40 });
-    send({ type: 'forwardKeyDown', key: 'j', code: 'KeyJ', modifiers: ['ctrl', 'shift'] });
-    send({ type: 'setVisible', visible: false });
-    send({ type: 'clearActiveTextSource' });
-    disconnect();
-    send({ type: 'mineSelected' });
-    assert.equal(calls.join(','), 'addNote,playAudio,scanSelectedText,-1,0:40,j:true:true,hide,clear');
-  `);
-});
@@ -27,14 +27,6 @@ const REQUIRED_APP_FILES = [
  ]),
 ];
 const REQUIRED_RESOURCES = [
-  'hachidori/manifest.json',
-  'hachidori/settings.html',
-  'hachidori/subminer-host.js',
-  'hachidori/vendor/hoshidicts.wasm',
-  'hachidori/vendor/hoshidicts-threaded.wasm',
-  'hachidori/vendor/hoshidicts-threaded-idbfs.wasm',
-  'hachidori/LICENSE',
-  'hachidori/SOURCE.json',
  'yomitan/manifest.json',
  'yomitan/data/fonts/kanji-stroke-orders.ttf',
  'yomitan/fonts/NotoSansJP-Regular.ttf',
@@ -59,10 +51,13 @@ function listFiles(root, prefix = '') {
  });
 }

+// asar resolves lookups with the platform separator, so stat with the listed
+// native path and only normalize the reported name.
 function listAppFiles(archive) {
  return asar.listPackage(archive).flatMap((entry) => {
-    const name = entry.replaceAll('\\', '/').replace(/^\//, '');
-    const stat = asar.statFile(archive, name);
+    const native = entry.replace(/^[\\/]/, '');
+    const stat = asar.statFile(archive, native);
+    const name = native.replaceAll('\\', '/');
    return 'size' in stat ? [{ path: name, bytes: stat.size }] : [];
  });
 }
@@ -137,7 +132,7 @@ function verifyContents(archive, resources, platform, arch) {
    assert(!name.path.startsWith('minecard'), `Demo media shipped: ${name.path}`);
  }
  for (const ui of ['renderer', 'settings', 'syncui']) {
-    const css = asar.extractFile(archive, `dist/${ui}/style.css`).toString();
+    const css = asar.extractFile(archive, path.join('dist', ui, 'style.css')).toString();
    assert(css.includes('../fonts/MPLUS1[wght].ttf'), `Shared font missing from ${ui} CSS`);
  }
  return entries;
@@ -134,10 +134,12 @@ test('archive inventory handles native files without counting them twice on disk
    mkdirSync(output);
    writeFileSync(path.join(input, 'main.js'), 'hello');
    writeFileSync(path.join(input, 'native.node'), 'native');
+    mkdirSync(path.join(input, 'dist', 'ai'), { recursive: true });
+    writeFileSync(path.join(input, 'dist', 'ai', 'client.js'), 'nested');
    const archive = path.join(output, 'app.asar');
    await createPackageFromStreams(
      archive,
-      ['main.js', 'native.node'].map((name) => ({
+      ['main.js', 'native.node', 'dist/ai/client.js'].map((name) => ({
        path: name,
        type: 'file',
        unpacked: name.endsWith('.node'),
@@ -148,6 +150,7 @@ test('archive inventory handles native files without counting them twice on disk
    assert.deepEqual(listAppFiles(archive), [
      { path: 'main.js', bytes: 5 },
      { path: 'native.node', bytes: 6 },
+      { path: 'dist/ai/client.js', bytes: 6 },
    ]);
    assert.equal(
      listFiles(output).reduce((sum: number, entry: { bytes: number }) => sum + entry.bytes, 0),
@@ -14,7 +14,12 @@ delete env.ELECTRON_RUN_AS_NODE;
 try {
  const result = spawnSync(
    require('electron'),
-    [fileURLToPath(new URL('./smoke-package.cjs', import.meta.url)), path.resolve(resources)],
+    [
+      fileURLToPath(new URL('./smoke-package.cjs', import.meta.url)),
+      path.resolve(resources),
+      // CI runners lack a setuid chrome-sandbox; this harness never loads remote content.
+      ...(process.platform === 'linux' ? ['--no-sandbox'] : []),
+    ],
    { env, stdio: 'inherit', timeout: 75_000 },
  );
  if (result.error) throw result.error;
@@ -1,11 +1,11 @@
 // Run with the pinned Electron runtime against a finished app's resources folder.
 const { app, BrowserWindow, session } = require('electron');
 const fs = require('node:fs');
+const http = require('node:http');
 const path = require('node:path');
 const { createRequire } = require('node:module');
 const assert = require('node:assert/strict');
 const { once } = require('node:events');
-const http = require('node:http');

 const resources = path.resolve(process.argv[2]);
 const archive = path.join(resources, 'app.asar');
@@ -22,6 +22,39 @@ const timeout = setTimeout(() => {
  app.exit(1);
 }, 60_000);

+const STATIC_TYPES = {
+  '.html': 'text/html',
+  '.js': 'text/javascript',
+  '.css': 'text/css',
+  '.png': 'image/png',
+  '.svg': 'image/svg+xml',
+  '.woff2': 'font/woff2',
+  '.ttf': 'font/ttf',
+  '.json': 'application/json',
+};
+
+// The stats dashboard is served by the stats HTTP server in the app, so load it
+// over loopback HTTP from the packaged stats/dist and treat missing static
+// assets as failures. API routes are not part of this smoke and may 404.
+function serveStatsDist(root, failedRequests) {
+  const server = http.createServer((req, res) => {
+    const pathname = new URL(req.url, 'http://127.0.0.1').pathname;
+    const relative = pathname === '/' ? 'index.html' : pathname.slice(1);
+    try {
+      const body = fs.readFileSync(path.join(root, relative));
+      res.writeHead(200, {
+        'Content-Type': STATIC_TYPES[path.extname(relative)] ?? 'application/octet-stream',
+      });
+      res.end(body);
+    } catch {
+      if (!pathname.startsWith('/api/')) failedRequests.push(`${req.url}: missing static asset`);
+      res.writeHead(404).end();
+    }
+  });
+  server.listen(0, '127.0.0.1');
+  return server;
+}
+
 async function smoke() {
  await app.whenReady();
  const packagedRequire = createRequire(path.join(archive, 'package.json'));
@@ -50,16 +83,19 @@ async function smoke() {
    { allowFileAccess: true },
  );
  assert(extension.id, 'Yomitan extension failed to load');
-  const hachidori = await session
-    .fromPartition('persist:hachidori')
-    .extensions.loadExtension(path.join(resources, 'hachidori'), { allowFileAccess: true });
-  assert(hachidori.id, 'Hachidori extension failed to load');
  const failedRequests = [];
-  session.defaultSession.webRequest.onErrorOccurred({ urls: ['file://*/*'] }, (details) => {
-    if (details.error !== 'net::ERR_ABORTED')
-      failedRequests.push(`${details.url}: ${details.error}`);
-  });
-  for (const ui of ['renderer', 'settings', 'syncui']) {
+  session.defaultSession.webRequest.onErrorOccurred(
+    { urls: ['file://*/*', 'http://127.0.0.1/*'] },
+    (details) => {
+      // Chromium probes the cache before fetching @font-face fonts; an uncached
+      // font reports ERR_CACHE_MISS and is then fetched normally.
+      if (!['net::ERR_ABORTED', 'net::ERR_CACHE_MISS'].includes(details.error))
+        failedRequests.push(`${details.url}: ${details.error}`);
+    },
+  );
+  const statsServer = serveStatsDist(path.join(archive, 'stats', 'dist'), failedRequests);
+  await once(statsServer, 'listening');
+  for (const ui of ['renderer', 'settings', 'syncui', 'stats']) {
    const win = new BrowserWindow({
      show: false,
      webPreferences: {
@@ -68,46 +104,25 @@ async function smoke() {
      },
    });
    try {
-      await win.loadFile(path.join(archive, `dist/${ui}/index.html`));
-      const loaded = await win.webContents.executeJavaScript(
-        `document.fonts.load('400 16px "M PLUS 1"', '日本語').then(fonts => fonts.length > 0 && fonts.every(font => font.status === 'loaded'))`,
-      );
-      assert(loaded, `${ui}: shared Japanese font failed to load`);
+      if (ui === 'stats') {
+        await win.loadURL(`http://127.0.0.1:${statsServer.address().port}/`);
+        // Let in-flight font requests settle before the window goes away.
+        await win.webContents.executeJavaScript('document.fonts.ready.then(() => true)');
+      } else {
+        await win.loadFile(path.join(archive, `dist/${ui}/index.html`));
+        const loaded = await win.webContents.executeJavaScript(
+          `document.fonts.load('400 16px "M PLUS 1"', '日本語').then(fonts => fonts.length > 0 && fonts.every(font => font.status === 'loaded'))`,
+        );
+        assert(loaded, `${ui}: shared Japanese font failed to load`);
+      }
    } finally {
      win.destroy();
    }
  }
-  // The stats dashboard uses HTTP for both assets and API requests in the app.
-  const { ImmersionTrackerService } = packagedRequire(
-    './dist/core/services/immersion-tracker-service.js',
-  );
-  const { createStatsApp, startNodeHttpServer } = packagedRequire(
-    './dist/core/services/stats-server.js',
-  );
-  const tracker = new ImmersionTrackerService({ dbPath: path.join(isolatedData, 'stats.db') });
-  const statsConfig = { port: 0, staticDir: path.join(archive, 'stats/dist'), tracker };
-  let statsHttp;
-  const statsServer = await startNodeHttpServer(
-    createStatsApp(tracker, statsConfig),
-    statsConfig,
-    (listener) => (statsHttp = http.createServer(listener)),
-  );
-  const statsWindow = new BrowserWindow({ show: false });
-  try {
-    const url = `http://127.0.0.1:${statsHttp.address().port}`;
-    session.defaultSession.webRequest.onCompleted({ urls: [`${url}/*`] }, (details) => {
-      if (details.statusCode >= 400) failedRequests.push(`${details.url}: ${details.statusCode}`);
-    });
-    await statsWindow.loadURL(url);
-    assert.equal((await fetch(`${url}/api/stats/overview`)).status, 200);
-  } finally {
-    statsWindow.destroy();
-    await statsServer.close();
-    tracker.destroy();
-  }
+  statsServer.close();
  assert.deepEqual(failedRequests, [], 'Packaged UI resources failed to load');
  console.log(
-    'Package smoke passed: SQLite, platform FFI, texthooker, both dictionary extensions, UI pages, stats HTTP, shared Japanese font.',
+    'Package smoke passed: SQLite, platform FFI, texthooker, Yomitan loading, UI pages, shared Japanese font.',
  );
 }

@@ -1545,3 +1545,25 @@ test('Anki metadata rejects a credential-bearing media title before metadata arr
  const result = privateApi.formatMiscInfoPattern('stream?api_key=test-secret', 426);
  assert.equal(result, '[SubMiner] Unknown media | Unknown media (00:07:06)');
 });
+
+test('AnkiIntegration.formatMiscInfoPattern treats ApiKey stream paths like legacy api_key ones', () => {
+  const integration = new AnkiIntegration(
+    { metadata: { pattern: '[SubMiner] %f (%t)' } } as never,
+    {} as never,
+    {
+      currentSubText: '',
+      currentVideoPath: 'stream?static=true&ApiKey=secret-token&MediaSourceId=ms-1',
+      currentTimePos: 426,
+      currentSubStart: 426,
+      currentSubEnd: 428,
+      currentMediaTitle: '[Jellyfin/direct] Bocchi the Rock! - S01E02',
+      send: () => true,
+    } as unknown as never,
+  );
+  const privateApi = integration as unknown as {
+    formatMiscInfoPattern: (fallbackFilename: string, startTimeSeconds?: number) => string;
+  };
+  const result = privateApi.formatMiscInfoPattern('audio_123.mp3', 426);
+  assert.equal(result, '[SubMiner] [Jellyfin/direct] Bocchi the Rock! - S01E02 (00:07:06)');
+  assert.equal(result.includes('ApiKey='), false);
+});
@@ -185,7 +185,7 @@ function extractFilenameFromMediaPath(rawPath: string): string {
 function shouldPreferMediaTitleForMiscInfo(rawPath: string, filename: string): boolean {
  const loweredPath = rawPath.toLowerCase();
  const loweredFilename = filename.toLowerCase();
-  if (loweredPath.includes('api_key=')) {
+  if (loweredPath.includes('api_key=') || loweredPath.includes('apikey=')) {
    return true;
  }
  if (loweredPath.startsWith('http://') || loweredPath.startsWith('https://')) {
@@ -1793,9 +1793,6 @@ export class AnkiIntegration {
    request: Omit<MediaTimingReviewRequest, 'audioPadding' | 'maxMediaDuration'>,
  ): Promise<MediaTimingReviewDecision> {
    if (this.config.media?.reviewTiming !== true || !this.mediaTimingReviewCallback) {
-      log.debug(
-        `[media-timing] review skipped: reviewTiming=${String(this.config.media?.reviewTiming)} callback=${this.mediaTimingReviewCallback ? 'set' : 'missing'}`,
-      );
      return { action: 'use-original' };
    }
    return await this.mediaTimingReviewCallback({
@@ -441,70 +441,6 @@ test('proxy strips SubMiner duplicate metadata before forwarding upstream addNot
  }
 });

-test('proxy enriches confirmed Hachidori overwrites without counting a new card or forwarding metadata', async () => {
-  const received: unknown[] = [];
-  let upstreamError: string | null = null;
-  const upstream = http.createServer(async (req, res) => {
-    const chunks: Buffer[] = [];
-    for await (const chunk of req) chunks.push(Buffer.from(chunk));
-    received.push(JSON.parse(Buffer.concat(chunks).toString()));
-    res.setHeader('content-type', 'application/json');
-    res.end(JSON.stringify({ result: null, error: upstreamError }));
-  });
-  upstream.listen(0, '127.0.0.1');
-  await once(upstream, 'listening');
-  const address = upstream.address();
-  assert.ok(address && typeof address === 'object');
-  const processed: number[] = [];
-  const added: number[] = [];
-  const proxy = new AnkiConnectProxyServer({
-    shouldAutoUpdateNewCards: () => true,
-    processNewCard: async (id) => {
-      processed.push(id);
-    },
-    recordCardsAdded: (count) => {
-      added.push(count);
-    },
-    logInfo: () => {},
-    logWarn: () => {},
-    logError: () => {},
-  });
-  try {
-    proxy.start({ host: '127.0.0.1', port: 0, upstreamUrl: `http://127.0.0.1:${address.port}` });
-    await proxy.waitUntilReady();
-    const server: unknown = Reflect.get(proxy, 'server');
-    assert.ok(server instanceof http.Server);
-    const bound = server.address();
-    assert.ok(bound && typeof bound === 'object');
-    for (const [id, marked, error] of [
-      [51, true, null],
-      [52, false, null],
-      [53, true, 'failed'],
-    ] satisfies Array<[number, boolean, string | null]>) {
-      upstreamError = error;
-      await fetch(`http://127.0.0.1:${bound.port}`, {
-        method: 'POST',
-        body: JSON.stringify({
-          action: 'updateNoteFields',
-          version: 6,
-          params: {
-            note: { id, fields: { Expression: '猫' } },
-            ...(marked ? { subminerEnrich: true } : {}),
-          },
-        }),
-      });
-    }
-    await waitForCondition(() => processed.length > 0);
-    assert.deepEqual(processed, [51]);
-    assert.deepEqual(added, []);
-    assert.equal(JSON.stringify(received).includes('subminerEnrich'), false);
-  } finally {
-    proxy.stop();
-    upstream.close();
-    await once(upstream, 'close');
-  }
-});
-
 test('proxy returns addNote response without waiting for background enrichment', async () => {
  const processed: number[] = [];
  let releaseProcessing: (() => void) | undefined;
@@ -224,31 +224,6 @@ export class AnkiConnectProxyServer {
      typeof requestJson.action === 'string'
        ? requestJson.action
        : String(requestJson.action ?? '');
-    if (action === 'updateNoteFields') {
-      const params = requestJson.params;
-      if (
-        !params ||
-        typeof params !== 'object' ||
-        !('subminerEnrich' in params) ||
-        params.subminerEnrich !== true
-      )
-        return;
-      const note = 'note' in params ? params.note : null;
-      if (!note || typeof note !== 'object' || !('id' in note)) return;
-      const response = this.tryParseJsonValue(responseBody);
-      // AnkiConnect confirms updates with {result:null,error:null}; failures must never enrich.
-      if (
-        !response ||
-        typeof response !== 'object' ||
-        !('error' in response) ||
-        response.error !== null ||
-        !('result' in response) ||
-        response.result !== null
-      )
-        return;
-      this.enqueueNotes(this.collectSingleResultId(note.id), false);
-      return;
-    }
    if (action !== 'addNote' && action !== 'addNotes' && action !== 'multi') {
      return;
    }
@@ -318,7 +293,7 @@ export class AnkiConnectProxyServer {
      typeof requestJson.action === 'string'
        ? requestJson.action
        : String(requestJson.action ?? '');
-    if (action !== 'addNote' && action !== 'updateNoteFields') {
+    if (action !== 'addNote') {
      return requestJson;
    }

@@ -326,17 +301,12 @@ export class AnkiConnectProxyServer {
      requestJson.params && typeof requestJson.params === 'object'
        ? (requestJson.params as Record<string, unknown>)
        : null;
-    if (
-      !params ||
-      (!Object.prototype.hasOwnProperty.call(params, 'subminerDuplicateNoteIds') &&
-        !Object.prototype.hasOwnProperty.call(params, 'subminerEnrich'))
-    ) {
+    if (!params || !Object.prototype.hasOwnProperty.call(params, 'subminerDuplicateNoteIds')) {
      return requestJson;
    }

    const nextParams = { ...params };
    delete nextParams.subminerDuplicateNoteIds;
-    delete nextParams.subminerEnrich;
    return {
      ...requestJson,
      params: nextParams,
@@ -485,7 +455,7 @@ export class AnkiConnectProxyServer {
    });
  }

-  private enqueueNotes(noteIds: number[], recordAdded = true): void {
+  private enqueueNotes(noteIds: number[]): void {
    let enqueuedCount = 0;
    const acceptedIds: number[] = [];
    for (const noteId of noteIds) {
@@ -502,7 +472,7 @@ export class AnkiConnectProxyServer {
      return;
    }

-    if (recordAdded) this.deps.recordCardsAdded?.(enqueuedCount, acceptedIds);
+    this.deps.recordCardsAdded?.(enqueuedCount, acceptedIds);
    this.deps.logInfo(`[anki-proxy] Enqueued ${enqueuedCount} note(s) for enrichment`);
    this.processQueue();
  }
@@ -8,7 +8,6 @@ import {
  isStandaloneTexthookerCommand,
  parseArgs,
  shouldRunYomitanOnlyStartup,
-  shouldRunDictionarySettingsOnlyStartup,
  shouldStartApp,
 } from './args';

@@ -476,21 +475,3 @@ test('hasExplicitCommand and shouldStartApp preserve command intent', () => {
  assert.equal(hasExplicitCommand(setup), true);
  assert.equal(shouldStartApp(setup), true);
 });
-
-test('Hachidori settings starts the app without overlay or mpv prerequisites', () => {
-  const args = parseArgs(['--hachidori']);
-  assert.equal(args.hachidori, true);
-  assert.equal(args.yomitan, false);
-  assert.equal(hasExplicitCommand(args), true);
-  assert.equal(shouldStartApp(args), true);
-  assert.equal(shouldRunDictionarySettingsOnlyStartup(args), true);
-  assert.equal(shouldRunYomitanOnlyStartup(args), false);
-  assert.equal(commandNeedsOverlayRuntime(args), false);
-  assert.equal(commandNeedsOverlayStartupPrereqs(args), false);
-  assert.equal(isStandaloneTexthookerCommand(parseArgs(['--texthooker', '--hachidori'])), false);
-  assert.equal(
-    shouldRunDictionarySettingsOnlyStartup(parseArgs(['--hachidori', '--start'])),
-    false,
-  );
-  assert.equal(shouldRunDictionarySettingsOnlyStartup(parseArgs(['--yomitan'])), true);
-});
@@ -13,7 +13,6 @@ export interface CliArgs {
  toggleVisibleOverlay: boolean;
  togglePrimarySubtitleBar: boolean;
  yomitan: boolean;
-  hachidori: boolean;
  settings: boolean;
  syncWindow: boolean;
  setup: boolean;
@@ -135,7 +134,6 @@ export function parseArgs(argv: string[]): CliArgs {
    toggleVisibleOverlay: false,
    togglePrimarySubtitleBar: false,
    yomitan: false,
-    hachidori: false,
    settings: false,
    syncWindow: false,
    setup: false,
@@ -287,7 +285,6 @@ export function parseArgs(argv: string[]): CliArgs {
    else if (arg === '--toggle-visible-overlay') args.toggleVisibleOverlay = true;
    else if (arg === '--toggle-primary-subtitle-bar') args.togglePrimarySubtitleBar = true;
    else if (arg === '--yomitan') args.yomitan = true;
-    else if (arg === '--hachidori') args.hachidori = true;
    else if (arg === '--settings') args.settings = true;
    else if (arg === '--sync-window') args.syncWindow = true;
    else if (arg === '--setup') args.setup = true;
@@ -571,7 +568,6 @@ export function hasExplicitCommand(args: CliArgs): boolean {
    args.toggleVisibleOverlay ||
    args.togglePrimarySubtitleBar ||
    args.yomitan ||
-    args.hachidori ||
    args.settings ||
    args.syncWindow ||
    args.setup ||
@@ -651,7 +647,6 @@ export function isStandaloneTexthookerCommand(args: CliArgs): boolean {
    !args.toggleVisibleOverlay &&
    !args.togglePrimarySubtitleBar &&
    !args.yomitan &&
-    !args.hachidori &&
    !args.settings &&
    !args.syncWindow &&
    !args.setup &&
@@ -724,7 +719,6 @@ export function shouldStartApp(args: CliArgs): boolean {
    args.toggleVisibleOverlay ||
    args.togglePrimarySubtitleBar ||
    args.yomitan ||
-    args.hachidori ||
    args.settings ||
    args.syncWindow ||
    args.setup ||
@@ -775,12 +769,8 @@ export function shouldStartApp(args: CliArgs): boolean {
 }

 export function shouldRunYomitanOnlyStartup(args: CliArgs): boolean {
-  return args.yomitan && !args.hachidori && shouldRunDictionarySettingsOnlyStartup(args);
-}
-
-export function shouldRunDictionarySettingsOnlyStartup(args: CliArgs): boolean {
  return (
-    (args.yomitan || args.hachidori) &&
+    args.yomitan &&
    !args.background &&
    !args.start &&
    !args.stop &&
@@ -24,7 +24,6 @@ test('printHelp includes configured texthooker port', () => {
  assert.match(output, /--setup\s+Open first-run setup window/);
  assert.match(output, /--settings\s+Open SubMiner settings window/);
  assert.match(output, /--yomitan\s+Open Yomitan settings window/);
-  assert.match(output, /--hachidori\s+Open Hachidori settings window/);
  assert.match(output, /--mark-watched\s+Mark current video watched and advance playlist/);
  assert.match(output, /--anilist-status/);
  assert.match(output, /--anilist-retry-queue/);
@@ -25,7 +25,6 @@ ${B}Overlay${R}
  --show-visible-overlay         Show subtitle overlay
  --hide-visible-overlay         Hide subtitle overlay
  --yomitan                      Open Yomitan settings window
-  --hachidori                    Open Hachidori settings window
  --settings                     Open SubMiner settings window
  --setup                        Open first-run setup window
  --auto-start-overlay           Auto-hide mpv subs, show overlay on connect
@@ -22,7 +22,6 @@ export type {
 } from './definitions/shared';

 const {
-  dictionaryBackend,
  subtitlePosition,
  keybindings,
  websocket,
@@ -58,7 +57,6 @@ const { stats } = STATS_DEFAULT_CONFIG;

 export const DEFAULT_CONFIG: ResolvedConfig = {
  subtitleGeneration: { ...DEFAULT_SUBTITLE_GENERATION_CONFIG },
-  dictionaryBackend,
  subtitlePosition,
  keybindings,
  websocket,
@@ -2,7 +2,6 @@ import { ResolvedConfig } from '../../types/config';

 export const CORE_DEFAULT_CONFIG: Pick<
  ResolvedConfig,
-  | 'dictionaryBackend'
  | 'subtitlePosition'
  | 'keybindings'
  | 'websocket'
@@ -19,7 +18,6 @@ export const CORE_DEFAULT_CONFIG: Pick<
  | 'notifications'
  | 'auto_start_overlay'
 > = {
-  dictionaryBackend: 'yomitan',
  subtitlePosition: { yPercent: 10 },
  keybindings: [],
  websocket: {
@@ -81,13 +81,6 @@ export function buildCoreConfigOptionRegistry(
  ] as const;

  return [
-    {
-      path: 'dictionaryBackend',
-      kind: 'enum',
-      enumValues: ['yomitan', 'hachidori'],
-      defaultValue: defaultConfig.dictionaryBackend,
-      description: 'Dictionary lookup backend. Restart SubMiner after changing this setting.',
-    },
    {
      path: 'logging.level',
      kind: 'enum',
@@ -1,14 +1,6 @@
 import { ConfigTemplateSection } from './shared';

 const CORE_TEMPLATE_SECTIONS: ConfigTemplateSection[] = [
-  {
-    title: 'Dictionary Backend',
-    description: ['Select the dictionary lookup backend: yomitan or hachidori.'],
-    notes: [
-      'Restart SubMiner after changing the backend. Each backend keeps separate settings and dictionaries.',
-    ],
-    key: 'dictionaryBackend',
-  },
  {
    title: 'Japanese Subtitle Generation',
    description: [
@@ -6,17 +6,6 @@ import { asBoolean, asNumber, asString, isObject } from './shared';
 export function applyCoreDomainConfig(context: ResolveContext): void {
  const { src, resolved, warn } = context;

-  if (src.dictionaryBackend === 'yomitan' || src.dictionaryBackend === 'hachidori') {
-    resolved.dictionaryBackend = src.dictionaryBackend;
-  } else if (src.dictionaryBackend !== undefined) {
-    warn(
-      'dictionaryBackend',
-      src.dictionaryBackend,
-      resolved.dictionaryBackend,
-      "Expected 'yomitan' or 'hachidori'.",
-    );
-  }
-
  if (isObject(src.texthooker)) {
    const launchAtStartup = asBoolean(src.texthooker.launchAtStartup);
    if (launchAtStartup !== undefined) {
@@ -1,30 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import { resolveConfig } from '../resolve';
-import { buildConfigSettingsRegistry } from '../settings/registry';
-import { createResolveContext } from './context';
-import { applyCoreDomainConfig } from './core-domains';
-
-test('dictionary backend defaults to Yomitan and accepts Hachidori', () => {
-  assert.equal(resolveConfig({}).resolved.dictionaryBackend, 'yomitan');
-  const { resolved, warnings } = resolveConfig({ dictionaryBackend: 'hachidori' });
-  assert.equal(resolved.dictionaryBackend, 'hachidori');
-  assert.deepEqual(warnings, []);
-  const field = buildConfigSettingsRegistry(resolved).find(
-    (entry) => entry.configPath === 'dictionaryBackend',
-  );
-  assert.equal(field?.restartBehavior, 'restart');
-  assert.deepEqual(field?.enumValues, ['yomitan', 'hachidori']);
-  assert.equal(field?.category, 'integrations');
-});
-
-test('unknown dictionary backend values warn and preserve the default', () => {
-  for (const dictionaryBackend of ['unknown', '', null, true, {}]) {
-    const { context, warnings } = createResolveContext({});
-    context.src.dictionaryBackend = dictionaryBackend;
-    applyCoreDomainConfig(context);
-    assert.equal(context.resolved.dictionaryBackend, 'yomitan');
-    assert.equal(warnings.length, 1);
-    assert.equal(warnings[0]?.path, 'dictionaryBackend');
-  }
-});
@@ -152,7 +152,6 @@ const SECTION_ORDER = new Map<string, number>(
    'Discord Rich Presence',
    'Jellyfin',
    'Texthooker',
-    'Dictionary Lookup',
    'Yomitan',
    'Stats dashboard',
    'Startup warmups',
@@ -235,8 +234,8 @@ const LABEL_OVERRIDES: Record<string, string> = {
  'shortcuts.openCharacterDictionaryManager': 'Open Character Dictionary Manager',
  'subtitleSidebar.pauseVideoOnHover': 'Pause Video On Hover - Sidebar',
  'subtitleStyle.autoPauseVideoOnHover': 'Pause Video On Hover - Subtitles',
-  'subtitleStyle.autoPauseVideoOnYomitanPopup': 'Pause Video On Dictionary Popup',
-  'subtitleStyle.primaryVisibleOnYomitanPopup': 'Keep Primary Visible On Dictionary Popup',
+  'subtitleStyle.autoPauseVideoOnYomitanPopup': 'Pause Video On Yomitan Popup',
+  'subtitleStyle.primaryVisibleOnYomitanPopup': 'Keep Primary Visible On Yomitan Popup',
  'subtitleStyle.primaryDefaultMode': 'Primary Subtitle Visibility Mode',
  'subtitleStyle.frequencyDictionary.mode': 'Frequency Mode',
  'subtitleStyle.css': 'CSS Declarations',
@@ -277,7 +276,7 @@ const DESCRIPTION_OVERRIDES: Record<string, string> = {
  'subtitleSidebar.css':
    'CSS declarations applied to the subtitle sidebar. Includes color, background-color, all font properties, and sidebar CSS variables.',
  'subtitleStyle.primaryVisibleOnYomitanPopup':
-    'When primary subtitles are in hover mode, keep the primary subtitle bar visible while a dictionary popup is open.',
+    'When primary subtitles are in hover mode, keep the primary subtitle bar visible while a Yomitan popup is open.',
  'websocket.enabled':
    'Built-in subtitle WebSocket server mode. Auto starts the built-in server only when mpv_websocket is not detected; otherwise it defers to the plugin.',
  'discordPresence.updateIntervalMs':
@@ -341,9 +340,6 @@ function humanizePath(path: string): string {
 }

 function categoryAndSection(path: string): { category: ConfigSettingsCategory; section: string } {
-  if (path === 'dictionaryBackend') {
-    return { category: 'integrations', section: 'Dictionary Lookup' };
-  }
  if (
    path === 'subtitleStyle.autoPauseVideoOnHover' ||
    path === 'subtitleStyle.autoPauseVideoOnYomitanPopup' ||
@@ -15,7 +15,6 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
    toggleVisibleOverlay: false,
    togglePrimarySubtitleBar: false,
    yomitan: false,
-    hachidori: false,
    settings: false,
    syncWindow: false,
    setup: false,
@@ -20,7 +20,6 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
    toggle: false,
    toggleVisibleOverlay: false,
    yomitan: false,
-    hachidori: false,
    settings: false,
    syncWindow: false,
    setup: false,
@@ -134,9 +133,6 @@ function createDeps(overrides: Partial<CliCommandServiceDeps> = {}) {
    togglePrimarySubtitleBar: () => {
      calls.push('togglePrimarySubtitleBar');
    },
-    openHachidoriSettingsDelayed: (delayMs) => {
-      calls.push(`openHachidoriSettingsDelayed:${delayMs}`);
-    },
    openYomitanSettingsDelayed: (delayMs) => {
      calls.push(`openYomitanSettingsDelayed:${delayMs}`);
    },
@@ -677,7 +673,6 @@ test('createCliCommandDepsRuntime reconnects MPV client when reconnect hook exis
    },
    ui: {
      openFirstRunSetup: () => {},
-      openHachidoriSettings: () => {},
      openYomitanSettings: () => {},
      openConfigSettingsWindow: () => {},
      openSyncUiWindow: () => {},
@@ -1138,14 +1133,3 @@ test('handleCliCommand reports async refresh-known-words errors to OSD', async (
  assert.ok(osd.some((value) => value.includes('Refresh known words failed: refresh boom')));
  assert.ok(calls.includes('stopApp'));
 });
-
-for (const source of ['initial', 'second-instance'] as const) {
-  test(`Hachidori settings command opens its own settings on ${source} invocation`, () => {
-    const { deps, calls } = createDeps();
-    handleCliCommand(makeArgs({ hachidori: true }), source, deps);
-    assert.ok(calls.includes('openHachidoriSettingsDelayed:1000'));
-    assert.equal(calls.includes('openYomitanSettingsDelayed:1000'), false);
-    assert.equal(calls.includes('initializeOverlayRuntime'), false);
-    assert.equal(calls.includes('connectMpvClient'), false);
-  });
-}
@@ -43,7 +43,6 @@ export interface CliCommandServiceDeps {
  togglePrimarySubtitleBar: () => void;
  openFirstRunSetup: (force?: boolean) => void;
  openYomitanSettingsDelayed: (delayMs: number) => void;
-  openHachidoriSettingsDelayed: (delayMs: number) => void;
  openConfigSettingsWindow: () => void;
  openSyncUiWindow: () => void;
  setVisibleOverlayVisible: (visible: boolean) => void;
@@ -171,7 +170,6 @@ interface MiningCliRuntime {
 interface UiCliRuntime {
  openFirstRunSetup: (force?: boolean) => void;
  openYomitanSettings: () => void;
-  openHachidoriSettings: () => void;
  openConfigSettingsWindow: () => void;
  openSyncUiWindow: () => void;
  cycleSecondarySubMode: () => void;
@@ -277,11 +275,6 @@ export function createCliCommandDepsRuntime(
        options.ui.openYomitanSettings();
      }, delayMs);
    },
-    openHachidoriSettingsDelayed: (delayMs) => {
-      options.schedule(() => {
-        options.ui.openHachidoriSettings();
-      }, delayMs);
-    },
    openConfigSettingsWindow: options.ui.openConfigSettingsWindow,
    openSyncUiWindow: options.ui.openSyncUiWindow,
    setVisibleOverlayVisible: options.overlay.setVisible,
@@ -432,8 +425,6 @@ export function handleCliCommand(
    deps.logDebug('Opened first-run setup flow.');
  } else if (args.yomitan) {
    deps.openYomitanSettingsDelayed(1000);
-  } else if (args.hachidori) {
-    deps.openHachidoriSettingsDelayed(1000);
  } else if (args.settings) {
    deps.openConfigSettingsWindow();
  } else if (args.syncWindow) {
@@ -1,55 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { resolveHachidoriExtensionPath } from './hachidori-extension';
-import { ensureExtensionCopyAsync } from './yomitan-extension-copy';
-
-test('Hachidori resolves development and packaged artifacts without falling back to Yomitan', () => {
-  const options = { moduleDir: '/app/dist/core/services', resourcesPath: '/resources' };
-  assert.equal(
-    resolveHachidoriExtensionPath({
-      ...options,
-      exists: (p) => p === '/app/build/hachidori/manifest.json',
-    }),
-    '/app/build/hachidori',
-  );
-  assert.equal(
-    resolveHachidoriExtensionPath({
-      ...options,
-      exists: (p) => p === '/resources/hachidori/manifest.json',
-    }),
-    '/resources/hachidori',
-  );
-  assert.throws(
-    () => resolveHachidoriExtensionPath({ ...options, exists: () => false }),
-    /build:hachidori/,
-  );
-});
-
-test('Hachidori updates its own extension copy and preserves the Yomitan copy', async () => {
-  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-backend-copy-'));
-  try {
-    const source = path.join(root, 'source');
-    const profile = path.join(root, 'profile');
-    fs.mkdirSync(source);
-    fs.writeFileSync(path.join(source, 'manifest.json'), '{"name":"Hachidori","version":"1"}');
-    fs.mkdirSync(path.join(profile, 'extensions/yomitan'), { recursive: true });
-    fs.writeFileSync(path.join(profile, 'extensions/yomitan/marker'), 'preserved');
-    const options = { extensionName: 'hachidori', platform: 'linux' } satisfies Parameters<
-      typeof ensureExtensionCopyAsync
-    >[2];
-    const copy = await ensureExtensionCopyAsync(source, profile, options);
-    assert.equal(copy.targetDir, path.join(profile, 'extensions/hachidori'));
-    assert.equal((await ensureExtensionCopyAsync(source, profile, options)).copied, false);
-    fs.writeFileSync(path.join(source, 'bridge.js'), 'updated');
-    assert.equal((await ensureExtensionCopyAsync(source, profile, options)).copied, true);
-    assert.equal(
-      fs.readFileSync(path.join(profile, 'extensions/yomitan/marker'), 'utf8'),
-      'preserved',
-    );
-  } finally {
-    fs.rmSync(root, { recursive: true, force: true });
-  }
-});
@@ -1,59 +0,0 @@
-import electron from 'electron';
-import type { Extension, Session } from 'electron';
-import { existsSync } from 'node:fs';
-import * as path from 'node:path';
-import { ensureExtensionCopyAsync } from './yomitan-extension-copy';
-import { HACHIDORI_SESSION_PARTITION } from './tokenizer/hachidori-parser-bridge';
-
-export function getHachidoriSession(): Session {
-  return electron.session.fromPartition(HACHIDORI_SESSION_PARTITION);
-}
-
-export function resolveHachidoriExtensionPath(options: {
-  moduleDir: string;
-  resourcesPath: string;
-  exists?: (candidate: string) => boolean;
-}): string {
-  const candidates = [
-    path.resolve(options.moduleDir, '../../../build/hachidori'),
-    path.join(options.resourcesPath, 'hachidori'),
-  ];
-  const found = candidates.find((candidate) =>
-    (options.exists ?? existsSync)(path.join(candidate, 'manifest.json')),
-  );
-  if (!found) throw new Error('Hachidori is not bundled. Run bun run build:hachidori.');
-  return found;
-}
-
-/** Separate session keeps settings-only launches from injecting into the other backend's overlay. */
-export function createHachidoriExtensionRuntime(userDataPath: string) {
-  let extension: Extension | null = null;
-  let loading: Promise<Extension> | null = null;
-  return {
-    getSession: getHachidoriSession,
-    ensureLoaded(): Promise<Extension> {
-      if (extension) return Promise.resolve(extension);
-      if (loading) return loading;
-      loading = (async () => {
-        const source = resolveHachidoriExtensionPath({
-          moduleDir: __dirname,
-          resourcesPath: process.resourcesPath,
-        });
-        const copy = await ensureExtensionCopyAsync(source, userDataPath, {
-          extensionName: 'hachidori',
-        });
-        const session = getHachidoriSession();
-        // Electron can reuse an old extension worker after its files change.
-        // Drop worker registrations before loading, preserving dictionaries and settings.
-        await session.clearStorageData({ storages: ['serviceworkers'] });
-        extension = await session.extensions.loadExtension(copy.targetDir, {
-          allowFileAccess: true,
-        });
-        return extension;
-      })().finally(() => {
-        loading = null;
-      });
-      return loading;
-    },
-  };
-}
@@ -3174,6 +3174,7 @@ test('Jellyfin metadata cleanup requires both an API key and a stream marker', a
      { filename: 'stream?api_key=secret', leaked: true },
      { filename: '/STREAM?API_KEY=secret', leaked: true },
      { filename: '/Videos/item?api_key=secret', leaked: true },
+      { filename: '/Videos/item?ApiKey=secret', leaked: true },
      { filename: 'MediaSourceId=item api key secret', leaked: true },
      { filename: 'An API Key Story', leaked: false },
      { filename: 'api_key=ordinary-metadata', leaked: false },
@@ -376,6 +376,7 @@ function buildJellyfinStatsMediaPath(mediaPath: string, itemId: string): string

 const JELLYFIN_MEDIA_ALIAS_QUERY_KEYS = [
  'api_key',
+  'ApiKey',
  'StartTimeTicks',
  'AudioStreamIndex',
  'SubtitleStreamIndex',
@@ -82,7 +82,7 @@ function parseLegacyJellyfinStreamUrl(value: string | null): URL | null {
    ) {
      return null;
    }
-    if (!url.searchParams.has('api_key')) {
+    if (!url.searchParams.has('api_key') && !url.searchParams.has('ApiKey')) {
      return null;
    }
    return url;
@@ -130,13 +130,13 @@ function repairLeakedJellyfinAnimeTitles(db: DatabaseSync, currentTimestamp: str
              SELECT v.canonical_title
              FROM imm_videos v
              WHERE v.anime_id = a.anime_id
-                AND v.canonical_title NOT LIKE '%api_key=%'
+                AND v.canonical_title NOT LIKE '%api_key=%' AND v.canonical_title NOT LIKE '%ApiKey=%'
                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=%'
+          WHERE a.canonical_title LIKE '%api_key=%' OR a.canonical_title LIKE '%ApiKey=%'
             OR lower(a.canonical_title) LIKE '%api key%'
             OR lower(a.normalized_title_key) LIKE '%api key%'
        `,
@@ -244,11 +244,11 @@ function repairLeakedJellyfinVideoParseMetadata(
          LAST_UPDATE_DATE = ?
        WHERE source_type = 2
          AND (
-            parsed_basename LIKE '%api_key=%'
+            parsed_basename LIKE '%api_key=%' OR parsed_basename LIKE '%ApiKey=%'
            OR lower(parsed_basename) LIKE '%api key%'
-            OR parsed_title LIKE '%api_key=%'
+            OR parsed_title LIKE '%api_key=%' OR parsed_title LIKE '%ApiKey=%'
            OR lower(parsed_title) LIKE '%api key%'
-            OR parse_metadata_json LIKE '%api_key=%'
+            OR parse_metadata_json LIKE '%api_key=%' OR parse_metadata_json LIKE '%ApiKey=%'
            OR lower(parse_metadata_json) LIKE '%api key%'
          )
      `,
@@ -267,7 +267,7 @@ function repairLeakedJellyfinAnimeParseMetadata(
    UPDATE imm_anime
    SET metadata_json = NULL, LAST_UPDATE_DATE = ?
    WHERE (
-      metadata_json LIKE '%api_key=%'
+      metadata_json LIKE '%api_key=%' OR metadata_json LIKE '%ApiKey=%'
      OR lower(metadata_json) LIKE '%api key%'
    ) AND (
      lower(metadata_json) LIKE '%stream?%'
@@ -295,11 +295,11 @@ export function repairJellyfinStreamVideoLinks(db: DatabaseSync): JellyfinLinkRe
        FROM imm_videos
        WHERE source_type = 2
          AND (
-            video_key LIKE '%api_key=%'
+            video_key LIKE '%api_key=%' OR video_key LIKE '%ApiKey=%'
            OR lower(video_key) LIKE '%api key%'
-            OR source_url LIKE '%api_key=%'
+            OR source_url LIKE '%api_key=%' OR source_url LIKE '%ApiKey=%'
            OR lower(source_url) LIKE '%api key%'
-            OR canonical_title LIKE '%api_key=%'
+            OR canonical_title LIKE '%api_key=%' OR canonical_title LIKE '%ApiKey=%'
            OR lower(canonical_title) LIKE '%api key%'
          )
      `,
@@ -4,6 +4,17 @@ import { buildJellyfinTimelinePayload, JellyfinRemoteSessionService } from './je

 class FakeWebSocket {
  private listeners: Record<string, Array<(...args: unknown[]) => void>> = {};
+  sent: string[] = [];
+  terminated = false;
+
+  send(data: string): void {
+    this.sent.push(data);
+  }
+
+  terminate(): void {
+    this.terminated = true;
+    this.emit('close');
+  }

  on(event: string, listener: (...args: unknown[]) => void): this {
    if (!this.listeners[event]) {
@@ -58,7 +69,7 @@ test('start posts capabilities on socket connect', async () => {
    accessToken: 'token-1',
    deviceId: 'device-1',
    webSocketFactory: (url) => {
-      assert.equal(url, 'ws://jellyfin.local:8096/socket?api_key=token-1&deviceId=device-1');
+      assert.equal(url, 'ws://jellyfin.local:8096/socket?ApiKey=token-1&deviceId=device-1');
      const socket = new FakeWebSocket();
      sockets.push(socket);
      return socket as unknown as any;
@@ -99,7 +110,8 @@ test('socket headers include jellyfin authorization metadata', () => {
  assert.equal(seenHeaders.length, 1);
  assert.ok(seenHeaders[0]!['Authorization']!.includes('Client="SubMiner"'));
  assert.ok(seenHeaders[0]!['Authorization']!.includes('DeviceId="device-auth"'));
-  assert.ok(seenHeaders[0]!['X-Emby-Authorization']);
+  assert.equal('X-Emby-Authorization' in seenHeaders[0]!, false);
+  assert.equal('X-Emby-Token' in seenHeaders[0]!, false);
 });

 test('dispatches inbound Play, Playstate, and GeneralCommand messages', () => {
@@ -355,3 +367,149 @@ test('advertiseNow validates server registration using Sessions endpoint', async
  assert.equal(ok, true);
  assert.ok(calls.some((url) => url.endsWith('/Sessions')));
 });
+
+test('answers ForceKeepAlive with KeepAlive messages on the advertised cadence', () => {
+  const sockets: FakeWebSocket[] = [];
+  const timers: Array<{ handler: () => void; delay: number }> = [];
+
+  const service = new JellyfinRemoteSessionService({
+    serverUrl: 'http://jellyfin.local',
+    accessToken: 'token-ka',
+    deviceId: 'device-ka',
+    webSocketFactory: () => {
+      const socket = new FakeWebSocket();
+      sockets.push(socket);
+      return socket as unknown as any;
+    },
+    fetchImpl: (async () => new Response(null, { status: 200 })) as typeof fetch,
+    setTimer: ((handler: () => void, delay?: number) => {
+      timers.push({ handler, delay: Number(delay) });
+      return timers.length as unknown as ReturnType<typeof setTimeout>;
+    }) as typeof setTimeout,
+    clearTimer: (() => undefined) as typeof clearTimeout,
+  });
+
+  service.start();
+  sockets[0]!.emit('open');
+  assert.deepEqual(sockets[0]!.sent, ['{"MessageType":"KeepAlive"}']);
+  assert.equal(timers[0]!.delay, 30_000);
+
+  sockets[0]!.emit('message', JSON.stringify({ MessageType: 'ForceKeepAlive', Data: 20 }));
+  assert.equal(sockets[0]!.sent.length, 2);
+  assert.equal(timers.at(-1)!.delay, 10_000);
+
+  timers.at(-1)!.handler();
+  assert.equal(sockets[0]!.sent.length, 3);
+});
+
+test('reconnects when the server stops answering keep-alives', () => {
+  let now = 1_000_000;
+  const sockets: FakeWebSocket[] = [];
+  const timers: Array<() => void> = [];
+  const warnings: string[] = [];
+
+  const service = new JellyfinRemoteSessionService({
+    serverUrl: 'http://jellyfin.local',
+    accessToken: 'token-lost',
+    deviceId: 'device-lost',
+    webSocketFactory: () => {
+      const socket = new FakeWebSocket();
+      sockets.push(socket);
+      return socket as unknown as any;
+    },
+    fetchImpl: (async () => new Response(null, { status: 200 })) as typeof fetch,
+    getNow: () => now,
+    logWarn: (message) => {
+      warnings.push(message);
+    },
+    reconnectBaseDelayMs: 100,
+    setTimer: ((handler: () => void) => {
+      timers.push(handler);
+      return timers.length as unknown as ReturnType<typeof setTimeout>;
+    }) as typeof setTimeout,
+    clearTimer: (() => undefined) as typeof clearTimeout,
+  });
+
+  service.start();
+  sockets[0]!.emit('open');
+
+  // Two silent ticks are still within the 90s tolerance; the third marks the socket lost.
+  now += 30_000;
+  timers.shift()!();
+  now += 30_000;
+  timers.shift()!();
+  assert.equal(sockets[0]!.sent.length, 3);
+  assert.equal(sockets[0]!.terminated, false);
+
+  now += 30_000;
+  timers.shift()!();
+  assert.equal(sockets[0]!.terminated, true);
+  assert.equal(service.isConnected(), false);
+  assert.equal(warnings.length, 1);
+
+  timers.shift()!();
+  assert.equal(sockets.length, 2);
+});
+
+test('warns once per failing timeline endpoint until it recovers', async () => {
+  const warnings: string[] = [];
+  let status = 400;
+
+  const service = new JellyfinRemoteSessionService({
+    serverUrl: 'http://jellyfin.local',
+    accessToken: 'token-warn',
+    deviceId: 'device-warn',
+    webSocketFactory: () => new FakeWebSocket() as unknown as any,
+    fetchImpl: (async () => new Response(null, { status })) as typeof fetch,
+    logWarn: (message) => {
+      warnings.push(message);
+    },
+  });
+  const state = { itemId: 'item-1', positionTicks: 10, playMethod: 'DirectPlay' };
+
+  assert.equal(await service.reportStopped(state), false);
+  assert.equal(await service.reportStopped(state), false);
+  assert.equal(warnings.length, 1);
+  assert.match(warnings[0]!, /Sessions\/Playing\/Stopped/);
+
+  status = 200;
+  assert.equal(await service.reportStopped(state), true);
+  status = 500;
+  assert.equal(await service.reportStopped(state), false);
+  assert.equal(warnings.length, 2);
+});
+
+test('ignores messages from a superseded socket', () => {
+  const sockets: FakeWebSocket[] = [];
+  const playPayloads: unknown[] = [];
+
+  const service = new JellyfinRemoteSessionService({
+    serverUrl: 'http://jellyfin.local',
+    accessToken: 'token-stale',
+    deviceId: 'device-stale',
+    webSocketFactory: () => {
+      const socket = new FakeWebSocket();
+      sockets.push(socket);
+      return socket as unknown as any;
+    },
+    fetchImpl: (async () => new Response(null, { status: 200 })) as typeof fetch,
+    onPlay: (payload) => {
+      playPayloads.push(payload);
+    },
+    setTimer: (() => 1 as unknown as ReturnType<typeof setTimeout>) as unknown as typeof setTimeout,
+    clearTimer: (() => undefined) as typeof clearTimeout,
+  });
+
+  service.start();
+  service.stop();
+  service.start();
+  sockets[1]!.emit('open');
+  assert.equal(sockets.length, 2);
+
+  sockets[0]!.emit('message', JSON.stringify({ MessageType: 'ForceKeepAlive', Data: 10 }));
+  sockets[0]!.emit('message', JSON.stringify({ MessageType: 'Play', Data: { ItemIds: ['x'] } }));
+
+  assert.deepEqual(sockets[0]!.sent, []);
+  assert.deepEqual(playPayloads, []);
+  assert.deepEqual(sockets[1]!.sent, ['{"MessageType":"KeepAlive"}']);
+});
@@ -45,9 +45,22 @@ interface JellyfinRemoteSocket {
  on(event: 'close', listener: () => void): this;
  on(event: 'error', listener: (error: Error) => void): this;
  on(event: 'message', listener: (data: unknown) => void): this;
+  send(data: string): void;
+  terminate?(): void;
  close(): void;
 }

+// Jellyfin advertises its keep-alive timeout in the ForceKeepAlive message (60s by default),
+// drops sockets that stay silent past it, and since 12.0 also detaches the session's remote
+// controller when that happens. The drop never reaches the client as a close frame, so the
+// client has to keep sending KeepAlive and treat missing replies as a dead connection.
+const DEFAULT_KEEP_ALIVE_TIMEOUT_MS = 60_000;
+const KEEP_ALIVE_LOST_FACTOR = 1.5;
+
+function unrefTimer(timer: ReturnType<typeof setTimeout>): void {
+  (timer as unknown as { unref?: () => void }).unref?.();
+}
+
 type JellyfinRemoteSocketHeaders = Record<string, string>;

 export interface JellyfinRemoteSessionServiceOptions {
@@ -77,6 +90,9 @@ export interface JellyfinRemoteSessionServiceOptions {
  deviceName?: string;
  onConnected?: () => void;
  onDisconnected?: () => void;
+  logWarn?: (message: string, details?: unknown) => void;
+  keepAliveTimeoutMs?: number;
+  getNow?: () => number;
 }

 function normalizeServerUrl(serverUrl: string): string {
@@ -196,6 +212,12 @@ export class JellyfinRemoteSessionService {
  private readonly authHeader: string;
  private readonly onConnected?: () => void;
  private readonly onDisconnected?: () => void;
+  private readonly logWarn?: (message: string, details?: unknown) => void;
+  private readonly now: () => number;
+  private keepAliveTimeoutMs: number;
+  private keepAliveTimer: ReturnType<typeof setTimeout> | null = null;
+  private lastInboundAtMs = 0;
+  private readonly failedRequestPaths = new Set<string>();

  private readonly reconnectBaseDelayMs: number;
  private readonly reconnectMaxDelayMs: number;
@@ -233,6 +255,12 @@ export class JellyfinRemoteSessionService {
    });
    this.onConnected = options.onConnected;
    this.onDisconnected = options.onDisconnected;
+    this.logWarn = options.logWarn;
+    this.now = options.getNow ?? Date.now;
+    this.keepAliveTimeoutMs = Math.max(
+      1000,
+      options.keepAliveTimeoutMs ?? DEFAULT_KEEP_ALIVE_TIMEOUT_MS,
+    );
    this.reconnectBaseDelayMs = Math.max(100, options.reconnectBaseDelayMs ?? 500);
    this.reconnectMaxDelayMs = Math.max(
      this.reconnectBaseDelayMs,
@@ -250,6 +278,7 @@ export class JellyfinRemoteSessionService {
  public stop(): void {
    this.running = false;
    this.connected = false;
+    this.stopKeepAlive();
    if (this.reconnectTimer) {
      this.clearTimer(this.reconnectTimer);
      this.reconnectTimer = null;
@@ -298,12 +327,16 @@ export class JellyfinRemoteSessionService {
      if (this.socket !== socket || !this.running) return;
      this.connected = true;
      this.reconnectAttempt = 0;
+      this.lastInboundAtMs = this.now();
+      this.startKeepAlive(socket, this.keepAliveTimeoutMs);
      this.onConnected?.();
      void this.postCapabilities();
    });

    socket.on('message', (rawData) => {
-      this.handleInboundMessage(rawData);
+      if (this.socket !== socket || !this.running) return;
+      this.lastInboundAtMs = this.now();
+      this.handleInboundMessage(socket, rawData);
    });

    const handleDisconnect = () => {
@@ -311,6 +344,7 @@ export class JellyfinRemoteSessionService {
      disconnected = true;
      if (this.socket === socket) {
        this.socket = null;
+        this.stopKeepAlive();
      }
      this.connected = false;
      this.onDisconnected?.();
@@ -323,6 +357,51 @@ export class JellyfinRemoteSessionService {
    socket.on('error', handleDisconnect);
  }

+  private startKeepAlive(socket: JellyfinRemoteSocket, timeoutMs: number): void {
+    this.stopKeepAlive();
+    this.keepAliveTimeoutMs = timeoutMs;
+    this.sendKeepAlive(socket);
+    this.scheduleKeepAliveTick(socket);
+  }
+
+  private scheduleKeepAliveTick(socket: JellyfinRemoteSocket): void {
+    const intervalMs = Math.max(1000, Math.floor(this.keepAliveTimeoutMs / 2));
+    const timer = this.setTimer(() => {
+      this.keepAliveTimer = null;
+      if (this.socket !== socket || !this.running) return;
+      const silentForMs = this.now() - this.lastInboundAtMs;
+      if (silentForMs >= this.keepAliveTimeoutMs * KEEP_ALIVE_LOST_FACTOR) {
+        this.logWarn?.('Jellyfin remote websocket stopped answering keep-alives; reconnecting.');
+        // Dropping the socket raises 'close', which schedules the reconnect.
+        if (socket.terminate) {
+          socket.terminate();
+        } else {
+          socket.close();
+        }
+        return;
+      }
+      this.sendKeepAlive(socket);
+      this.scheduleKeepAliveTick(socket);
+    }, intervalMs);
+    unrefTimer(timer);
+    this.keepAliveTimer = timer;
+  }
+
+  private stopKeepAlive(): void {
+    if (this.keepAliveTimer) {
+      this.clearTimer(this.keepAliveTimer);
+      this.keepAliveTimer = null;
+    }
+  }
+
+  private sendKeepAlive(socket: JellyfinRemoteSocket): void {
+    try {
+      socket.send(JSON.stringify({ MessageType: 'KeepAlive' }));
+    } catch (error) {
+      this.logWarn?.('Failed to send Jellyfin remote keep-alive.', error);
+    }
+  }
+
  private scheduleReconnect(): void {
    const delay = Math.min(
      this.reconnectMaxDelayMs,
@@ -342,7 +421,7 @@ export class JellyfinRemoteSessionService {
    const baseUrl = new URL(`${this.serverUrl}/`);
    const socketUrl = new URL('/socket', baseUrl);
    socketUrl.protocol = baseUrl.protocol === 'https:' ? 'wss:' : 'ws:';
-    socketUrl.searchParams.set('api_key', this.accessToken);
+    socketUrl.searchParams.set('ApiKey', this.accessToken);
    socketUrl.searchParams.set('deviceId', this.deviceId);
    return socketUrl.toString();
  }
@@ -350,8 +429,6 @@ export class JellyfinRemoteSessionService {
  private createSocket(url: string): JellyfinRemoteSocket {
    const headers: JellyfinRemoteSocketHeaders = {
      Authorization: this.authHeader,
-      'X-Emby-Authorization': this.authHeader,
-      'X-Emby-Token': this.accessToken,
    };
    if (this.socketHeadersFactory) {
      return this.socketHeadersFactory(url, headers);
@@ -375,8 +452,6 @@ export class JellyfinRemoteSessionService {
        method: 'GET',
        headers: {
          Authorization: this.authHeader,
-          'X-Emby-Authorization': this.authHeader,
-          'X-Emby-Token': this.accessToken,
        },
      });
      if (!response.ok) return false;
@@ -398,21 +473,41 @@ export class JellyfinRemoteSessionService {
        headers: {
          'Content-Type': 'application/json',
          Authorization: this.authHeader,
-          'X-Emby-Authorization': this.authHeader,
-          'X-Emby-Token': this.accessToken,
        },
        body: JSON.stringify(payload),
      });
+      this.noteRequestOutcome(path, response.ok ? null : `HTTP ${response.status}`);
      return response.ok;
-    } catch {
+    } catch (error) {
+      this.noteRequestOutcome(path, error);
      return false;
    }
  }

-  private handleInboundMessage(rawData: unknown): void {
+  // Warn once per path while it keeps failing so a rejected stop report is visible in the
+  // log without a warning per progress tick.
+  private noteRequestOutcome(path: string, failure: unknown): void {
+    if (failure === null) {
+      this.failedRequestPaths.delete(path);
+      return;
+    }
+    if (this.failedRequestPaths.has(path)) return;
+    this.failedRequestPaths.add(path);
+    this.logWarn?.(`Jellyfin remote request failed: POST ${path}`, failure);
+  }
+
+  private handleInboundMessage(socket: JellyfinRemoteSocket, rawData: unknown): void {
    const message = parseInboundMessage(rawData);
    if (!message) return;
    const messageType = message.MessageType;
+    if (messageType === 'ForceKeepAlive') {
+      const seconds = Number(message.Data);
+      const timeoutMs =
+        Number.isFinite(seconds) && seconds > 0 ? seconds * 1000 : this.keepAliveTimeoutMs;
+      this.startKeepAlive(socket, timeoutMs);
+      return;
+    }
+    if (messageType === 'KeepAlive') return;
    const payload = parseMessageData(message.Data);
    if (messageType === 'Play') {
      this.onPlay?.(payload);
@@ -279,7 +279,7 @@ test('resolvePlaybackPlan prefers transcode when directPlayPreferred is disabled
    assert.equal(plan.mode, 'transcode');
    const url = new URL(plan.url);
    assert.match(url.pathname, /\/Videos\/movie-2\/master\.m3u8$/);
-    assert.equal(url.searchParams.get('api_key'), 'token');
+    assert.equal(url.searchParams.get('ApiKey'), 'token');
    assert.equal(url.searchParams.get('AudioStreamIndex'), '4');
    assert.equal(url.searchParams.get('StartTimeTicks'), '10000000');
  } finally {
@@ -365,7 +365,7 @@ test('listSubtitleTracks returns all subtitle streams with delivery urls', async
                IsForced: true,
                IsExternal: true,
                DeliveryMethod: 'External',
-                DeliveryUrl: '/Videos/movie-1/ms-1/Subtitles/3/Stream.srt',
+                DeliveryUrl: '/Videos/movie-1/ms-1/Subtitles/3/Stream.srt?api_key=server-token',
                IsExternalUrl: false,
              },
              {
@@ -402,11 +402,11 @@ test('listSubtitleTracks returns all subtitle streams with delivery urls', async
    );
    assert.equal(
      tracks[0]!.deliveryUrl,
-      'http://jellyfin.local/Videos/movie-1/ms-1/Subtitles/2/Stream.srt?api_key=token',
+      'http://jellyfin.local/Videos/movie-1/ms-1/Subtitles/2/Stream.srt?ApiKey=token',
    );
    assert.equal(
      tracks[1]!.deliveryUrl,
-      'http://jellyfin.local/Videos/movie-1/ms-1/Subtitles/3/Stream.srt?api_key=token',
+      'http://jellyfin.local/Videos/movie-1/ms-1/Subtitles/3/Stream.srt?ApiKey=token',
    );
    assert.equal(tracks[2]!.deliveryUrl, 'https://cdn.example.com/subs.srt');
  } finally {
@@ -505,7 +505,7 @@ test('resolvePlaybackPlan reuses server transcoding url and appends missing para
    const url = new URL(plan.url);
    assert.match(url.pathname, /\/Videos\/movie-4\/master\.m3u8$/);
    assert.equal(url.searchParams.get('VideoCodec'), 'hevc');
-    assert.equal(url.searchParams.get('api_key'), 'token');
+    assert.equal(url.searchParams.get('ApiKey'), 'token');
    assert.equal(url.searchParams.get('AudioStreamIndex'), '3');
    assert.equal(url.searchParams.get('SubtitleStreamIndex'), '8');
    assert.equal(url.searchParams.get('StartTimeTicks'), '50000000');
@@ -626,7 +626,7 @@ test('listSubtitleTracks falls back from PlaybackInfo to item media sources', as
    assert.equal(tracks[0]!.index, 11);
    assert.equal(
      tracks[0]!.deliveryUrl,
-      'http://jellyfin.local/Videos/movie-fallback/ms-fallback/Subtitles/11/Stream.srt?api_key=token',
+      'http://jellyfin.local/Videos/movie-fallback/ms-fallback/Subtitles/11/Stream.srt?ApiKey=token',
    );
  } finally {
    globalThis.fetch = originalFetch;
@@ -789,3 +789,67 @@ test('resolvePlaybackPlan surfaces no-source and no-stream fallback errors', asy
    globalThis.fetch = originalFetch;
  }
 });
+
+test('API requests authenticate with the MediaBrowser header only (no legacy X-Emby-Token)', async () => {
+  const originalFetch = globalThis.fetch;
+  const seenHeaders: Headers[] = [];
+  globalThis.fetch = (async (_input, init) => {
+    seenHeaders.push(new Headers(init?.headers));
+    return new Response(JSON.stringify({ Items: [] }), { status: 200 });
+  }) as typeof fetch;
+
+  try {
+    await listLibraries(
+      { serverUrl: 'http://jellyfin.local', accessToken: 'token', userId: 'u1', username: 'kyle' },
+      clientInfo,
+    );
+    assert.equal(seenHeaders.length, 1);
+    const headers = seenHeaders[0]!;
+    const authorization = headers.get('authorization') ?? '';
+    assert.match(authorization, /^MediaBrowser /);
+    assert.match(authorization, /Token="token"/);
+    assert.match(authorization, /DeviceId="subminer-test"/);
+    assert.equal(headers.has('x-emby-token'), false);
+    assert.equal(headers.has('x-emby-authorization'), false);
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+});
+
+test('resolvePlaybackPlan replaces a legacy api_key on the server transcoding url with ApiKey', async () => {
+  const originalFetch = globalThis.fetch;
+  globalThis.fetch = (async () =>
+    new Response(
+      JSON.stringify({
+        Id: 'movie-legacy',
+        Name: 'Movie Legacy',
+        MediaSources: [
+          {
+            Id: 'ms-legacy',
+            Container: 'mkv',
+            SupportsDirectStream: false,
+            SupportsTranscoding: true,
+            TranscodingUrl: '/Videos/movie-legacy/master.m3u8?VideoCodec=hevc&api_key=server-token',
+          },
+        ],
+      }),
+      { status: 200 },
+    )) as typeof fetch;
+
+  try {
+    const plan = await resolvePlaybackPlan(
+      { serverUrl: 'http://jellyfin.local', accessToken: 'token', userId: 'u1', username: 'kyle' },
+      clientInfo,
+      { enabled: true, directPlayPreferred: true },
+      { itemId: 'movie-legacy' },
+    );
+
+    assert.equal(plan.mode, 'transcode');
+    const url = new URL(plan.url);
+    assert.equal(url.searchParams.get('ApiKey'), 'token');
+    assert.equal(url.searchParams.has('api_key'), false);
+    assert.equal(url.searchParams.get('VideoCodec'), 'hevc');
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+});
@@ -136,6 +136,16 @@ function getErrorMessage(error: unknown): string {
  return String(error || 'unknown error');
 }

+// Jellyfin reads query keys case-insensitively and older servers embed the token as
+// `api_key` in the URLs they hand back, so drop every spelling before setting the one
+// form Jellyfin 12 still accepts with legacy authorization disabled.
+function setApiKeyParam(url: URL, accessToken: string): void {
+  for (const key of [...url.searchParams.keys()]) {
+    if (/^api_?key$/i.test(key)) url.searchParams.delete(key);
+  }
+  url.searchParams.set('ApiKey', accessToken);
+}
+
 function resolveDeliveryUrl(
  session: JellyfinAuthSession,
  stream: JellyfinMediaStream,
@@ -146,9 +156,7 @@ function resolveDeliveryUrl(
  if (deliveryUrl) {
    if (stream.IsExternalUrl === true) return deliveryUrl;
    const resolved = new URL(deliveryUrl, `${session.serverUrl}/`);
-    if (!resolved.searchParams.has('api_key')) {
-      resolved.searchParams.set('api_key', session.accessToken);
-    }
+    setApiKeyParam(resolved, session.accessToken);
    return resolved.toString();
  }

@@ -171,9 +179,7 @@ function resolveDeliveryUrl(
    `/Videos/${encodeURIComponent(itemId)}/${encodeURIComponent(mediaSourceId)}/Subtitles/${streamIndex}/Stream.${ext}`,
    `${session.serverUrl}/`,
  );
-  if (!fallback.searchParams.has('api_key')) {
-    fallback.searchParams.set('api_key', session.accessToken);
-  }
+  setApiKeyParam(fallback, session.accessToken);
  return fallback.toString();
 }

@@ -197,7 +203,6 @@ async function jellyfinRequestJson<T>(
  const headers = new Headers(init.headers ?? {});
  headers.set('Content-Type', 'application/json');
  headers.set('Authorization', createAuthorizationHeader(client, session.accessToken));
-  headers.set('X-Emby-Token', session.accessToken);

  const response = await fetch(`${session.serverUrl}${path}`, {
    ...init,
@@ -221,7 +226,7 @@ function createDirectPlayUrl(
 ): string {
  const query = new URLSearchParams({
    static: 'true',
-    api_key: session.accessToken,
+    ApiKey: session.accessToken,
    MediaSourceId: ensureString(mediaSource.Id),
  });
  if (mediaSource.LiveStreamId) {
@@ -245,9 +250,7 @@ function createTranscodeUrl(
 ): string {
  if (mediaSource.TranscodingUrl) {
    const url = new URL(`${session.serverUrl}${mediaSource.TranscodingUrl}`);
-    if (!url.searchParams.has('api_key')) {
-      url.searchParams.set('api_key', session.accessToken);
-    }
+    setApiKeyParam(url, session.accessToken);
    if (!url.searchParams.has('AudioStreamIndex') && plan.audioStreamIndex !== null) {
      url.searchParams.set('AudioStreamIndex', String(plan.audioStreamIndex));
    }
@@ -261,7 +264,7 @@ function createTranscodeUrl(
  }

  const query = new URLSearchParams({
-    api_key: session.accessToken,
+    ApiKey: session.accessToken,
    MediaSourceId: ensureString(mediaSource.Id),
    VideoCodec: ensureString(config.transcodeVideoCodec, 'h264'),
    TranscodingContainer: 'ts',
@@ -1,5 +1,6 @@
 import {
  MPV_REQUEST_ID_AID,
+  MPV_REQUEST_ID_MEDIA_TITLE,
  MPV_REQUEST_ID_OSD_DIMENSIONS,
  MPV_REQUEST_ID_OSD_HEIGHT,
  MPV_REQUEST_ID_PATH,
@@ -85,6 +86,7 @@ const MPV_INITIAL_PROPERTY_REQUESTS: Array<MpvProtocolCommand> = [
  },
  {
    command: ['get_property', 'media-title'],
+    request_id: MPV_REQUEST_ID_MEDIA_TITLE,
  },
  {
    command: ['get_property', 'pause'],
@@ -35,6 +35,7 @@ export const MPV_REQUEST_ID_SUB_USE_MARGINS = 122;
 export const MPV_REQUEST_ID_PAUSE = 123;
 export const MPV_REQUEST_ID_TRACK_LIST_SECONDARY = 200;
 export const MPV_REQUEST_ID_TRACK_LIST_AUDIO = 201;
+export const MPV_REQUEST_ID_MEDIA_TITLE = 202;

 export type MpvMessageParser = (message: MpvMessage) => void;
 export type MpvParseErrorHandler = (line: string, error: unknown) => void;
@@ -335,14 +336,18 @@ export async function dispatchMpvProtocolMessage(
    } else if (msg.name === 'fullscreen') {
      deps.emitFullscreenChange({ fullscreen: asBoolean(msg.data, false) });
    } else if (msg.name === 'media-title') {
-      const title = typeof msg.data === 'string' ? sanitizeMediaTitle(msg.data) : null;
-      if (typeof msg.data === 'string' && msg.data.trim() && !title) return;
-      deps.emitMediaTitleChange({
-        title,
-      });
+      applyMediaTitle(deps, msg.data);
    } else if (msg.name === 'path') {
      const path = (msg.data as string) || '';
      deps.setCurrentVideoPath(path);
+      // A forced title set before loadfile arrives ahead of the path change that clears the
+      // cached title and never fires again, so read it back once the new path is known.
+      if (path) {
+        deps.sendCommand({
+          command: ['get_property', 'media-title'],
+          request_id: MPV_REQUEST_ID_MEDIA_TITLE,
+        });
+      }
      deps.emitMediaPathChange({ path });
      deps.autoLoadSecondarySubTrack(path);
      deps.syncCurrentAudioStreamIndex();
@@ -467,6 +472,8 @@ export async function dispatchMpvProtocolMessage(
      deps.emitSubtitleAssChange({ text: (msg.data as string) || '' });
    } else if (msg.request_id === MPV_REQUEST_ID_PATH) {
      deps.emitMediaPathChange({ path: (msg.data as string) || '' });
+    } else if (msg.request_id === MPV_REQUEST_ID_MEDIA_TITLE) {
+      applyMediaTitle(deps, msg.data);
    } else if (msg.request_id === MPV_REQUEST_ID_AID) {
      deps.setCurrentAudioTrackId(typeof msg.data === 'number' ? (msg.data as number) : null);
      deps.syncCurrentAudioStreamIndex();
@@ -557,6 +564,17 @@ export function asFiniteNumber(value: unknown, fallback: number): number {
  return Number.isFinite(nextValue) ? nextValue : fallback;
 }

+// URL-derived titles (mpv falls back to the basename of a query-bearing stream URL) must not
+// replace known metadata, so they are dropped instead of cached.
+function applyMediaTitle(
+  deps: Pick<MpvProtocolHandleMessageDeps, 'emitMediaTitleChange'>,
+  data: unknown,
+): void {
+  const title = typeof data === 'string' ? sanitizeMediaTitle(data) : null;
+  if (typeof data === 'string' && data.trim() && !title) return;
+  deps.emitMediaTitleChange({ title });
+}
+
 export function parseVisibilityProperty(value: unknown): boolean | null {
  if (typeof value === 'boolean') return value;
  if (typeof value !== 'string') return null;
@@ -9,6 +9,7 @@ import {
 } from './mpv';
 import {
  MPV_REQUEST_ID_TRACK_LIST_AUDIO,
+  MPV_REQUEST_ID_MEDIA_TITLE,
  MPV_REQUEST_ID_TRACK_LIST_SECONDARY,
 } from './mpv-protocol';

@@ -135,9 +136,15 @@ test('MpvIpcClient ignores URL-derived titles without replacing known metadata',
  assert.deepEqual(titles, ['My Anime S01E02']);
 });

-test('MpvIpcClient clears cached media title when media path changes', async () => {
+test('MpvIpcClient clears cached media title when media path changes and reads it back', async () => {
  const client = new MpvIpcClient('/tmp/mpv.sock', makeDeps());
+  const commands: Array<{ command?: unknown[]; request_id?: number }> = [];
+  (client as any).send = (command: { command?: unknown[]; request_id?: number }) => {
+    commands.push(command);
+    return true;
+  };

+  // A forced title (Jellyfin sets force-media-title before loadfile) arrives before the path.
  await invokeHandleMessage(client, {
    event: 'property-change',
    name: 'media-title',
@@ -148,11 +155,33 @@ test('MpvIpcClient clears cached media title when media path changes', async ()
  await invokeHandleMessage(client, {
    event: 'property-change',
    name: 'path',
-    data: '/tmp/new-episode.mkv',
+    data: 'http://pve-main:8096/Videos/item/stream?static=true&ApiKey=secret',
  });

-  assert.equal(client.currentVideoPath, '/tmp/new-episode.mkv');
+  assert.equal(
+    client.currentVideoPath,
+    'http://pve-main:8096/Videos/item/stream?static=true&ApiKey=secret',
+  );
  assert.equal(client.currentMediaTitle, null);
+  const titleRequest = commands.find(
+    (command) => command.command?.[0] === 'get_property' && command.command?.[1] === 'media-title',
+  );
+  assert.equal(titleRequest?.request_id, MPV_REQUEST_ID_MEDIA_TITLE);
+
+  await invokeHandleMessage(client, {
+    request_id: MPV_REQUEST_ID_MEDIA_TITLE,
+    error: 'success',
+    data: '[Jellyfin/direct] Episode 1',
+  });
+  assert.equal(client.currentMediaTitle, '[Jellyfin/direct] Episode 1');
+
+  // A URL-derived read-back must not poison the cache.
+  await invokeHandleMessage(client, {
+    request_id: MPV_REQUEST_ID_MEDIA_TITLE,
+    error: 'success',
+    data: 'stream?static=true&ApiKey=secret',
+  });
+  assert.equal(client.currentMediaTitle, '[Jellyfin/direct] Episode 1');
 });

 test('MpvIpcClient skips secondary subtitle autoload when media path is managed', async () => {
@@ -15,7 +15,6 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
    toggleVisibleOverlay: false,
    togglePrimarySubtitleBar: false,
    yomitan: false,
-    hachidori: false,
    settings: false,
    syncWindow: false,
    setup: false,
@@ -4362,26 +4362,6 @@ test('tokenizeSubtitle keeps Yomitan frequency for noun-particle-noun compounds'
  assert.equal(result.tokens?.[0]?.frequencyRank, 581);
 });

-test('tokenizeSubtitle skips frequency requests for ranks supplied by the scanner', async () => {
-  const deps = makeDepsFromYomitanTokens(
-    [{ surface: '猫', reading: 'ねこ', headword: '猫', frequencyRank: 42 }],
-    { getFrequencyDictionaryEnabled: () => true },
-  );
-  const parserWindow = deps.getYomitanParserWindow();
-  assert.ok(parserWindow);
-  deps.getYomitanParserWindow = () => parserWindow;
-  const scripts: string[] = [];
-  const execute = parserWindow.webContents.executeJavaScript.bind(parserWindow.webContents);
-  parserWindow.webContents.executeJavaScript = async (script) => {
-    scripts.push(script);
-    return execute(script);
-  };
-  const result = await tokenizeSubtitle('猫', deps);
-  assert.equal(result.tokens?.[0]?.frequencyRank, 42);
-  assert.ok(scripts.length > 0);
-  assert.equal(scripts.filter((script) => script.includes('getTermFrequencies')).length, 0);
-});
-
 test('tokenizeSubtitle keeps frequency for ordinal prefix-noun tokens', async () => {
  const result = await tokenizeSubtitle(
    '第二走者',
@@ -494,7 +494,6 @@ function buildYomitanFrequencyTermReadingList(
 ): Array<{ term: string; reading: string | null }> {
  const termReadingList: Array<{ term: string; reading: string | null }> = [];
  for (const token of tokens) {
-    if (normalizePositiveFrequencyRank(token.frequencyRank) !== null) continue;
    const readingRaw =
      token.reading && token.reading.trim().length > 0 ? token.reading.trim() : null;
    for (const term of resolveYomitanFrequencyLookupTexts(token, matchMode)) {
@@ -1,167 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFile } from 'node:fs/promises';
-import path from 'node:path';
-import test from 'node:test';
-import { pathToFileURL } from 'node:url';
-import vm from 'node:vm';
-import { buildHachidoriAnkiHints, HACHIDORI_ANKI_SETTINGS_SCRIPT } from './hachidori-anki-settings';
-
-const extensionPath = path.resolve(__dirname, '../../../../vendor/hachidori/extension');
-const config = {
-  tags: ['SubMiner', 'Japanese'],
-  fields: { word: 'Term', sentence: 'Context', wordAudio: 'Pronunciation', image: 'Image' },
-};
-const modelFields = ['Term', 'Reading', 'Definition', 'Context', 'Pronunciation', 'Image'];
-
-async function harness(
-  anki: unknown = {},
-  models: Record<string, string[]> = { Japanese: modelFields },
-) {
-  const templates: unknown = await import(
-    pathToFileURL(path.join(extensionPath, 'anki-templates.js')).href
-  );
-  const setup: unknown = await import(
-    pathToFileURL(path.join(extensionPath, 'anki-setup.js')).href
-  );
-  const context = vm.createContext({
-    __templates: templates,
-    __setup: setup,
-    __initialAnki: anki,
-    __models: models,
-    structuredClone,
-    URL,
-  });
-  vm.runInContext('globalThis.window = globalThis', context);
-  vm.runInContext(await readFile(path.join(extensionPath, 'reader-options.js'), 'utf8'), context);
-  vm.runInContext(
-    `
-    let options = { ...HDReaderOptions.normaliseOptions({ anki: __initialAnki }), revision: 1 };
-    let writes = 0, online = true, race = false, proxy = null;
-    const readOptions = async () => structuredClone(options);
-    globalThis.__subminerSetAnkiProxyUrl = async value => { const old = proxy; proxy = value; return old; };
-    const send = async (type, request, target) => {
-      if (type !== 'hd_options_write' || target !== 'hoshidicts-worker') throw Error('Unexpected request');
-      if (race) {
-        race = false;
-        options.anki.templates[0].deck = options.anki.deck = 'User edit';
-        options.revision++;
-      }
-      if (request.baseRevision !== options.revision) throw Error('conflict');
-      options = { ...HDReaderOptions.normaliseOptions({ ...options, ...request.options }), revision: options.revision + 1 };
-      writes++;
-    };
-    const __gateway = { createAnkiGateway: () => ({ discover: async ({ model }) => ({
-      connected: online, model, models: Object.keys(__models), decks: ['Mining'],
-      fields: __models[model] || [], errors: online ? [] : ['offline'],
-    }) }) };
-  `,
-    context,
-  );
-  await vm.runInContext(
-    HACHIDORI_ANKI_SETTINGS_SCRIPT.replace("await import('./anki-templates.js')", '__templates')
-      .replace("await import('./anki-setup.js')", '__setup')
-      .replace("await import('./anki.js')", '__gateway'),
-    context,
-  );
-  const run = async (script: string): Promise<unknown> =>
-    structuredClone(await vm.runInContext(script, context));
-  const sync = () =>
-    run(
-      `__subminerSyncAnkiSettings(${JSON.stringify({
-        server: 'http://127.0.0.1:8766',
-        deck: 'Mining',
-        forceOverride: true,
-        hints: buildHachidoriAnkiHints(config),
-      })})`,
-    );
-  return { run, sync };
-}
-
-test('fresh Hachidori settings inherit deck, tags, a unique model and configured fields', async () => {
-  const h = await harness();
-  assert.deepEqual(await h.sync(), { updated: true, matched: true, pending: false });
-  assert.deepEqual(
-    await h.run('[options.anki.url, options.anki.deck, options.anki.model, options.anki.tags]'),
-    ['http://127.0.0.1:8766', 'Mining', 'Japanese', config.tags],
-  );
-  assert.deepEqual(
-    await h.run(
-      'Object.fromEntries(Object.entries(options.anki.fieldTemplates).map(([key, row]) => [key, row.value]))',
-    ),
-    {
-      Term: '{expression}',
-      Reading: '{reading}',
-      Definition: '{definition}',
-      Context: '{sentence}',
-      Pronunciation: '{audio}',
-      Image: '{screenshot}',
-    },
-  );
-  await h.sync();
-  assert.equal(await h.run('writes'), 1);
-});
-
-test('preserves custom templates, tags, intentional blank fields and additional templates', async () => {
-  const h = await harness({
-    templates: [
-      {
-        id: 'default',
-        name: 'Custom',
-        deck: 'Own deck',
-        model: 'Japanese',
-        tags: ['own'],
-        fieldTemplates: {
-          Term: { value: '{reading}', overwriteMode: 'overwrite' },
-          Context: { value: '', overwriteMode: 'coalesce' },
-        },
-      },
-      { id: 'second', name: 'Second', deck: 'Other', model: 'Other', tags: [] },
-    ],
-  });
-  const before = await h.run('options.anki.templates');
-  await h.sync();
-  assert.deepEqual(await h.run('options.anki.templates'), before);
-});
-
-test('leaves an ambiguous model unset and retries discovery after Anki reconnects', async () => {
-  const h = await harness({}, { Japanese: modelFields, Second: modelFields });
-  await h.run('online = false');
-  assert.deepEqual(await h.sync(), { updated: true, matched: false, pending: true });
-  assert.equal(await h.run('options.anki.deck'), 'Mining');
-  await h.run('online = true');
-  await h.sync();
-  assert.equal(await h.run('options.anki.model'), '');
-  await h.run('delete __models.Second');
-  await h.sync();
-  assert.equal(await h.run('options.anki.model'), 'Japanese');
-});
-
-test('fills missing basic mappings only with fields belonging to the selected model', async () => {
-  const h = await harness(
-    { model: 'Japanese', fields: { expression: 'Reading' } },
-    { Japanese: ['Term', 'Reading', 'Context'] },
-  );
-  await h.sync();
-  assert.deepEqual(
-    await h.run(
-      '[options.anki.fields.expression, options.anki.fields.sentence, options.anki.fields.audio, options.anki.fieldTemplates]',
-    ),
-    ['Reading', 'Context', '', null],
-  );
-});
-
-test('re-reads concurrent settings edits before retrying its revisioned write', async () => {
-  const h = await harness();
-  await h.run('race = true');
-  await h.sync();
-  assert.equal(await h.run('options.anki.deck'), 'User edit');
-  assert.equal(await h.run('options.anki.model'), 'Japanese');
-});
-
-test('keeps sentence audio out of captured-audio settings and uses wordAudio first', () => {
-  const hints = buildHachidoriAnkiHints({
-    fields: { audio: 'SentenceAudio', wordAudio: 'WordAudio' },
-  });
-  assert.equal(hints.fields.audio, 'WordAudio');
-  assert.equal('captureAudio' in hints.fields, false);
-});
@@ -1,120 +0,0 @@
-import type { AnkiConnectConfig } from '../../../types';
-
-// Only settings with the same meaning in both apps cross this boundary.
-export function buildHachidoriAnkiHints(config: AnkiConnectConfig) {
-  return {
-    tags: config.tags,
-    fields: {
-      expression: config.fields?.word?.trim(),
-      audio: (config.fields?.wordAudio || config.fields?.audio)?.trim(),
-      sentence: config.fields?.sentence?.trim(),
-      screenshot: config.fields?.image?.trim(),
-    },
-    model: config.isLapis?.enabled ? config.isLapis.sentenceCardModel?.trim() : undefined,
-    family: config.isLapis?.enabled
-      ? 'lapis'
-      : config.isKiku?.enabled
-        ? 'kiku'
-        : config.isSenren?.enabled
-          ? 'senren'
-          : undefined,
-  };
-}
-
-// Installed inside the hidden Hachidori settings page. Uses local option writes
-// even when dictionaries are remote or their host is offline.
-export const HACHIDORI_ANKI_SETTINGS_SCRIPT = String.raw`
-    globalThis.__subminerSyncAnkiSettings = async ({ server, deck, forceOverride, hints }) => {
-      const previousProxy = await globalThis.__subminerSetAnkiProxyUrl(forceOverride ? server : null);
-      const { applyAnkiPreset, resolveAnkiTemplates } = await import('./anki-templates.js');
-      const { ankiSetupFamily } = await import('./anki-setup.js');
-      const { createAnkiGateway } = await import('./anki.js');
-      const gateway = createAnkiGateway({ timeoutMs: 2000 });
-      const discoveries = new Map();
-      const discover = async (anki, model) => {
-        const key = JSON.stringify([anki.url, anki.apiKey, model]);
-        if (!discoveries.has(key)) discoveries.set(key, gateway.discover({ ...anki, model }));
-        return discoveries.get(key);
-      };
-      for (let attempt = 0; attempt < 2; attempt += 1) {
-        const options = await readOptions();
-        let anki = options.anki;
-        const canReplaceServer = forceOverride || !anki.url || anki.url === server
-          || anki.url === 'http://127.0.0.1:8765' || anki.url === previousProxy;
-        if (!canReplaceServer) return { updated: false, matched: false, reason: 'blocked-existing-server' };
-        anki = { ...anki, url: server };
-        const first = anki.templates[0];
-        if (!first) return { updated: false, matched: false, reason: 'no-templates' };
-        let template = { ...first, fields: { ...first.fields } };
-        const pristine = !first.model && first.fieldTemplates === null
-          && Object.values(first.fields).every(value => !value);
-        if (deck && (!first.deck || (pristine && first.deck === 'Default'))) template.deck = deck;
-        if (hints?.tags && JSON.stringify(first.tags) === JSON.stringify(['hachidori'])) {
-          template.tags = [...hints.tags];
-        }
-        let pending = false;
-        // Advanced templates include intentionally blank fields. Preserve them
-        // as a unit rather than replacing them with inferred mappings.
-        if (hints && first.fieldTemplates === null) {
-          let discovery = await discover(anki, template.model || hints.model || '');
-          if (!discovery.connected) {
-            pending = true;
-          } else {
-            if (!template.model) {
-              const candidates = hints.model
-                ? discovery.models.filter(model => model === hints.model)
-                : discovery.models.filter(model => !hints.family || ankiSetupFamily(model) === hints.family);
-              const anchors = [hints.fields.expression, hints.fields.sentence].filter(Boolean);
-              const matches = [];
-              // Require a configured word and sentence field for an inferred
-              // model. Never choose the first of several compatible note types.
-              if (anchors.length === 2) for (const model of candidates) {
-                const result = await discover(anki, model);
-                if (!result.connected || result.errors.length) { pending = true; break; }
-                if (anchors.every(field => result.fields.includes(field))) matches.push(result);
-              }
-              if (!pending && matches.length === 1) {
-                discovery = matches[0];
-                template.model = discovery.model;
-              }
-            }
-            if (template.model && discovery.model === template.model && discovery.fields.length) {
-              const fields = discovery.fields;
-              for (const [semantic, field] of Object.entries(hints.fields)) {
-                if (!template.fields[semantic] && field && fields.includes(field)) template.fields[semantic] = field;
-              }
-              if (Object.values(first.fields).every(value => !value)) {
-                const preset = applyAnkiPreset(template, fields, ankiSetupFamily(template.model) || 'automatic');
-                const configured = resolveAnkiTemplates(template, fields).templates;
-                const markers = new Set(Object.entries(template.fields)
-                  .filter(([, value]) => value).map(([key]) => '{' + key + '}'));
-                for (const row of Object.values(preset.fieldTemplates)) {
-                  for (const marker of markers) row.value = row.value.replaceAll(marker, '');
-                }
-                for (const [field, row] of Object.entries(configured)) {
-                  if (row.value) preset.fieldTemplates[field] = row;
-                }
-                template = preset;
-              }
-            }
-          }
-        }
-        // Hachidori retains a compatibility projection of its first template.
-        // Updating both prevents its normalizer from restoring stale values.
-        const templateConfig = Object.fromEntries(globalThis.HDReaderOptions.ANKI_TEMPLATE_CONFIG_KEYS
-          .map(key => [key, template[key]]));
-        anki = { ...anki, ...templateConfig,
-          templates: [template, ...anki.templates.slice(1)] };
-        const changed = JSON.stringify(anki) !== JSON.stringify(options.anki);
-        try {
-          if (changed) await send('hd_options_write', {
-            baseRevision: options.revision, options: { anki },
-          }, 'hoshidicts-worker');
-          return { updated: changed, matched: !pending, pending };
-        } catch (error) {
-          if (attempt > 0) throw error;
-          // Re-read after a concurrent settings save before filling anything.
-        }
-      }
-    };
-`;
@@ -1,454 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFile } from 'node:fs/promises';
-import path from 'node:path';
-import test from 'node:test';
-import { pathToFileURL } from 'node:url';
-import * as vm from 'node:vm';
-import { HACHIDORI_PARSER_BRIDGE_SCRIPT } from './hachidori-parser-bridge';
-import {
-  requestYomitanScanTokens,
-  requestYomitanParseResults,
-  requestYomitanTermFrequencies,
-  syncYomitanDefaultAnkiServer,
-  addYomitanNoteViaSearch,
-} from './yomitan-parser-runtime';
-import { createDeps } from './yomitan-scan-test-harness';
-import { selectYomitanParseTokens } from './parser-selection-stage';
-
-const extensionPath = path.resolve(__dirname, '../../../../vendor/hachidori/extension');
-const characterDictionary = 'SubMiner Character Dictionary (AniList 1)';
-
-function lookupResult(matched: string, expression: string, reading: string, dictionary = 'JMdict') {
-  return {
-    matched,
-    deinflected: expression,
-    trace: [],
-    term: {
-      expression,
-      reading,
-      score: 0,
-      rules: 'v1',
-      glossaries: [{ dictionary, glossary: '["definition"]', termTags: '', definitionTags: '' }],
-      pitches: [],
-      frequencies: [{ dictionary: 'Frequency', frequencies: [{ value: 42, displayValue: '' }] }],
-    },
-  };
-}
-
-async function createHarness(emptyLibrary = false) {
-  const messages: Array<Record<string, unknown>> = [];
-  let dictionaryRevision = 2;
-  let optionRevision = 3;
-  let anki = {
-    url: 'http://127.0.0.1:8765',
-    templates: [
-      { id: 'default', name: 'Default', deck: 'Old', model: 'Japanese', fields: {} },
-      { id: 'second', name: 'Second', deck: 'Other', model: 'Japanese', fields: {} },
-    ],
-  };
-  let dictionaries = [
-    { id: 'terms', title: 'JMdict', enabled: true, revision: '1' },
-    { id: 'names', title: characterDictionary, enabled: true, revision: '1' },
-    {
-      id: 'frequency',
-      title: 'Frequency',
-      enabled: true,
-      revision: '1',
-      frequencyMode: 'rank-based',
-    },
-  ];
-  let duplicate = false;
-  let proxyUrl: unknown;
-  let loadingStatusReplies = 0;
-  let busyEngineReplies = 0;
-  const apiModule: unknown = await import(
-    pathToFileURL(path.join(extensionPath, 'api-host.js')).href
-  );
-  const context = vm.createContext({
-    __testApiModule: apiModule,
-    setTimeout,
-    crypto,
-    URL,
-    Blob,
-    Uint8Array,
-    atob,
-    chrome: {
-      storage: {
-        local: {
-          set: async (value: Record<string, unknown>) => {
-            proxyUrl = value.subminerAnkiProxyUrl;
-          },
-          get: async () => ({
-            options: { anki, scanLength: 40, revision: optionRevision },
-            subminerAnkiProxyUrl: proxyUrl,
-          }),
-        },
-      },
-      runtime: {
-        getManifest: () => ({ version: 'test' }),
-        sendMessage: async (message: Record<string, unknown>) => {
-          messages.push(structuredClone(message));
-          if (message.type === 'hd_status') {
-            const loading = loadingStatusReplies > 0;
-            if (loading) loadingStatusReplies -= 1;
-            return { ok: true, ready: !loading, loading };
-          }
-          if (busyEngineReplies > 0 && message.target !== 'hachidori-anki') {
-            busyEngineReplies -= 1;
-            return { ok: false, error: 'the dictionary engine is busy mutating' };
-          }
-          switch (message.type) {
-            case 'hd_state_read':
-              return {
-                ok: true,
-                state: emptyLibrary ? null : { revision: dictionaryRevision, dictionaries },
-              };
-            case 'hd_lookup': {
-              const text = String(message.text);
-              const candidates = [
-                lookupResult('食べた', '食べる', 'たべる'),
-                lookupResult('食べる', '食べる', 'たべる'),
-                lookupResult('ミナト', 'ミナト', 'みなと', characterDictionary),
-              ];
-              return {
-                ok: true,
-                generation: 1,
-                results: candidates.filter((result) => text.startsWith(result.matched)),
-              };
-            }
-            case 'hd_options_write': {
-              if (message.baseRevision !== optionRevision) return { ok: false, error: 'conflict' };
-              const update = message.options;
-              assert.ok(update && typeof update === 'object' && 'anki' in update);
-              const value = update.anki;
-              assert.ok(
-                value &&
-                  typeof value === 'object' &&
-                  'url' in value &&
-                  typeof value.url === 'string',
-              );
-              assert.ok('templates' in value && Array.isArray(value.templates));
-              anki = { url: value.url, templates: value.templates };
-              optionRevision += 1;
-              return { ok: true };
-            }
-            case 'hd_apply_state': {
-              assert.equal(message.baseRevision, dictionaryRevision);
-              assert.ok(Array.isArray(message.dictionaries));
-              dictionaries = message.dictionaries;
-              dictionaryRevision += 1;
-              return { ok: true };
-            }
-            case 'hd_anki_status':
-              return { ok: true, configKey: 'configuration' };
-            case 'hd_anki_preflight':
-              return {
-                ok: true,
-                canAdd: !duplicate,
-                state: duplicate ? 'duplicate' : 'addable',
-                noteIds: duplicate ? [15] : [],
-              };
-            case 'hd_anki_submit':
-              return { ok: true, state: 'added', noteId: 19 };
-            case 'hd_import':
-              return { ok: true, report: { success: true } };
-            case 'hd_remove':
-              return { ok: true };
-            default:
-              throw new Error('Unexpected native request: ' + String(message.type));
-          }
-        },
-      },
-    },
-  });
-  vm.runInContext('globalThis.window = globalThis', context);
-  vm.runInContext(await readFile(path.join(extensionPath, 'reader-options.js'), 'utf8'), context);
-  const script = HACHIDORI_PARSER_BRIDGE_SCRIPT.replace(
-    "await import('./api-host.js')",
-    '__testApiModule',
-  ).replace("await import('./reader-options.js')", 'Promise.resolve()');
-  await vm.runInContext(script, context);
-  const run = async (code: string): Promise<unknown> =>
-    structuredClone(await vm.runInContext(code, context));
-  const invoke = (action: string, params?: unknown) =>
-    run(`new Promise((resolve, reject) => {
-    __subminerDictionarySendMessage(${JSON.stringify({ action, params })}, response => {
-      if (response.error) reject(new Error(response.error.message)); else resolve(response.result);
-    });
-  })`);
-  return {
-    deps: createDeps(run),
-    run,
-    invoke,
-    messages,
-    anki: () => anki,
-    proxyUrl: () => proxyUrl,
-    setAnkiServer: (url: string) => {
-      anki = { ...anki, url };
-    },
-    setAnkiTemplates: (templates: typeof anki.templates) => {
-      anki = { ...anki, templates };
-    },
-    dictionaries: () => dictionaries,
-    disableDictionary: (id: string) => {
-      dictionaries = dictionaries.map((entry) =>
-        entry.id === id ? { ...entry, enabled: false } : entry,
-      );
-      dictionaryRevision += 1;
-    },
-    setDuplicate: () => {
-      duplicate = true;
-    },
-    changeRevision: () => {
-      optionRevision += 1;
-    },
-    setLoadingStatusReplies: (count: number) => {
-      loadingStatusReplies = count;
-    },
-    setBusyEngineReplies: (count: number) => {
-      busyEngineReplies = count;
-    },
-  };
-}
-
-test('Hachidori runs the shared scanner with inflected offsets, headwords, names and frequencies', async () => {
-  const harness = await createHarness();
-  const tokens = await requestYomitanScanTokens(
-    'ミナト 食べた',
-    harness.deps,
-    { error: assert.fail },
-    {
-      includeNameMatchMetadata: true,
-      currentCharacterDictionaryMediaId: 1,
-    },
-  );
-  assert.ok(tokens);
-  assert.equal(tokens[0]?.surface, 'ミナト');
-  assert.equal(tokens[0]?.isNameMatch, true);
-  assert.equal(tokens[1]?.surface, '食べた');
-  assert.equal(tokens[1]?.headword, '食べる');
-  assert.equal(tokens[1]?.startPos, 4);
-  assert.equal(tokens[1]?.endPos, 7);
-  assert.equal(tokens[1]?.frequencyRank, 42);
-  assert.deepEqual(tokens[1]?.wordClasses, ['v1']);
-  const frequencies = await requestYomitanTermFrequencies(
-    [{ term: '食べる', reading: 'たべる' }],
-    harness.deps,
-    { error: assert.fail },
-  );
-  assert.equal(frequencies[0]?.frequency, 42);
-  assert.equal(frequencies[0]?.dictionary, 'Frequency');
-});
-
-test('Hachidori frequency lookups match API headwords, readings and requested dictionaries', async () => {
-  const harness = await createHarness();
-  const query = (term: string, reading: string | null, dictionaries = ['Frequency']) =>
-    harness.invoke('getTermFrequencies', { termReadingList: [{ term, reading }], dictionaries });
-  assert.deepEqual(await query('食べる', 'たべる'), [
-    {
-      term: '食べる',
-      reading: 'たべる',
-      hasReading: false,
-      dictionary: 'Frequency',
-      frequency: 42,
-      displayValue: null,
-      displayValueParsed: false,
-    },
-  ]);
-  assert.deepEqual(await query('食べる', 'べつのよみ'), []);
-  assert.deepEqual(await query('食べる', null, ['Other frequency']), []);
-  assert.deepEqual(await query('食べるだけ', null), []);
-  assert.deepEqual(await query('頻度だけ', null), []);
-  assert.deepEqual(await query('食べる', null), await query('食べる', 'たべる'));
-});
-
-test('Hachidori syncs the Anki endpoint and every term template through revisioned writes', async () => {
-  const harness = await createHarness();
-  const synced = await syncYomitanDefaultAnkiServer(
-    'http://127.0.0.1:8766',
-    harness.deps,
-    { error: assert.fail },
-    { deck: 'Mining' },
-  );
-  assert.equal(synced, true);
-  assert.equal(harness.anki().url, 'http://127.0.0.1:8766');
-  assert.deepEqual(
-    harness.anki().templates.map((template) => template.deck),
-    ['Mining', 'Mining'],
-  );
-  assert.equal(harness.proxyUrl(), null);
-  assert.equal(
-    await syncYomitanDefaultAnkiServer(
-      'http://127.0.0.1:8766',
-      harness.deps,
-      { error: assert.fail },
-      { forceOverride: true },
-    ),
-    true,
-  );
-  assert.equal(harness.proxyUrl(), 'http://127.0.0.1:8766');
-  await assert.rejects(
-    harness.invoke('setAllSettings', {
-      value: {
-        hachidoriRevisions: { dictionaries: 99, options: 99 },
-        profiles: [{ options: { dictionaries: [], anki: { server: '', cardFormats: [] } } }],
-      },
-    }),
-    /settings changed/,
-  );
-});
-
-test('Hachidori applies only SubMiner changes when its settings moved on meanwhile', async () => {
-  const harness = await createHarness();
-  const projected = (await harness.invoke('optionsGetFull')) as {
-    profiles: Array<{ options: { dictionaries: Array<{ name: string; enabled: boolean }> } }>;
-  };
-  const jmdict = projected.profiles[0]!.options.dictionaries.find(
-    (entry) => entry.name === 'JMdict',
-  );
-  jmdict!.enabled = false;
-  // Hachidori changed both revisions after SubMiner read them.
-  harness.disableDictionary('names');
-  harness.setAnkiServer('http://192.168.1.10:8765');
-  harness.changeRevision();
-  assert.equal(await harness.invoke('setAllSettings', { value: projected }), true);
-  assert.deepEqual(
-    harness.dictionaries().map((entry) => [entry.id, entry.enabled]),
-    [
-      ['terms', false],
-      ['names', false],
-      ['frequency', true],
-    ],
-  );
-  assert.equal(harness.anki().url, 'http://192.168.1.10:8765');
-  assert.equal(harness.messages.filter((message) => message.type === 'hd_options_write').length, 0);
-});
-
-test('Hachidori settings writes survive an empty template list', async () => {
-  const harness = await createHarness();
-  harness.setAnkiTemplates([]);
-  assert.equal(
-    await syncYomitanDefaultAnkiServer(
-      'http://127.0.0.1:8766',
-      harness.deps,
-      { error: assert.fail },
-      {
-        forceOverride: true,
-      },
-    ),
-    true,
-  );
-  assert.equal(harness.anki().url, 'http://127.0.0.1:8766');
-});
-
-test('Hachidori initializes an empty library before the first dictionary import', async () => {
-  const harness = await createHarness(true);
-  assert.deepEqual(await harness.invoke('getDictionaryInfo'), []);
-  assert.equal(
-    await syncYomitanDefaultAnkiServer(
-      'http://127.0.0.1:8766',
-      harness.deps,
-      { error: assert.fail },
-      { forceOverride: true },
-    ),
-    true,
-  );
-});
-
-test('Hachidori restores direct AnkiConnect when disabling its managed proxy', async () => {
-  const harness = await createHarness();
-  const logger = { error: assert.fail };
-  assert.equal(
-    await syncYomitanDefaultAnkiServer('http://127.0.0.1:8766', harness.deps, logger, {
-      forceOverride: true,
-    }),
-    true,
-  );
-  assert.equal(harness.anki().url, 'http://127.0.0.1:8766');
-  assert.equal(
-    await syncYomitanDefaultAnkiServer('http://127.0.0.1:8765', harness.deps, logger),
-    true,
-  );
-  assert.equal(harness.anki().url, 'http://127.0.0.1:8765');
-  assert.equal(harness.proxyUrl(), null);
-});
-
-test('Hachidori preserves a custom Anki endpoint when disabling its managed proxy', async () => {
-  const harness = await createHarness();
-  const logger = { error: assert.fail };
-  assert.equal(
-    await syncYomitanDefaultAnkiServer('http://127.0.0.1:8766', harness.deps, logger, {
-      forceOverride: true,
-    }),
-    true,
-  );
-  harness.setAnkiServer('http://192.168.1.10:8765');
-  assert.equal(
-    await syncYomitanDefaultAnkiServer('http://127.0.0.1:8765', harness.deps, logger),
-    false,
-  );
-  assert.equal(harness.anki().url, 'http://192.168.1.10:8765');
-  assert.equal(harness.proxyUrl(), null);
-});
-
-test('Hachidori fallback parsing retains token boundaries, inflected readings and headwords', async () => {
-  const harness = await createHarness();
-  const parsed = await requestYomitanParseResults('ミナト 食べた', harness.deps, {
-    error: assert.fail,
-  });
-  const tokens = selectYomitanParseTokens(parsed, () => false, 'headword');
-  assert.deepEqual(
-    tokens?.map((token) => ({
-      surface: token.surface,
-      headword: token.headword,
-      reading: token.reading,
-      start: token.startPos,
-    })),
-    [
-      { surface: 'ミナト', headword: 'ミナト', reading: 'みなと', start: 0 },
-      { surface: '食べた', headword: '食べる', reading: 'たべた', start: 4 },
-    ],
-  );
-});
-
-test('Hachidori stats mining returns note IDs and prevents duplicate submissions', async () => {
-  const harness = await createHarness();
-  assert.deepEqual(await addYomitanNoteViaSearch('食べる', harness.deps, { error: assert.fail }), {
-    noteId: 19,
-    duplicateNoteIds: [],
-  });
-  harness.setDuplicate();
-  assert.deepEqual(await addYomitanNoteViaSearch('食べる', harness.deps, { error: assert.fail }), {
-    noteId: null,
-    duplicateNoteIds: [15],
-  });
-  assert.equal(harness.messages.filter((message) => message.type === 'hd_anki_submit').length, 1);
-});
-
-test('Hachidori settings automation imports ZIP bytes and removes the matching dictionary ID', async () => {
-  const harness = await createHarness();
-  await harness.run(
-    "__subminerYomitanSettingsAutomation.importDictionaryArchiveBase64('UEs=', 'characters.zip')",
-  );
-  await harness.run(
-    `__subminerYomitanSettingsAutomation.deleteDictionary(${JSON.stringify(characterDictionary)})`,
-  );
-  const imported = harness.messages.find((message) => message.type === 'hd_import');
-  assert.equal(imported?.fileName, 'characters.zip');
-  assert.match(String(imported?.blobUrl), /^blob:/);
-  const removed = harness.messages.find((message) => message.type === 'hd_remove');
-  assert.equal(removed?.id, 'names');
-});
-
-test('Hachidori waits for a loading engine and retries busy requests before answering', async () => {
-  const harness = await createHarness();
-  harness.setLoadingStatusReplies(2);
-  harness.setBusyEngineReplies(1);
-  const dictionaries = (await harness.invoke('getDictionaryInfo')) as Array<{ title: string }>;
-  assert.equal(dictionaries.length, 3);
-  const statusCalls = harness.messages.filter((message) => message.type === 'hd_status').length;
-  assert.ok(statusCalls >= 3, `expected repeated status polls, saw ${statusCalls}`);
-  const tokens = await requestYomitanScanTokens('食べた', harness.deps, { error: assert.fail });
-  assert.equal(tokens?.[0]?.headword, '食べる');
-  assert.equal(tokens?.[0]?.frequencyRank, 42);
-});
@@ -1,259 +0,0 @@
-// Hachidori exposes its own storage and engine protocol. Adapt it only inside
-// SubMiner's hidden extension windows so the shared scanner keeps its matching,
-// character-name and frequency semantics without changing Hachidori's pages.
-import { HACHIDORI_ANKI_SETTINGS_SCRIPT } from './hachidori-anki-settings';
-
-export const HACHIDORI_SESSION_PARTITION = 'persist:hachidori';
-
-export const HACHIDORI_PARSER_BRIDGE_SCRIPT = String.raw`
-  (async () => {
-    if (globalThis.__subminerDictionarySendMessage) return;
-    const { createApiHost } = await import('./api-host.js');
-    await import('./reader-options.js');
-    const send = async (type, fields = {}, target = 'hoshidicts-offscreen') => {
-      const reply = await chrome.runtime.sendMessage({
-        target, type, requestId: crypto.randomUUID(), ...fields,
-      });
-      if (!reply || reply.ok !== true) {
-        throw new Error(reply?.error || 'Hachidori returned an invalid response');
-      }
-      return reply;
-    };
-    // Hachidori reports an empty library while its dictionaries load and rejects
-    // engine requests during imports. Wait for a settled engine so SubMiner never
-    // caches an empty dictionary list or a token-less scan.
-    const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
-    const waitForEngineReady = async () => {
-      const deadline = Date.now() + 120000;
-      for (;;) {
-        const reply = await send('hd_status').catch(() => null);
-        if (reply?.ready === true && reply.loading !== true) return;
-        if (Date.now() >= deadline) {
-          throw new Error(reply?.ready === true
-            ? 'Hachidori is still importing dictionaries' : 'Hachidori dictionary engine is not ready');
-        }
-        await sleep(250);
-      }
-    };
-    const engine = async (type, fields = {}, target) => {
-      for (let attempt = 0; ; attempt += 1) {
-        await waitForEngineReady();
-        try {
-          return await send(type, fields, target);
-        } catch (error) {
-          if (attempt >= 3 || !/busy mutating/.test(error.message)) throw error;
-          await sleep(250);
-        }
-      }
-    };
-    const readState = async () => (await engine('hd_state_read', {}, 'hoshidicts-worker')).state
-      ?? { revision: 0, dictionaries: [] };
-    const readOptions = async () => {
-      const stored = (await chrome.storage.local.get('options')).options;
-      return { ...globalThis.HDReaderOptions.normaliseOptions(stored), revision: stored?.revision ?? 0 };
-    };
-    globalThis.__subminerSetAnkiProxyUrl = async url => {
-      const previous = (await chrome.storage.local.get('subminerAnkiProxyUrl')).subminerAnkiProxyUrl;
-      await chrome.storage.local.set({ subminerAnkiProxyUrl: url });
-      return typeof previous === 'string' ? previous : null;
-    };
-    ${HACHIDORI_ANKI_SETTINGS_SCRIPT}
-    const api = createApiHost({
-      engine: fields => engine(fields.type, fields),
-      render: fields => send(fields.type, fields, 'hachidori-anki-render'),
-      readDictionaries: async () => (await readState()).dictionaries,
-      readAudioSources: async () => (await readOptions()).audioSources.filter(source => source.enabled),
-      version: chrome.runtime.getManifest().version,
-    });
-    // Snapshot of the last projection SubMiner received, so a later write can
-    // be reduced to the fields SubMiner actually changed.
-    let lastProjection = null;
-    async function optionsGetFull() {
-      const [state, options] = await Promise.all([readState(), readOptions()]);
-      const revisions = { dictionaries: state.revision, options: options.revision };
-      lastProjection = {
-        revisions,
-        enabledByTitle: Object.fromEntries(state.dictionaries.map(entry => [entry.title, entry.enabled !== false])),
-        server: options.anki.url,
-        deckByFormat: Object.fromEntries(options.anki.templates.map(template => [template.id, template.deck])),
-      };
-      return {
-        profileCurrent: 0,
-        hachidoriRevisions: revisions,
-        profiles: [{ name: 'Hachidori', options: {
-          scanning: { length: options.scanLength },
-          dictionaries: state.dictionaries.map((entry, index) => ({
-            name: entry.title, alias: entry.displayName || entry.title,
-            id: index, enabled: entry.enabled !== false,
-          })),
-          anki: {
-            server: options.anki.url,
-            cardFormats: options.anki.templates.map(template => ({
-              id: template.id, type: 'term', enabled: true, deck: template.deck,
-            })),
-          },
-        } }],
-      };
-    }
-    async function setAllSettings(value) {
-      const projected = value.profiles?.[0]?.options;
-      const revisions = value.hachidoriRevisions;
-      if (!projected || !revisions) throw new Error('Invalid Hachidori settings projection');
-      const base = lastProjection
-        && lastProjection.revisions.dictionaries === revisions.dictionaries
-        && lastProjection.revisions.options === revisions.options ? lastProjection : null;
-      const enabledByTitle = Object.fromEntries(projected.dictionaries.map(item => [item.name, item.enabled === true]));
-      const deckByFormat = Object.fromEntries(projected.anki.cardFormats.map(format => [format.id, format.deck]));
-      for (let attempt = 0; ; attempt += 1) {
-        const [state, options] = await Promise.all([readState(), readOptions()]);
-        const current = state.revision === revisions.dictionaries && options.revision === revisions.options;
-        if (!current && !base) {
-          throw new Error('Hachidori settings changed while SubMiner was updating them; retry the action');
-        }
-        // Once Hachidori has moved on, apply only SubMiner's own changes on top
-        // of the newer settings instead of replaying the stale projection.
-        const enabledFor = title => enabledByTitle[title] === true;
-        const dictionaries = state.dictionaries.map(entry =>
-          current || (base.enabledByTitle[entry.title] === true) !== enabledFor(entry.title)
-            ? { ...entry, enabled: enabledFor(entry.title) } : entry);
-        const templates = options.anki.templates.map(template => {
-          const deck = deckByFormat[template.id];
-          return deck !== undefined && (current || base.deckByFormat[template.id] !== deck)
-            ? { ...template, deck } : template;
-        });
-        const url = current || base.server !== projected.anki.server ? projected.anki.server : options.anki.url;
-        const anki = { ...options.anki, url, templates, deck: templates[0]?.deck ?? options.anki.deck };
-        try {
-          if (JSON.stringify(dictionaries) !== JSON.stringify(state.dictionaries)) {
-            await engine('hd_apply_state', { baseRevision: state.revision, dictionaries });
-          }
-          if (JSON.stringify(anki) !== JSON.stringify(options.anki)) {
-            await engine('hd_options_write', { baseRevision: options.revision, options: { anki } }, 'hoshidicts-worker');
-          }
-          return true;
-        } catch (error) {
-          // A write raced another Hachidori change; re-read once and reapply the delta.
-          if (attempt > 0 || !base) throw error;
-        }
-      }
-    }
-    async function getTermFrequencies({ termReadingList, dictionaries }) {
-      const terms = [...new Set(termReadingList.map(pair => pair.term))];
-      const { results } = await api({ type: 'hd_api_term_entries', terms });
-      const frequencies = [];
-      for (const result of results) {
-        const term = terms[result.index];
-        const pairs = termReadingList.filter(pair => pair.term === term);
-        for (const entry of result.dictionaryEntries) {
-          for (const value of entry.frequencies) {
-            const headword = entry.headwords[value.headwordIndex];
-            if (!headword || headword.term !== term || !dictionaries.includes(value.dictionary)) continue;
-            if (!pairs.some(pair => pair.reading === null || pair.reading === headword.reading)) continue;
-            // Upstream does not expose the frequency entry's original reading.
-            // Keep its API flag and associate the value with the matched headword.
-            frequencies.push({ term, reading: headword.reading || null,
-              hasReading: value.hasReading, dictionary: value.dictionary,
-              frequency: value.frequency, displayValue: value.displayValue,
-              displayValueParsed: value.displayValueParsed });
-          }
-        }
-      }
-      return frequencies;
-    }
-    // Hachidori's public tokenize API emits display furigana without headwords.
-    // SubMiner's fallback requires one group per token and a dictionary form.
-    async function parseText({ text, scanLength }) {
-      const content = [];
-      let position = 0;
-      while (position < text.length) {
-        const rest = text.slice(position);
-        const reply = await engine('hd_lookup', { text: rest, maxResults: 1, scanLength });
-        const result = reply.results[0];
-        if (!result?.matched || !rest.startsWith(result.matched)) {
-          const character = String.fromCodePoint(rest.codePointAt(0));
-          content.push([{ text: character, reading: '' }]);
-          position += character.length;
-          continue;
-        }
-        const term = result.term;
-        // Keep the inflected ending in the reading, just as the main scanner does.
-        let stem = 0;
-        while (stem < term.expression.length && stem < result.matched.length && term.expression[stem] === result.matched[stem]) stem += 1;
-        const ending = term.expression.slice(stem);
-        const reading = stem > 0 && term.reading.endsWith(ending)
-          ? term.reading.slice(0, term.reading.length - ending.length) + result.matched.slice(stem)
-          : term.reading;
-        content.push([{ text: result.matched, reading, headwords: [[{ term: term.expression }]] }]);
-        position += result.matched.length;
-      }
-      return [{ source: 'scanning-parser', index: 0, content }];
-    }
-    async function invoke(action, params) {
-      switch (action) {
-        case 'optionsGetFull': return optionsGetFull();
-        case 'setAllSettings': return setAllSettings(params.value);
-        case 'getDictionaryInfo': return (await readState()).dictionaries.map(entry => ({
-          title: entry.title, revision: entry.revision, frequencyMode: entry.frequencyMode,
-        }));
-        case 'termsFind': {
-          const reply = await api({ type: 'hd_api_term_entries', terms: [params.text] });
-          return reply.results[0];
-        }
-        case 'parseText': return parseText(params);
-        case 'getTermFrequencies': return getTermFrequencies(params);
-        default: throw new Error('Unsupported Hachidori parser action: ' + action);
-      }
-    }
-    globalThis.__subminerDictionarySendMessage = ({ action, params }, callback) => {
-      void invoke(action, params).then(result => callback({ result }), error => callback({ error: { message: error.message } }));
-    };
-    async function importArchive(blob, fileName) {
-      const blobUrl = URL.createObjectURL(blob);
-      try {
-        const reply = await engine('hd_import', { blobUrl, fileName });
-        if (reply.report?.success !== true) throw new Error(reply.report?.error || 'Hachidori dictionary import failed');
-      } finally {
-        URL.revokeObjectURL(blobUrl);
-      }
-    }
-    globalThis.__subminerYomitanSettingsAutomation = {
-      ready: true,
-      async importDictionaryArchiveUrl(url) {
-        const response = await fetch(url);
-        if (!response.ok) throw new Error('Could not read the dictionary archive');
-        await importArchive(await response.blob(), 'subminer-dictionary.zip');
-      },
-      async importDictionaryArchiveBase64(base64, fileName) {
-        const bytes = Uint8Array.from(atob(base64), character => character.charCodeAt(0));
-        await importArchive(new Blob([bytes], { type: 'application/zip' }), fileName);
-      },
-      async deleteDictionary(title) {
-        const dictionary = (await readState()).dictionaries.find(entry => entry.title === title);
-        if (dictionary) await engine('hd_remove', { id: dictionary.id, title });
-      },
-    };
-    globalThis.__subminerAddNote = async word => {
-      const lookup = await engine('hd_lookup', { text: word, maxResults: 1 });
-      const result = lookup.results[0];
-      if (!result) return { noteId: null, duplicateNoteIds: [] };
-      const status = await send('hd_anki_status', {}, 'hachidori-anki');
-      const request = {
-        ...result, generation: lookup.generation, sentence: word, searchQuery: word,
-        matchOffset: 0, documentTitle: 'SubMiner', popupSelectionText: '',
-        configKey: status.configKey,
-        captureUnavailable: ['screenshot', 'animation', 'audio'],
-      };
-      const preflight = await send('hd_anki_preflight', { request }, 'hachidori-anki');
-      if (preflight.canAdd !== true) {
-        if (preflight.state !== 'duplicate') throw new Error(preflight.error || 'Hachidori Anki mining is unavailable');
-        return { noteId: null, duplicateNoteIds: preflight.noteIds ?? [] };
-      }
-      const submitted = await send('hd_anki_submit', { request }, 'hachidori-anki');
-      if (submitted.state === 'added' || submitted.state === 'updated') {
-        return { noteId: submitted.noteId, duplicateNoteIds: [] };
-      }
-      if (submitted.state === 'duplicate') return { noteId: null, duplicateNoteIds: submitted.noteIds ?? [] };
-      throw new Error(submitted.error || 'Hachidori could not confirm the note write');
-    };
-  })();
-`;
@@ -1,18 +1,7 @@
 import type { BrowserWindow, Extension, Session } from 'electron';
-import type { AnkiConnectConfig } from '../../../types';
-import { buildHachidoriAnkiHints } from './hachidori-anki-settings';
-import {
-  buildHachidoriSharingScript,
-  parseHachidoriHostStatus,
-  type HachidoriSharingRequest,
-} from '../../../shared/hachidori-sharing';
 import * as fs from 'fs';
 import * as http from 'http';
 import * as path from 'path';
-import {
-  HACHIDORI_PARSER_BRIDGE_SCRIPT,
-  HACHIDORI_SESSION_PARTITION,
-} from './hachidori-parser-bridge';
 import { selectYomitanParseTokens } from './parser-selection-stage';
 import {
  buildYomitanScanCallScript,
@@ -488,7 +477,7 @@ async function requestYomitanProfileMetadata(
    (async () => {
      const invoke = (action, params) =>
        new Promise((resolve, reject) => {
-          (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+          chrome.runtime.sendMessage({ action, params }, (response) => {
            if (chrome.runtime.lastError) {
              reject(new Error(chrome.runtime.lastError.message));
              return;
@@ -607,18 +596,6 @@ function logYomitanProfileDiagnostics(
  logger.info?.('Yomitan active profile dictionaries loaded.', details);
 }

-function isHachidoriExtension(extension: Extension): boolean {
-  return extension.name === 'Hachidori';
-}
-
-// Without an explicit session, use the one the extension was loaded into:
-// Hachidori lives in its own partition, Yomitan in the default session.
-function resolveBackendSession(electron: typeof import('electron'), extension: Extension): Session {
-  return isHachidoriExtension(extension)
-    ? electron.session.fromPartition(HACHIDORI_SESSION_PARTITION)
-    : electron.session.defaultSession;
-}
-
 async function ensureYomitanParserWindow(
  deps: YomitanParserRuntimeDeps,
  logger: LoggerLike,
@@ -629,20 +606,19 @@ async function ensureYomitanParserWindow(
    return false;
  }

-  const existingInitPromise = deps.getYomitanParserInitPromise();
-  if (existingInitPromise) {
-    return existingInitPromise;
-  }
-
  const currentWindow = deps.getYomitanParserWindow();
  if (currentWindow && !currentWindow.isDestroyed()) {
    return true;
  }

+  const existingInitPromise = deps.getYomitanParserInitPromise();
+  if (existingInitPromise) {
+    return existingInitPromise;
+  }
+
  const initPromise = (async () => {
-    const { BrowserWindow } = electron;
-    const yomitanSession =
-      deps.getYomitanSession?.() ?? resolveBackendSession(electron, yomitanExt);
+    const { BrowserWindow, session } = electron;
+    const yomitanSession = deps.getYomitanSession?.() ?? session.defaultSession;
    const parserWindow = new BrowserWindow({
      show: false,
      width: 800,
@@ -673,15 +649,11 @@ async function ensureYomitanParserWindow(
    });

    try {
-      const parserPage = isHachidoriExtension(yomitanExt) ? 'settings.html' : 'search.html';
-      await parserWindow.loadURL(`chrome-extension://${yomitanExt.id}/${parserPage}`);
+      await parserWindow.loadURL(`chrome-extension://${yomitanExt.id}/search.html`);
      const readyPromise = deps.getYomitanParserReadyPromise();
      if (readyPromise) {
        await readyPromise;
      }
-      if (isHachidoriExtension(yomitanExt)) {
-        await parserWindow.webContents.executeJavaScript(HACHIDORI_PARSER_BRIDGE_SCRIPT, true);
-      }
      // Eagerly install the scan runtime so the first subtitle line does not
      // pay the install round trip; failures fall back to the per-request
      // install-and-retry path.
@@ -724,8 +696,8 @@ async function createYomitanExtensionWindow(
    return null;
  }

-  const { BrowserWindow } = electron;
-  const yomitanSession = deps.getYomitanSession?.() ?? resolveBackendSession(electron, yomitanExt);
+  const { BrowserWindow, session } = electron;
+  const yomitanSession = deps.getYomitanSession?.() ?? session.defaultSession;
  const window = new BrowserWindow({
    show: false,
    width: 1200,
@@ -768,10 +740,6 @@ async function invokeYomitanSettingsAutomation<T>(
  }

  try {
-    const extension = deps.getYomitanExt();
-    if (extension && isHachidoriExtension(extension)) {
-      await settingsWindow.webContents.executeJavaScript(HACHIDORI_PARSER_BRIDGE_SCRIPT, true);
-    }
    await settingsWindow.webContents.executeJavaScript(
      `
        (async () => {
@@ -924,7 +892,7 @@ export async function requestYomitanParseResults(
    (async () => {
      const invoke = (action, params) =>
        new Promise((resolve, reject) => {
-          (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+          chrome.runtime.sendMessage({ action, params }, (response) => {
            if (chrome.runtime.lastError) {
              reject(new Error(chrome.runtime.lastError.message));
              return;
@@ -954,7 +922,7 @@ export async function requestYomitanParseResults(
    (async () => {
      const invoke = (action, params) =>
        new Promise((resolve, reject) => {
-          (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+          chrome.runtime.sendMessage({ action, params }, (response) => {
            if (chrome.runtime.lastError) {
              reject(new Error(chrome.runtime.lastError.message));
              return;
@@ -1111,7 +1079,7 @@ async function fetchYomitanTermFrequencies(
      (async () => {
        const invoke = (action, params) =>
          new Promise((resolve, reject) => {
-            (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+            chrome.runtime.sendMessage({ action, params }, (response) => {
              if (chrome.runtime.lastError) {
                reject(new Error(chrome.runtime.lastError.message));
                return;
@@ -1154,7 +1122,7 @@ async function fetchYomitanTermFrequencies(
    (async () => {
      const invoke = (action, params) =>
        new Promise((resolve, reject) => {
-          (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+          chrome.runtime.sendMessage({ action, params }, (response) => {
            if (chrome.runtime.lastError) {
              reject(new Error(chrome.runtime.lastError.message));
              return;
@@ -1238,17 +1206,7 @@ function cacheFrequencyEntriesForPairs(
    const key = makeTermReadingCacheKey(pair.term, pair.reading);
    const exactEntries = groupedByPair.get(key);
    const termEntries = groupedByTerm.get(pair.term) ?? [];
-    // Untagged frequency rows apply to every reading. A term-only query must
-    // retain all readings, rather than selecting only its untagged rows.
-    const untaggedEntries = groupedByPair.get(makeTermReadingCacheKey(pair.term, null)) ?? [];
-    frequencyCache.set(
-      key,
-      pair.reading === null
-        ? termEntries
-        : exactEntries
-          ? [...exactEntries, ...untaggedEntries]
-          : termEntries,
-    );
+    frequencyCache.set(key, exactEntries ?? termEntries);
  }
 }

@@ -1382,7 +1340,6 @@ export async function syncYomitanDefaultAnkiServer(
  options?: {
    forceOverride?: boolean;
    deck?: string;
-    ankiConfig?: AnkiConnectConfig;
  },
 ): Promise<boolean> {
  const normalizedTargetServer = serverUrl.trim();
@@ -1402,7 +1359,7 @@ export async function syncYomitanDefaultAnkiServer(
    (async () => {
      const invoke = (action, params) =>
        new Promise((resolve, reject) => {
-          (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+          chrome.runtime.sendMessage({ action, params }, (response) => {
            if (chrome.runtime.lastError) {
              reject(new Error(chrome.runtime.lastError.message));
              return;
@@ -1422,16 +1379,6 @@ export async function syncYomitanDefaultAnkiServer(
      const targetServer = ${JSON.stringify(normalizedTargetServer)};
      const targetDeck = ${JSON.stringify(normalizedTargetDeck)};
      const forceOverride = ${forceOverride ? 'true' : 'false'};
-      const hachidoriHints = ${JSON.stringify(options?.ankiConfig ? buildHachidoriAnkiHints(options.ankiConfig) : null)};
-      if (hachidoriHints && typeof globalThis.__subminerSyncAnkiSettings === 'function') {
-        return globalThis.__subminerSyncAnkiSettings({
-          server: targetServer, deck: targetDeck, forceOverride, hints: hachidoriHints,
-        });
-      }
-      let previousManagedProxy = null;
-      if (typeof globalThis.__subminerSetAnkiProxyUrl === 'function') {
-        previousManagedProxy = await globalThis.__subminerSetAnkiProxyUrl(forceOverride ? targetServer : null);
-      }
      const optionsFull = await invoke("optionsGetFull", undefined);
      const profiles = Array.isArray(optionsFull.profiles) ? optionsFull.profiles : [];
      if (profiles.length === 0) {
@@ -1458,8 +1405,7 @@ export async function syncYomitanDefaultAnkiServer(
      let changed = false;
      if (currentServer !== targetServer) {
        const canReplaceCurrent =
-          forceOverride || currentServer.length === 0 || currentServer === "http://127.0.0.1:8765" ||
-          (typeof previousManagedProxy === 'string' && currentServer === previousManagedProxy);
+          forceOverride || currentServer.length === 0 || currentServer === "http://127.0.0.1:8765";
        if (!canReplaceCurrent) {
          return { updated: false, matched: false, reason: "blocked-existing-server", currentServer, targetServer };
        }
@@ -1509,12 +1455,6 @@ export async function syncYomitanDefaultAnkiServer(

  try {
    const result = await parserWindow.webContents.executeJavaScript(script, true);
-    if (isObject(result) && result.pending === true) {
-      logger.info?.(
-        'Anki is unavailable; Hachidori field auto-population will retry when opened again',
-      );
-      return false;
-    }
    const updated =
      typeof result === 'object' &&
      result !== null &&
@@ -1624,7 +1564,7 @@ function buildYomitanInvokeScript(actionLiteral: string, paramsLiteral: string):
    (async () => {
      const invoke = (action, params) =>
        new Promise((resolve, reject) => {
-          (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+          chrome.runtime.sendMessage({ action, params }, (response) => {
            if (chrome.runtime.lastError) {
              reject(new Error(chrome.runtime.lastError.message));
              return;
@@ -1646,25 +1586,6 @@ function buildYomitanInvokeScript(actionLiteral: string, paramsLiteral: string):
  `;
 }

-export async function requestHachidoriSharing(
-  request: HachidoriSharingRequest,
-  deps: YomitanParserRuntimeDeps,
-  logger: LoggerLike,
-) {
-  const extension = deps.getYomitanExt();
-  if (!extension || !isHachidoriExtension(extension)) throw new Error('Hachidori is not active.');
-  const ready = await ensureYomitanParserWindow(deps, logger);
-  const window = deps.getYomitanParserWindow();
-  if (!ready || !window || window.isDestroyed()) throw new Error('Hachidori is unavailable.');
-  const reply: unknown = await window.webContents.executeJavaScript(
-    buildHachidoriSharingScript(request),
-    true,
-  );
-  const status = parseHachidoriHostStatus(reply);
-  if (request.type !== 'hd_sharing_status') clearYomitanParserCachesForWindow(window);
-  return status;
-}
-
 async function invokeYomitanBackendAction<T>(
  action: string,
  params: unknown,
@@ -12,7 +12,7 @@ export type YomitanFrequencyMode = 'occurrence-based' | 'rank-based';

 // Bump whenever the install script below changes so already-loaded parser
 // windows re-install the new scan runtime instead of running the stale one.
-export const YOMITAN_SCAN_RUNTIME_VERSION = 13;
+export const YOMITAN_SCAN_RUNTIME_VERSION = 12;
 export const YOMITAN_SCAN_RUNTIME_MISSING_SENTINEL = '__subminer-yomitan-scan-runtime-missing__';

 export interface YomitanScanRequestParams {
@@ -43,7 +43,7 @@ export const YOMITAN_SCAN_RUNTIME_INSTALL_SCRIPT = String.raw`
    }
    const invoke = (action, params) =>
      new Promise((resolve, reject) => {
-        (globalThis.__subminerDictionarySendMessage ?? chrome.runtime.sendMessage.bind(chrome.runtime))({ action, params }, (response) => {
+        chrome.runtime.sendMessage({ action, params }, (response) => {
          if (chrome.runtime.lastError) {
            reject(new Error(chrome.runtime.lastError.message));
            return;
@@ -16,7 +16,6 @@ type ExtensionCopyResult = {

 type ExtensionCopyOptions = {
  platform?: NodeJS.Platform;
-  extensionName?: 'yomitan' | 'hachidori';
 };

 const asyncExtensionCopyInFlight = new Map<string, Promise<ExtensionCopyResult>>();
@@ -157,7 +156,7 @@ export function ensureExtensionCopy(
  }

  const extensionsRoot = path.join(userDataPath, 'extensions');
-  const targetDir = path.join(extensionsRoot, options?.extensionName ?? 'yomitan');
+  const targetDir = path.join(extensionsRoot, 'yomitan');

  let shouldCopy = !fs.existsSync(targetDir);
  if (!shouldCopy) {
@@ -183,7 +182,7 @@ export async function ensureExtensionCopyAsync(
  }

  const extensionsRoot = path.join(userDataPath, 'extensions');
-  const targetDir = path.join(extensionsRoot, options?.extensionName ?? 'yomitan');
+  const targetDir = path.join(extensionsRoot, 'yomitan');
  const inFlightKey = path.resolve(targetDir);
  const inFlight = asyncExtensionCopyInFlight.get(inFlightKey);
  if (inFlight) {
@@ -7,7 +7,6 @@ const { BrowserWindow: ElectronBrowserWindow, Menu: ElectronMenu, session } = el
 const logger = createLogger('main:yomitan-settings');

 export interface OpenYomitanSettingsWindowOptions {
-  backend?: 'yomitan' | 'hachidori';
  yomitanExt: Extension | null;
  getExistingWindow: () => BrowserWindow | null;
  setWindow: (window: BrowserWindow | null) => void;
@@ -24,7 +23,6 @@ type HyprlandSessionEnv = {
 export interface InstallYomitanSettingsCloseButtonOptions {
  platform?: NodeJS.Platform;
  env?: HyprlandSessionEnv;
-  backend?: 'yomitan' | 'hachidori';
 }

 export function shouldInstallYomitanSettingsCloseButton(
@@ -55,9 +53,7 @@ export function buildYomitanSettingsWindowMenuTemplate(
  ];
 }

-export function buildYomitanSettingsCloseButtonScript(
-  backend: 'yomitan' | 'hachidori' = 'yomitan',
-): string {
+export function buildYomitanSettingsCloseButtonScript(): string {
  return `
 (() => {
  const buttonId = 'subminer-yomitan-settings-close';
@@ -101,7 +97,7 @@ export function buildYomitanSettingsCloseButtonScript(
  button.id = buttonId;
  button.type = 'button';
  button.title = 'Close';
-  button.setAttribute('aria-label', 'Close ${backend === 'hachidori' ? 'Hachidori' : 'Yomitan'} settings');
+  button.setAttribute('aria-label', 'Close Yomitan settings');
  button.textContent = '\\u00d7';
  button.addEventListener('click', () => {
    window.close();
@@ -122,7 +118,7 @@ export function installYomitanSettingsCloseButton(
    return;
  }
  settingsWindow.webContents
-    .executeJavaScript(buildYomitanSettingsCloseButtonScript(options.backend))
+    .executeJavaScript(buildYomitanSettingsCloseButtonScript())
    .catch((error: Error) => {
      logger.warn('Failed to install Yomitan settings close button:', error.message);
    });
@@ -188,7 +184,7 @@ export function openYomitanSettingsWindow(options: OpenYomitanSettingsWindowOpti
  logger.info('Creating new settings window for extension:', options.yomitanExt.id);

  const settingsWindow = new ElectronBrowserWindow({
-    title: options.backend === 'hachidori' ? 'Hachidori Settings' : 'Yomitan Settings',
+    title: 'Yomitan Settings',
    width: 1200,
    height: 800,
    show: false,
@@ -232,7 +228,7 @@ export function openYomitanSettingsWindow(options: OpenYomitanSettingsWindowOpti

  settingsWindow.webContents.on('did-finish-load', () => {
    logger.info('Settings page loaded successfully');
-    installYomitanSettingsCloseButton(settingsWindow, { backend: options.backend });
+    installYomitanSettingsCloseButton(settingsWindow);
  });

  setTimeout(() => {
@@ -1,4 +1,3 @@
-import { requestHachidoriSharing } from './core/services/tokenizer/yomitan-parser-runtime';
 /*
  SubMiner - All-in-one sentence mining overlay
  Copyright (C) 2026 sudacode
@@ -33,14 +32,6 @@ import {
  screen,
 } from 'electron';
 import { applyControllerConfigUpdate } from './main/controller-config-update.js';
-import {
-  createHachidoriExtensionRuntime,
-  getHachidoriSession,
-} from './core/services/hachidori-extension';
-import {
-  DICTIONARY_EXTERNAL_LINK_CHANNEL,
-  parseDictionaryExternalUrl,
-} from './shared/dictionary-external-link';
 import { openPlaylistBrowser as openPlaylistBrowserRuntime } from './main/runtime/playlist-browser-open';
 import { readMpvInputBindings } from './main/runtime/mpv-input-bindings';
 import { createAniSkipRuntime } from './main/runtime/aniskip-runtime';
@@ -915,34 +906,14 @@ const {
  appState,
  appLifecycleApp,
 } = bootServices;
-// Backend changes take effect on restart; windows and parser must share one session.
-const activeDictionaryBackend = configService.getConfig().dictionaryBackend;
-const hachidoriExtensionRuntime = createHachidoriExtensionRuntime(USER_DATA_PATH);
-let hachidoriSettingsWindow: BrowserWindow | null = null;
-let inactiveYomitanExtension: Extension | null = null;
-let inactiveYomitanSettingsWindow: BrowserWindow | null = null;
-let inactiveYomitanLoad: Promise<Extension | null> | null = null;
 let pendingSubtitleMiningContext: SubtitleMiningContext | null = null;
 const configSettingsFields = buildConfigSettingsRegistry(DEFAULT_CONFIG);

-ipcMain.handle(DICTIONARY_EXTERNAL_LINK_CHANNEL, async (event, value: unknown) => {
-  if (
-    activeDictionaryBackend !== 'hachidori' ||
-    event.senderFrame !== event.sender.mainFrame ||
-    !overlayManager.getOverlayWindows().some((window) => window.webContents === event.sender)
-  ) {
-    throw new Error('Dictionary links are only available from the active overlay');
-  }
-  await shell.openExternal(parseDictionaryExternalUrl(value));
-});
-
 function getOverlayForegroundSeparateWindows(): BrowserWindow[] {
  return [
    appState.configSettingsWindow,
    appState.syncUiWindow,
    appState.yomitanSettingsWindow,
-    hachidoriSettingsWindow,
-    inactiveYomitanSettingsWindow,
    appState.anilistSetupWindow,
    appState.jellyfinSetupWindow,
    appState.firstRunSetupWindow,
@@ -1040,8 +1011,6 @@ const {
 } = statsServerRuntime;

 function requestAppQuit(): void {
-  destroyYomitanSettingsWindow(hachidoriSettingsWindow);
-  destroyYomitanSettingsWindow(inactiveYomitanSettingsWindow);
  destroyYomitanSettingsWindow(appState.yomitanSettingsWindow);
  appState.yomitanSettingsWindow = null;
  destroyStatsWindow();
@@ -1486,15 +1455,6 @@ const createCommandLineLauncherRuntimeOptions = () => ({
    : undefined,
 });
 const firstRunSetupService = createFirstRunSetupService({
-  getDictionaryBackend: () => activeDictionaryBackend,
-  getHachidoriHostStatus: async () => {
-    await ensureYomitanExtensionLoaded();
-    return requestHachidoriSharing(
-      { type: 'hd_sharing_status' },
-      getYomitanParserRuntimeDeps(),
-      logger,
-    );
-  },
  platform: process.platform,
  configDir: CONFIG_DIR,
  getYomitanDictionaryCount: async () => {
@@ -2317,11 +2277,6 @@ const buildConfigHotReloadAppliedMainDepsHandler = createBuildConfigHotReloadApp
      if (appState.ankiIntegration) {
        appState.ankiIntegration.applyRuntimeConfigPatch(patch);
      }
-      if (activeDictionaryBackend === 'hachidori' && appState.yomitanExt) {
-        void syncYomitanDefaultProfileAnkiServer().catch((error: unknown) =>
-          logger.error('Failed to auto-populate Hachidori Anki settings', error),
-        );
-      }
    },
    invalidateTokenizationCache: () => {
      subtitleProcessingController.invalidateTokenizationCache();
@@ -3495,8 +3450,6 @@ const openFirstRunSetupWindowHandler = createOpenFirstRunSetupWindowHandler({
    return {
      configReady: snapshot.configReady,
      dictionaryCount: snapshot.dictionaryCount,
-      dictionaryBackend: snapshot.dictionaryBackend,
-      hachidoriHost: snapshot.hachidoriHost,
      canFinish: snapshot.canFinish,
      externalYomitanConfigured: snapshot.externalYomitanConfigured,
      pluginStatus: snapshot.pluginStatus,
@@ -3512,33 +3465,6 @@ const openFirstRunSetupWindowHandler = createOpenFirstRunSetupWindowHandler({
  buildSetupHtml: (model) => buildFirstRunSetupHtml(model),
  parseSubmissionUrl: (rawUrl) => parseFirstRunSetupSubmissionUrl(rawUrl),
  handleAction: async (submission: FirstRunSetupSubmission) => {
-    if (
-      submission.action === 'link-hachidori-host' ||
-      submission.action === 'unlink-hachidori-host'
-    ) {
-      try {
-        if (activeDictionaryBackend !== 'hachidori')
-          throw new Error('Select Hachidori and restart SubMiner before linking a host.');
-        await ensureYomitanExtensionLoaded();
-        const status = await requestHachidoriSharing(
-          submission.action === 'link-hachidori-host'
-            ? { type: 'hd_sharing_client_link', address: submission.address }
-            : { type: 'hd_sharing_client_unlink' },
-          getYomitanParserRuntimeDeps(),
-          logger,
-        );
-        firstRunSetupMessage =
-          status.kind === 'local'
-            ? 'Using dictionaries installed in SubMiner.'
-            : status.kind === 'connected'
-              ? `Linked to ${status.name}. Anki mining stays in SubMiner.`
-              : status.message;
-      } catch (error) {
-        firstRunSetupMessage =
-          error instanceof Error ? error.message : 'Could not update the dictionary host.';
-      }
-      return;
-    }
    if (submission.action === 'remove-legacy-plugin') {
      const snapshot = await firstRunSetupService.removeLegacyMpvPlugin();
      firstRunSetupMessage = snapshot.message;
@@ -3579,8 +3505,8 @@ const openFirstRunSetupWindowHandler = createOpenFirstRunSetupWindowHandler({
      return;
    }
    if (submission.action === 'open-yomitan-settings') {
-      firstRunSetupMessage = openDictionarySettings()
-        ? `Opened ${activeDictionaryBackend === 'hachidori' ? 'Hachidori' : 'Yomitan'} settings. Install dictionaries, then refresh status.`
+      firstRunSetupMessage = openYomitanSettings()
+        ? 'Opened Yomitan settings. Install dictionaries, then refresh status.'
        : 'Yomitan settings are unavailable while external read-only profile mode is enabled.';
      return;
    }
@@ -5231,41 +5157,6 @@ function initializeOverlayRuntime(): void {
 }

 function openYomitanSettings(): boolean {
-  if (activeDictionaryBackend === 'hachidori') {
-    if (configService.getConfig().yomitan.externalProfilePath.trim()) {
-      logger.warn('Yomitan settings unavailable while using read-only external-profile mode.');
-      return false;
-    }
-    inactiveYomitanLoad ??= inactiveYomitanExtension
-      ? Promise.resolve(inactiveYomitanExtension)
-      : loadYomitanExtensionCore({
-          userDataPath: USER_DATA_PATH,
-          getYomitanParserWindow: () => null,
-          setYomitanParserWindow: () => {},
-          setYomitanParserReadyPromise: () => {},
-          setYomitanParserInitPromise: () => {},
-          setYomitanExtension: (extension) => {
-            inactiveYomitanExtension = extension;
-          },
-          setYomitanSession: () => {},
-        }).finally(() => {
-          inactiveYomitanLoad = null;
-        });
-    void (
-      inactiveYomitanExtension ? Promise.resolve(inactiveYomitanExtension) : inactiveYomitanLoad
-    )
-      .then((extension) =>
-        openYomitanSettingsWindow({
-          yomitanExt: extension,
-          getExistingWindow: () => inactiveYomitanSettingsWindow,
-          setWindow: (window) => {
-            inactiveYomitanSettingsWindow = window;
-          },
-        }),
-      )
-      .catch((error: unknown) => logger.error('Failed to open Yomitan settings', error));
-    return true;
-  }
  if (yomitanProfilePolicy.isExternalReadOnlyMode()) {
    const message = 'Yomitan settings unavailable while using read-only external-profile mode.';
    logger.warn(
@@ -5278,39 +5169,6 @@ function openYomitanSettings(): boolean {
  return true;
 }

-function openHachidoriSettings(): void {
-  void (
-    activeDictionaryBackend === 'hachidori'
-      ? ensureYomitanExtensionLoaded()
-      : hachidoriExtensionRuntime.ensureLoaded()
-  )
-    .then((extension) =>
-      openYomitanSettingsWindow({
-        backend: 'hachidori',
-        yomitanExt: extension,
-        yomitanSession: getHachidoriSession(),
-        getExistingWindow: () => hachidoriSettingsWindow,
-        setWindow: (window) => {
-          hachidoriSettingsWindow = window;
-        },
-        onWindowClosed: () => {
-          if (activeDictionaryBackend === 'hachidori' && appState.yomitanParserWindow) {
-            clearYomitanParserCachesForWindow(appState.yomitanParserWindow);
-          }
-        },
-      }),
-    )
-    .catch((error: unknown) => logger.error('Failed to open Hachidori settings', error));
-}
-
-function openDictionarySettings(): boolean {
-  if (activeDictionaryBackend === 'hachidori') {
-    openHachidoriSettings();
-    return true;
-  }
-  return openYomitanSettings();
-}
-
 const { exportLogsFromTray } = createLogExportTrayRuntime({
  flushMpvLog: () => flushMpvLog(),
  logInfo: (message) => logger.info(message),
@@ -5338,7 +5196,7 @@ const {
      getConfiguredShortcuts: () => getConfiguredShortcutsHandler(),
      registerGlobalShortcutsCore,
      toggleVisibleOverlay: () => toggleVisibleOverlay(),
-      openYomitanSettings: () => openDictionarySettings(),
+      openYomitanSettings: () => openYomitanSettings(),
      isDev,
      getMainWindow: () => overlayManager.getMainWindow(),
    }),
@@ -5829,7 +5687,7 @@ const { registerIpcRuntimeHandlers } = composeIpcRuntimeHandlers({
        }
      },
      onYoutubePickerResolve: (request) => youtubeFlowRuntime.resolveActivePicker(request),
-      openYomitanSettings: () => openDictionarySettings(),
+      openYomitanSettings: () => openYomitanSettings(),
      // Overlay lookups carry no cue context of their own; fall back to snapshotting the
      // live mpv sub timings at lookup time so media generation clips the mined line even
      // when extraction finishes long after playback has moved on.
@@ -6270,7 +6128,6 @@ const { handleCliCommand, handleInitialArgs } = composeCliStartupHandlers({
    },
    runYoutubePlaybackFlow: (request) => youtubePlaybackRuntime.runYoutubePlaybackFlow(request),
    ensureBackgroundStatsServer: () => ensureBackgroundStatsServer(),
-    openHachidoriSettings: () => openHachidoriSettings(),
    openYomitanSettings: () => openYomitanSettings(),
    openConfigSettingsWindow: () => configSettingsRuntime.openWindow(),
    openSyncUiWindow: () => openSyncUiWindowHandler(),
@@ -6446,8 +6303,7 @@ const { createMainWindow: createMainWindowHandler, createModalWindow: createModa
        overlayVisibilityComposer.setOverlayDebugVisualizationEnabled(enabled),
      isOverlayVisible: (windowKind) =>
        windowKind === 'visible' ? overlayManager.getVisibleOverlayVisible() : false,
-      getYomitanSession: () =>
-        activeDictionaryBackend === 'hachidori' ? getHachidoriSession() : appState.yomitanSession,
+      getYomitanSession: () => appState.yomitanSession,
      tryHandleOverlayShortcutLocalFallback: (input) =>
        overlayShortcutsRuntime.tryHandleOverlayShortcutLocalFallback(input),
      forwardTabToMpv: () => sendMpvCommandRuntime(appState.mpvClient, ['keypress', 'TAB']),
@@ -6535,8 +6391,6 @@ const { ensureTray: ensureTrayHandler, destroyTray: destroyTrayHandler } =
      showFirstRunSetup: () => !firstRunSetupService.isSetupCompleted(),
      openFirstRunSetupWindow: (force?: boolean) => openFirstRunSetupWindow(force),
      showWindowsMpvLauncherSetup: () => process.platform === 'win32',
-      getDictionaryBackend: () => activeDictionaryBackend,
-      openHachidoriSettings: () => openHachidoriSettings(),
      openYomitanSettings: () => openYomitanSettings(),
      openConfigSettingsWindow: () => configSettingsRuntime.openWindow(),
      openSyncUiWindow: () => openSyncUiWindowHandler(),
@@ -6581,21 +6435,12 @@ const { ensureTray: ensureTrayHandler, destroyTray: destroyTrayHandler } =
    buildMenuFromTemplate: (template) => Menu.buildFromTemplate(template),
  });
 const yomitanProfilePolicy = createYomitanProfilePolicy({
-  externalProfilePath:
-    activeDictionaryBackend === 'yomitan'
-      ? configService.getConfig().yomitan.externalProfilePath
-      : '',
+  externalProfilePath: configService.getConfig().yomitan.externalProfilePath,
  logInfo: (message) => logger.info(message),
 });
 const configuredExternalYomitanProfilePath = yomitanProfilePolicy.externalProfilePath;
 const yomitanExtensionRuntime = createYomitanExtensionRuntime({
-  loadYomitanExtensionCore: async (deps) => {
-    if (activeDictionaryBackend === 'yomitan') return loadYomitanExtensionCore(deps);
-    const extension = await hachidoriExtensionRuntime.ensureLoaded();
-    deps.setYomitanExtension(extension);
-    deps.setYomitanSession(getHachidoriSession());
-    return extension;
-  },
+  loadYomitanExtensionCore,
  userDataPath: USER_DATA_PATH,
  externalProfilePath: configuredExternalYomitanProfilePath,
  getYomitanParserWindow: () => appState.yomitanParserWindow,
@@ -49,7 +49,6 @@ export interface CliCommandRuntimeServiceContext {
  runYoutubePlaybackFlow: CliCommandRuntimeServiceDepsParams['app']['runYoutubePlaybackFlow'];
  ensureBackgroundStatsServer?: CliCommandRuntimeServiceDepsParams['app']['ensureBackgroundStatsServer'];
  openYomitanSettings: () => void;
-  openHachidoriSettings: () => void;
  openConfigSettingsWindow: () => void;
  openSyncUiWindow: () => void;
  cycleSecondarySubMode: () => void;
@@ -136,7 +135,6 @@ function createCliCommandDepsFromContext(
    ui: {
      openFirstRunSetup: context.openFirstRunSetup,
      openYomitanSettings: context.openYomitanSettings,
-      openHachidoriSettings: context.openHachidoriSettings,
      openConfigSettingsWindow: context.openConfigSettingsWindow,
      openSyncUiWindow: context.openSyncUiWindow,
      cycleSecondarySubMode: context.cycleSecondarySubMode,
@@ -217,7 +217,6 @@ export interface CliCommandRuntimeServiceDepsParams {
  ui: {
    openFirstRunSetup: CliCommandDepsRuntimeOptions['ui']['openFirstRunSetup'];
    openYomitanSettings: CliCommandDepsRuntimeOptions['ui']['openYomitanSettings'];
-    openHachidoriSettings: CliCommandDepsRuntimeOptions['ui']['openHachidoriSettings'];
    openConfigSettingsWindow: CliCommandDepsRuntimeOptions['ui']['openConfigSettingsWindow'];
    openSyncUiWindow: CliCommandDepsRuntimeOptions['ui']['openSyncUiWindow'];
    cycleSecondarySubMode: CliCommandDepsRuntimeOptions['ui']['cycleSecondarySubMode'];
@@ -431,7 +430,6 @@ export function createCliCommandRuntimeServiceDeps(
    ui: {
      openFirstRunSetup: params.ui.openFirstRunSetup,
      openYomitanSettings: params.ui.openYomitanSettings,
-      openHachidoriSettings: params.ui.openHachidoriSettings,
      openConfigSettingsWindow: params.ui.openConfigSettingsWindow,
      openSyncUiWindow: params.ui.openSyncUiWindow,
      cycleSecondarySubMode: params.ui.cycleSecondarySubMode,
@@ -18,7 +18,6 @@ type MockWindow = {
  contentReady: boolean;
  documentLoaded: boolean;
  loadCallbacks: Array<() => void>;
-  stopLoadingCallbacks: Array<() => void>;
  readyToShowCallbacks: Array<() => void>;
 };

@@ -38,7 +37,6 @@ function createMockWindow(): MockWindow & {
  destroy: () => void;
  focus: () => void;
  emitDidFinishLoad: () => void;
-  emitDidStopLoading: () => void;
  emitReadyToShow: () => void;
  once: (event: 'ready-to-show', cb: () => void) => void;
  webContents: {
@@ -47,7 +45,7 @@ function createMockWindow(): MockWindow & {
    getURL: () => string;
    send: (channel: string, payload?: unknown) => void;
    isFocused: () => boolean;
-    once: (event: 'did-finish-load' | 'did-stop-loading', cb: () => void) => void;
+    once: (event: 'did-finish-load', cb: () => void) => void;
    focus: () => void;
  };
 } {
@@ -67,7 +65,6 @@ function createMockWindow(): MockWindow & {
    contentReady: true,
    documentLoaded: true,
    loadCallbacks: [],
-    stopLoadingCallbacks: [],
    readyToShowCallbacks: [],
  };
  const window = {
@@ -115,13 +112,6 @@ function createMockWindow(): MockWindow & {
        callback();
      }
    },
-    emitDidStopLoading: () => {
-      state.loading = false;
-      const callbacks = state.stopLoadingCallbacks.splice(0);
-      for (const callback of callbacks) {
-        callback();
-      }
-    },
    emitReadyToShow: () => {
      const callbacks = state.readyToShowCallbacks.splice(0);
      for (const callback of callbacks) {
@@ -143,11 +133,7 @@ function createMockWindow(): MockWindow & {
      },
      focused: false,
      isFocused: () => state.webContentsFocused,
-      once: (event: 'did-finish-load' | 'did-stop-loading', cb: () => void) => {
-        if (event === 'did-stop-loading') {
-          state.stopLoadingCallbacks.push(cb);
-          return;
-        }
+      once: (_event: 'did-finish-load', cb: () => void) => {
        state.loadCallbacks.push(cb);
      },
      focus: () => {
@@ -906,44 +892,6 @@ test('sendToActiveOverlayWindow delivers on first modal load without waiting for
  assert.deepEqual(window.sent, [['runtime-options:open']]);
 });

-test('sendToActiveOverlayWindow delivers to a modal window created for the send', () => {
-  // Electron keeps isLoading() true inside did-finish-load, and ready-to-show can fire
-  // before it; only did-stop-loading sees the settled state.
-  const window = createMockWindow();
-  window.loading = true;
-  window.url = '';
-  window.contentReady = false;
-  window.documentLoaded = false;
-  const runtime = createOverlayModalRuntimeService({
-    getMainWindow: () => null,
-    getModalWindow: () => null,
-    createModalWindow: () => window as never,
-    getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-    setModalWindowBounds: () => {},
-  });
-
-  assert.equal(
-    runtime.sendToActiveOverlayWindow(
-      'media-timing-review:open',
-      { reviewId: 'r1' },
-      {
-        restoreOnModalClose: 'media-timing-review',
-        preferModalWindow: true,
-      },
-    ),
-    true,
-  );
-  assert.deepEqual(window.sent, []);
-  window.contentReady = true;
-  window.emitReadyToShow();
-  window.url = 'file:///overlay/index.html?layer=modal';
-  window.documentLoaded = true;
-  window.emitDidFinishLoad();
-  assert.deepEqual(window.sent, []);
-  window.emitDidStopLoading();
-  assert.deepEqual(window.sent, [['media-timing-review:open', { reviewId: 'r1' }]]);
-});
-
 test('sendToActiveOverlayWindow delivers when the modal loaded before listeners were registered', () => {
  const window = createMockWindow();
  window.contentReady = false;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sudacode	6a1d1211ae	fix(release): resolve style.css asar lookup with native separators The shared-font check still handed asar a forward-slash path, which fails on Windows the same way the inventory listing did.	2026-09-22 02:29:28 -07:00
sudacode	7585d430ae	fix(release): unbreak packaging workflow on all three platforms - Bump electron-builder to 26.16.1 so macOS signing passes the temp keychain password to set-key-partition-list (upstream #10066), which the macOS 26 runner image now enforces - Stat asar entries with their native path in the package audit; splitting on path.sep made every nested file look missing on Windows - Run the package smoke with --no-sandbox on Linux runners without a setuid chrome-sandbox - Load the packaged stats dashboard over loopback HTTP in the smoke, matching how the app serves it since #263, and ignore Chromium's cache-only font probe	2026-09-22 02:15:49 -07:00
sudacode	122ff9a3c5	chore(release): prepare v0.20.0-beta.1 Trim pending change fragments, drop the breaking flag from the stats request-safety change, and generate prerelease notes.	2026-09-22 01:29:58 -07:00
sudacode	786bd5af81	chore(yomitan): update vendored fork to upstream 26.9.8	2026-09-21 20:53:26 -07:00
sudacode	42d1384c68	fix(jellyfin): support modern authentication (#264 )	2026-09-21 20:40:57 -07:00