fix: exclude prerelease tags from stable workflow

.github/workflows/prerelease.yml

@@ -32,9 +32,9 @@ jobs:
             node_modules
             stats/node_modules
             vendor/subminer-yomitan/node_modules
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/subminer-yomitan/package-lock.json') }}
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/subminer-yomitan/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-
 
       - name: Install dependencies
         run: |
@@ -50,9 +50,6 @@ jobs:
       - name: Test suite (source)
         run: bun run test:fast
 
-      - name: Environment suite
-        run: bun run test:env
-
       - name: Coverage suite (maintained source lane)
         run: bun run test:coverage:src
 
@@ -106,9 +103,9 @@ jobs:
             stats/node_modules
             vendor/texthooker-ui/node_modules
             vendor/subminer-yomitan/node_modules
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/texthooker-ui/package.json', 'vendor/subminer-yomitan/package-lock.json') }}
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/texthooker-ui/package.json', 'vendor/subminer-yomitan/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-
 
       - name: Install dependencies
         run: |
@@ -140,7 +137,6 @@ jobs:
         with:
           name: appimage
           path: release/*.AppImage
-          if-no-files-found: error
 
   build-macos:
     needs: [quality-gate]
@@ -165,9 +161,9 @@ jobs:
             stats/node_modules
             vendor/texthooker-ui/node_modules
             vendor/subminer-yomitan/node_modules
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/texthooker-ui/package.json', 'vendor/subminer-yomitan/package-lock.json') }}
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/texthooker-ui/package.json', 'vendor/subminer-yomitan/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-
 
       - name: Validate macOS signing/notarization secrets
         run: |
@@ -216,7 +212,6 @@ jobs:
           path: |
             release/*.dmg
             release/*.zip
-          if-no-files-found: error
 
   build-windows:
     needs: [quality-gate]
@@ -241,9 +236,9 @@ jobs:
             stats/node_modules
             vendor/texthooker-ui/node_modules
             vendor/subminer-yomitan/node_modules
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/texthooker-ui/package.json', 'vendor/subminer-yomitan/package-lock.json') }}
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock', 'stats/bun.lock', 'vendor/texthooker-ui/package.json', 'vendor/subminer-yomitan/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-
 
       - name: Install dependencies
         run: |
@@ -309,9 +304,9 @@ jobs:
           path: |
             ~/.bun/install/cache
             node_modules
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-
 
       - name: Install dependencies
         run: bun install --frozen-lockfile
@@ -344,12 +339,7 @@ jobs:
             echo "No release artifacts found for checksum generation."
             exit 1
           fi
-          : > release/SHA256SUMS.txt
-          for file in "${files[@]}"; do
-            printf '%s  %s\n' \
-              "$(sha256sum "$file" | awk '{print $1}')" \
-              "${file##*/}" >> release/SHA256SUMS.txt
-          done
+          sha256sum "${files[@]}" > release/SHA256SUMS.txt
 
       - name: Get version from tag
         id: version
@@ -364,6 +354,20 @@ jobs:
         run: |
           set -euo pipefail
 
+          if gh release view "${{ steps.version.outputs.VERSION }}" >/dev/null 2>&1; then
+            gh release edit "${{ steps.version.outputs.VERSION }}" \
+              --draft=false \
+              --prerelease \
+              --title "${{ steps.version.outputs.VERSION }}" \
+              --notes-file release/prerelease-notes.md
+          else
+            gh release create "${{ steps.version.outputs.VERSION }}" \
+              --latest=false \
+              --prerelease \
+              --title "${{ steps.version.outputs.VERSION }}" \
+              --notes-file release/prerelease-notes.md
+          fi
+
           shopt -s nullglob
           artifacts=(
             release/*.AppImage
@@ -380,27 +384,6 @@ jobs:
             exit 1
           fi
 
-          if gh release view "${{ steps.version.outputs.VERSION }}" >/dev/null 2>&1; then
-            gh release edit "${{ steps.version.outputs.VERSION }}" \
-              --draft \
-              --prerelease \
-              --title "${{ steps.version.outputs.VERSION }}" \
-              --notes-file release/prerelease-notes.md
-          else
-            gh release create "${{ steps.version.outputs.VERSION }}" \
-              --draft \
-              --latest=false \
-              --prerelease \
-              --title "${{ steps.version.outputs.VERSION }}" \
-              --notes-file release/prerelease-notes.md
-          fi
-
           for asset in "${artifacts[@]}"; do
             gh release upload "${{ steps.version.outputs.VERSION }}" "$asset" --clobber
           done
-
-          gh release edit "${{ steps.version.outputs.VERSION }}" \
-            --draft=false \
-            --prerelease \
-            --title "${{ steps.version.outputs.VERSION }}" \
-            --notes-file release/prerelease-notes.md

.github/workflows/release.yml

@@ -340,12 +340,7 @@ jobs:
             echo "No release artifacts found for checksum generation."
             exit 1
           fi
-          : > release/SHA256SUMS.txt
-          for file in "${files[@]}"; do
-            printf '%s  %s\n' \
-              "$(sha256sum "$file" | awk '{print $1}')" \
-              "${file##*/}" >> release/SHA256SUMS.txt
-          done
+          sha256sum "${files[@]}" > release/SHA256SUMS.txt
 
       - name: Get version from tag
         id: version

CHANGELOG.md

@@ -1,43 +1,5 @@
 # Changelog
 
-## v0.12.0 (2026-04-11)
-
-### Changed
-- Overlay: Added configurable overlay shortcuts for session help, controller select, and controller debug actions.
-- Overlay: Added mpv/plugin and CLI routing for session help, controller utilities, and subtitle sidebar toggling through the shared session-action path.
-- Overlay: Improved dedicated overlay modal retry and focus handling for runtime options, Jimaku, session help, controller tools, and the playlist browser.
-- Overlay: Fixed controller configuration and controller debug shortcut opens so configured bindings bring up their modals again instead of tripping renderer recovery.
-- Stats: Sessions are rolled up per episode within each day, with a bulk delete that wipes every session in the group.
-- Stats: Trends add a 365-day range next to the existing 7d/30d/90d/all options.
-- Stats: Library detail view gets a delete-episode action that removes the video and all its sessions.
-- Stats: Vocabulary Top 50 tightens the word/reading column so katakana entries no longer push the scores off screen.
-- Stats: Episode detail hides card events whose Anki notes have been deleted, instead of showing phantom mining activity.
-- Stats: Trend and watch-time charts share a unified theme with horizontal gridlines and larger ticks for legibility.
-- Stats: Overview, Library, Trends, Sessions, and Vocabulary now use generic "title" wording so YouTube videos and anime live comfortably side by side in the dashboard.
-- Stats: Session timeline no longer plots seek-forward/seek-backward markers — they were too noisy on sessions with lots of rewinds.
-- Stats: Replaced the "Library — Per Day" section on the Stats → Trends page with a "Library — Summary" section. The new section shows a top-10 watch-time leaderboard chart and a sortable per-title table (watch time, videos, sessions, cards, words, lookups, lookups/100w, date range), all scoped to the current date range selector.
-
-### Fixed
-- Overlay: Fixed overlay drag-and-drop routing so dropping external subtitle files like `.ass` onto mpv still loads them when the overlay is visible.
-- Overlay: Addressed the latest CodeRabbit follow-ups on PR #49, including generation-scoped Lua session binding names, stricter session command validation, session-help shortcut visibility, the numeric-selection key guard, stats-overlay startup classification, and safer session-binding persistence.
-- Overlay: Addressed the latest CodeRabbit follow-ups on the Windows overlay flow, including exact mpv target resolution, lower-overlay helper arguments, Win32 failure detection, and overlay cleanup on tracker loss.
-- Overlay: Fixed Windows overlay z-order so the visible subtitle overlay stops staying above unrelated apps after mpv loses focus.
-- Overlay: Fixed Windows overlay tracking to use native window polling and owner/z-order binding, which keeps the subtitle overlay aligned to the active mpv window more reliably.
-- Overlay: Fixed Windows overlay hide/restore behavior so minimizing mpv immediately hides the overlay and restoring mpv brings it back on top of the mpv window without requiring a click.
-- Overlay: Fixed stats overlay layering so the in-player stats page now stays above mpv and the subtitle overlay while it is open.
-- Overlay: Fixed Windows subtitle overlay stability so transient tracker misses and restore events keep the current subtitle visible instead of waiting for the next subtitle line.
-- Overlay: Fixed Windows focus handoff from the interactive subtitle overlay back to mpv so the overlay no longer drops behind mpv and briefly disappears.
-- Overlay: Fixed Windows visible-overlay startup so it no longer briefly opens as an interactive or opaque surface before the tracked transparent overlay state settles.
-- Overlay: Fixed spurious auto-pause after overlay visibility recovery and window resize so the overlay no longer pauses mpv until the pointer genuinely re-enters the subtitle area.
-- Overlay: Fixed Windows secondary subtitle hover mode so the expanded hover hit area no longer blocks the native minimize, maximize, and close buttons.
-- Overlay: Fixed Windows Yomitan popup focus loss after closing nested lookups so the original popup stays interactive instead of falling through to mpv.
-- Stats: Fixed immersion-tracker timestamp handling under Bun/libsql so library rows, session timelines, and lifetime summaries keep real wall-clock millisecond values instead of truncating to invalid negative timestamps.
-- Mpv Plugin: Fixed the mpv Lua plugin so hover and environment modules no longer use the `goto continue` pattern that can fail to parse on some user Lua runtimes.
-
-### Internal
-- Release: Added a dedicated beta/rc prerelease GitHub Actions workflow that publishes GitHub prereleases without consuming pending changelog fragments or updating AUR.
-- Release: Added prerelease note generation so beta and release-candidate tags can reuse the current pending `changes/*.md` fragments while leaving stable changelog publication for the final release cut.
-
 ## v0.11.2 (2026-04-07)
 
 ### Changed

backlog/completed/task-285 - Rename-anime-visibility-filter-heading-to-title-visibility.md

@@ -1,34 +0,0 @@
----
-id: TASK-285
-title: Rename anime visibility filter heading to title visibility
-status: Done
-assignee:
-  - codex
-created_date: '2026-04-10 00:00'
-updated_date: '2026-04-10 00:00'
-labels:
-  - stats
-  - ui
-  - bug
-milestone: m-1
-dependencies: []
-references:
-  - stats/src/components/trends/TrendsTab.tsx
-  - stats/src/components/trends/TrendsTab.test.tsx
-priority: low
-ordinal: 200000
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Align the library cumulative trends filter UI with the new terminology by renaming the hardcoded anime visibility heading to title visibility.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-
-<!-- AC:BEGIN -->
-- [x] #1 The trends filter heading uses `Title Visibility`
-- [x] #2 The component behavior and props stay unchanged
-- [x] #3 A regression test covers the rendered heading text
-<!-- AC:END -->

backlog/tasks/task-285 - Investigate-inconsistent-mpv-y-t-overlay-toggle-after-menu-toggle.md

@@ -1,54 +0,0 @@
----
-id: TASK-285
-title: Investigate inconsistent mpv y-t overlay toggle after menu toggle
-status: To Do
-assignee: []
-created_date: '2026-04-07 22:55'
-updated_date: '2026-04-07 22:55'
-labels:
-  - bug
-  - overlay
-  - keyboard
-  - mpv
-dependencies: []
-references:
-  - plugin/subminer/process.lua
-  - plugin/subminer/ui.lua
-  - src/renderer/handlers/keyboard.ts
-  - src/main/runtime/autoplay-ready-gate.ts
-  - src/core/services/overlay-window-input.ts
-  - backlog/tasks/task-248 - Fix-macOS-visible-overlay-toggle-getting-immediately-restored.md
-priority: high
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-User report: toggling the visible overlay with mpv `y-t` is inconsistent. After manually toggling through the `y-y` menu, `y-t` may allow one hide, but after toggling back on it can stop hiding the overlay again, forcing the user back into the menu path.
-
-Initial assessment:
-
-- no active backlog item currently tracks this exact report
-- nearest prior work is `TASK-248`, which fixed a macOS-specific visible-overlay restore bug and is marked done
-- current targeted regressions for the old fix surface pass, including plugin ready-signal suppression, focused-overlay `y-t` proxy dispatch, autoplay-ready gate deduplication, and blur-path restacking guards
-
-This should be treated as a fresh investigation unless reproduction proves it is the same closed macOS issue resurfacing on the current build.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [ ] #1 Reproduce the reported `y-t` / `y-y` inconsistency on the affected platform and identify the exact event sequence
-- [ ] #2 Determine whether the failure is in mpv plugin command dispatch, focused-overlay key forwarding, or main-process visible-overlay state transitions
-- [ ] #3 Fix the inconsistency so repeated hide/show/hide cycles work from `y-t` without requiring menu recovery
-- [ ] #4 Add regression coverage for the reproduced failing sequence
-- [ ] #5 Record whether this is a regression of `TASK-248` or a distinct bug
-<!-- AC:END -->
-
-## Implementation Plan
-
-<!-- SECTION:PLAN:BEGIN -->
-1. Reproduce the report with platform/build details and capture whether the failing `y-t` press originates in raw mpv or the focused overlay y-chord proxy path.
-2. Trace visible-overlay state mutations across plugin toggle commands, autoplay-ready callbacks, and main-process visibility/window blur handling.
-3. Patch the narrowest failing path and add regression coverage for the exact hide/show/hide sequence.
-4. Re-run targeted plugin, overlay visibility, overlay window, and renderer keyboard suites before broader verification.
-<!-- SECTION:PLAN:END -->

backlog/tasks/task-286 - Assess-and-address-PR-49-CodeRabbit-review-follow-ups.md

@@ -1,63 +0,0 @@
----
-id: TASK-286
-title: 'Assess and address PR #49 CodeRabbit review follow-ups'
-status: Done
-assignee:
-  - codex
-created_date: '2026-04-11 18:55'
-updated_date: '2026-04-11 22:40'
-labels:
-  - bug
-  - code-review
-  - windows
-  - overlay
-dependencies: []
-references:
-  - src/main/runtime/config-hot-reload-handlers.ts
-  - src/renderer/handlers/keyboard.ts
-  - src/renderer/handlers/mouse.ts
-  - vendor/subminer-yomitan
-priority: high
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Track the current PR #49 review round and resolve the actionable CodeRabbit findings on the Windows update branch.
-
-Focus areas include the renderer mouse interaction fix, config hot-reload keyboard state, and any other review items that still apply after verifying the current branch state.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 All actionable CodeRabbit comments on PR #49 are either fixed or shown to be obsolete with evidence.
-- [x] #2 Regression tests are added or updated for any behavior change that could regress.
-- [x] #3 The branch passes the repo's relevant verification checks for the touched areas.
-<!-- AC:END -->
-
-## Implementation Plan
-
-<!-- SECTION:PLAN:BEGIN -->
-1. Pull the current unresolved CodeRabbit review threads for PR #49 and cluster them into still-actionable fixes versus obsolete/nit-only items.
-2. For each still-actionable behavior bug, add or extend the narrowest failing test first in the touched suite before changing production code.
-3. Implement the minimal fixes across the affected runtime, renderer, plugin, IPC, and Windows tracker files, keeping each change traceable to the review thread.
-4. Run targeted verification for the touched areas, update task notes with assessment results, and capture which review comments were fixed versus assessed as obsolete or deferred nitpicks.
-<!-- SECTION:PLAN:END -->
-
-## Implementation Notes
-
-<!-- SECTION:NOTES:BEGIN -->
-Assessed PR #49 CodeRabbit threads. Fixed the real regressions in first-run CLI gating, IPC session-action validation, renderer controller-modal lifecycle notifications, async subtitle-sidebar toggle guarding, plugin config-dir resolution priority, prerelease artifact upload failure handling, immersion tracker lazy startup, win32 z-order error handling, and Windows socket-aware mpv matching.
-
-Review assessment: the overlay-shortcut lifecycle comment is obsolete for the current architecture because overlay-local shortcuts are intentionally handled through the local fallback path and the runtime only tracks configured-state/cleanup. Refactor-only nit comments for splitting `scripts/build-changelog.ts` and `src/core/services/session-bindings.ts` were left as follow-up quality work, not behavior bugs in this PR round.
-
-Verification: `bun test src/main/runtime/first-run-setup-service.test.ts src/core/services/session-bindings.test.ts src/core/services/app-ready.test.ts src/core/services/ipc.test.ts src/renderer/handlers/keyboard.test.ts src/main/overlay-runtime.test.ts src/window-trackers/mpv-socket-match.test.ts`, `bun test src/window-trackers/windows-tracker.test.ts`, `bun run typecheck`, `lua scripts/test-plugin-lua-compat.lua`.
-<!-- SECTION:NOTES:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Assessed the current CodeRabbit round on PR #49 and addressed the still-valid behavior issues rather than blanket-applying every bot suggestion. The branch now treats the new session/stats CLI flags as explicit startup commands during first-run setup, validates the new session actions through IPC, points session-binding command diagnostics at the correct config field, keeps immersion tracker startup lazy until later runtime triggers, and notifies overlay modal lifecycle state when controller-select/debug are opened from local keyboard bindings. I also switched the subtitle-sidebar IPC callback to the async guarded path so promise rejections feed renderer recovery instead of being dropped.
-
-On the Windows/plugin side, the mpv plugin now prefers config-file matches before falling back to an existing config directory, prerelease workflow uploads fail if expected Linux/macOS artifacts are missing, the Win32 z-order bind path now validates the `GetWindowLongW` call for the window above mpv, and the Windows tracker now passes the target socket path into native polling and filters mpv instances by command line so multiple sockets can be distinguished on Windows. Added/updated regression coverage for first-run gating, IPC validation, session-binding diagnostics, controller modal lifecycle notifications, modal ready-listener dispatch, and socket-path matching. Verification run: `bun run typecheck`, the targeted Bun test suites for the touched areas, `bun test src/window-trackers/windows-tracker.test.ts`, and `lua scripts/test-plugin-lua-compat.lua`.
-<!-- SECTION:FINAL_SUMMARY:END -->

backlog/tasks/task-286.1 - Assess-and-address-PR-49-subsequent-CodeRabbit-review-round.md

@@ -1,61 +0,0 @@
----
-id: TASK-286.1
-title: 'Assess and address PR #49 subsequent CodeRabbit review round'
-status: Done
-assignee: []
-created_date: '2026-04-11 23:14'
-updated_date: '2026-04-11 23:16'
-labels:
-  - bug
-  - code-review
-  - windows
-  - release
-dependencies: []
-references:
-  - .github/workflows/prerelease.yml
-  - src/window-trackers/mpv-socket-match.ts
-  - src/window-trackers/win32.ts
-  - src/core/services/overlay-shortcut.ts
-parent_task_id: TASK-286
-priority: high
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Track the next unresolved CodeRabbit review threads on PR #49 after commit 9ce5de2f and resolve the still-valid follow-up issues without reopening already-assessed stale comments.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 All still-actionable CodeRabbit comments in the latest PR #49 round are fixed or explicitly shown stale with evidence.
-- [x] #2 Regression coverage is added or updated for any behavior-sensitive fix in workflow or Windows socket matching.
-- [x] #3 Relevant verification passes for the touched workflow, tracker, and shared matcher changes.
-<!-- AC:END -->
-
-## Implementation Plan
-
-<!-- SECTION:PLAN:BEGIN -->
-1. Verify the five unresolved CodeRabbit threads against current branch state and separate still-valid bugs from stale comments.
-2. Add or extend the narrowest failing tests for exact socket-path matching and prerelease workflow invariants before changing production code.
-3. Implement minimal fixes in the prerelease workflow and Windows socket matching/cache path, leaving stale comments documented with evidence instead of forcing no-op changes.
-4. Run targeted verification, then record the fixed-vs-stale assessment and close the subtask.
-<!-- SECTION:PLAN:END -->
-
-## Implementation Notes
-
-<!-- SECTION:NOTES:BEGIN -->
-Assessed five unresolved PR #49 threads after 9ce5de2f. Fixed prerelease workflow cache keys to include `runner.arch`, changed prerelease publishing to validate artifacts before release creation/edit and only undraft after uploads complete, tightened Windows socket matching to require exact argument boundaries, and stopped memoizing null command-line lookup misses in the Win32 cache path.
-
-Stale assessment: the `src/core/services/overlay-shortcut.ts` thread is still obsolete. Current code at `registerOverlayShortcuts()` returns `hasConfiguredOverlayShortcuts(shortcuts)`, not `false`, and the overlay-local handling remains intentionally driven by local fallback dispatch rather than global registration in this runtime path.
-
-Verification: `bun test src/prerelease-workflow.test.ts src/window-trackers/mpv-socket-match.test.ts`, `bun test src/window-trackers/windows-tracker.test.ts src/prerelease-workflow.test.ts src/window-trackers/mpv-socket-match.test.ts`, `bun run typecheck`.
-<!-- SECTION:NOTES:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Handled the next CodeRabbit round on PR #49 by fixing the still-valid prerelease workflow and Windows socket-matching issues while documenting the stale overlay-shortcut comment instead of forcing a no-op code change. The prerelease workflow now scopes all dependency caches by `runner.arch`, validates the final artifact set before touching the GitHub release, creates/edits the prerelease as a draft during uploads, and only flips `--draft=false` after all assets succeed. On Windows, socket matching now requires an exact `--input-ipc-server` argument boundary so `subminer-1` no longer matches `subminer-10`, and transient PowerShell/CIM misses no longer get cached forever as null command lines.
-
-Regression coverage was added for the workflow invariants and exact socket matching. Verification passed with targeted prerelease workflow tests, Windows tracker tests, socket-matcher tests, and `bun run typecheck`.
-<!-- SECTION:FINAL_SUMMARY:END -->

backlog/tasks/task-286.2 - Assess-and-address-PR-49-next-CodeRabbit-review-round.md

@@ -1,49 +0,0 @@
----
-id: TASK-286.2
-title: 'Assess and address PR #49 next CodeRabbit review round'
-status: Done
-assignee: []
-created_date: '2026-04-12 02:50'
-updated_date: '2026-04-12 02:52'
-labels:
-  - bug
-  - code-review
-  - release
-  - testing
-dependencies: []
-references:
-  - .github/workflows/prerelease.yml
-  - src/prerelease-workflow.test.ts
-  - src/core/services/overlay-shortcut.ts
-parent_task_id: TASK-286
-priority: high
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Track the next unresolved CodeRabbit review threads on PR #49 after commit 62ad77dc and resolve the still-valid follow-up issues while documenting stale repeats.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 All still-actionable CodeRabbit comments in the latest PR #49 round are fixed or explicitly shown stale with evidence.
-- [x] #2 Regression coverage is updated for any workflow or test changes made in this round.
-- [x] #3 Relevant verification passes for the touched workflow and prerelease test changes.
-<!-- AC:END -->
-
-## Implementation Notes
-
-<!-- SECTION:NOTES:BEGIN -->
-Assessed latest unresolved CodeRabbit round on PR #49. `src/core/services/overlay-shortcut.ts` comment is stale: `registerOverlayShortcuts()` returns `hasConfiguredOverlayShortcuts(shortcuts)`, so runtime registration is not hard-coded false.
-
-Added exact, line-ending-agnostic prerelease tag trigger assertions in `src/prerelease-workflow.test.ts` and a regression asserting `bun run test:env` sits in the prerelease quality gate before source coverage.
-
-Updated `.github/workflows/prerelease.yml` quality-gate to run `bun run test:env` after `bun run test:fast`.
-<!-- SECTION:NOTES:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Assessed the latest CodeRabbit round for PR #49. Left the `overlay-shortcut.ts` thread open as stale with code evidence, tightened prerelease workflow trigger coverage, and added the missing `test:env` step to the prerelease quality gate. Verification: `bun test src/prerelease-workflow.test.ts`; `bun run typecheck`.
-<!-- SECTION:FINAL_SUMMARY:END -->

backlog/tasks/task-286.3 - Assess-and-address-PR-49-latest-CodeRabbit-review-round.md

@@ -1,48 +0,0 @@
----
-id: TASK-286.3
-title: 'Assess and address PR #49 latest CodeRabbit review round'
-status: Done
-assignee: []
-created_date: '2026-04-12 03:08'
-updated_date: '2026-04-12 03:09'
-labels:
-  - bug
-  - code-review
-  - testing
-dependencies: []
-references:
-  - 'PR #49'
-  - .github/workflows/prerelease.yml
-  - src
-parent_task_id: TASK-286
-priority: high
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Track the newest unresolved CodeRabbit review threads on PR #49 after commit 942c1649, fix the still-valid issues, verify them, and push the branch update.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 All still-actionable CodeRabbit comments in the newest PR #49 round are fixed or explicitly identified stale with evidence.
-- [x] #2 Regression coverage is added or updated for behavior touched in this round.
-- [x] #3 Relevant verification passes before commit and push.
-<!-- AC:END -->
-
-## Implementation Notes
-
-<!-- SECTION:NOTES:BEGIN -->
-Fetched the newest unresolved CodeRabbit threads for PR #49 after commit `942c1649`; only one unresolved actionable thread remained, on prerelease checksum output using repo-relative paths instead of asset basenames.
-
-Added regression coverage in `src/prerelease-workflow.test.ts` and `src/release-workflow.test.ts` asserting checksum generation truncates to asset basenames and no longer writes the raw `sha256sum "${files[@]}" > release/SHA256SUMS.txt` form.
-
-Updated both `.github/workflows/prerelease.yml` and `.github/workflows/release.yml` checksum generation steps to iterate over the `files` array and write `SHA256  basename` lines into `release/SHA256SUMS.txt`.
-<!-- SECTION:NOTES:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Resolved the latest CodeRabbit round for PR #49 by fixing checksum generation to emit basename-oriented `SHA256SUMS.txt` entries in both prerelease and release workflows, with matching regression coverage. Verification: `bun test src/prerelease-workflow.test.ts src/release-workflow.test.ts`; `bun run typecheck`.
-<!-- SECTION:FINAL_SUMMARY:END -->

backlog/tasks/task-287 - Restore-Lua-parser-compatibility-for-mpv-plugin-modules.md

@@ -1,44 +0,0 @@
----
-id: TASK-287
-title: Restore Lua parser compatibility for mpv plugin modules
-status: Done
-assignee: []
-created_date: '2026-04-11 21:25'
-updated_date: '2026-04-11 21:29'
-labels:
-  - bug
-  - mpv-plugin
-  - lua
-dependencies: []
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Users with Lua runtimes that do not accept the current `goto continue` pattern in the mpv plugin should be able to load the plugin without syntax errors. Remove the parser-incompatible control-flow usage from the affected plugin modules without changing plugin behavior.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 The mpv plugin source no longer relies on parser-incompatible `goto continue` labels in the affected Lua modules.
-- [x] #2 Automated coverage fails on the old parser-incompatible source and passes once the compatibility fix is in place.
-- [x] #3 Existing plugin start/gate verification still passes after the compatibility fix.
-<!-- AC:END -->
-
-## Implementation Notes
-
-<!-- SECTION:NOTES:BEGIN -->
-Reused existing local cleanups in `plugin/subminer/hover.lua` and `plugin/subminer/environment.lua` to remove `goto continue` / `::continue::` control flow without behavior changes.
-
-Added `scripts/test-plugin-lua-compat.lua` and wired it into `test:plugin:src`; the regression checks reject the legacy pattern structurally and verify parse success with `luajit` when available.
-
-Verification run on 2026-04-11: `lua scripts/test-plugin-lua-compat.lua` ✅, `bun run test:plugin:src` ✅, `bun run changelog:lint` ✅, `bun run typecheck` ✅, `bun run test:env` ✅, `bun run build` ✅, `bun run test:smoke:dist` ✅.
-
-`bun run test:fast` remains red for unrelated existing immersion-tracker assertions in `src/core/services/immersion-tracker/__tests__/query-split-modules.test.ts` and `src/core/services/immersion-tracker/__tests__/query.test.ts` (`tsMs`/`lastWatchedMs` observed as `-2147483648`).
-<!-- SECTION:NOTES:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Removed parser-incompatible `goto continue` usage from the affected mpv Lua plugin modules, added a dedicated Lua compatibility regression script to the plugin test lane, and added a changelog fragment for the user-visible fix. Requested plugin verification is green; unrelated existing `test:fast` immersion-tracker failures remain outside this task.
-<!-- SECTION:FINAL_SUMMARY:END -->

backlog/tasks/task-288 - Stabilize-immersion-tracker-CI-timestamp-handling-under-libsql-Bun.md

@@ -1,42 +0,0 @@
----
-id: TASK-288
-title: Stabilize immersion-tracker CI timestamp handling under libsql/Bun
-status: Done
-assignee: []
-created_date: '2026-04-11 21:34'
-updated_date: '2026-04-11 21:43'
-labels:
-  - bug
-  - ci
-  - immersion-tracker
-dependencies: []
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-`bun run test:fast` is currently failing because large millisecond timestamps are not handled safely through the libsql/Bun path. Fix timestamp parsing/storage so lifetime/library and session-event queries return correct wall-clock values in CI and runtime.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 Large wall-clock timestamps round-trip correctly through immersion-tracker lifetime/library queries under the repo's Bun/libsql runtime.
-- [x] #2 Session-event timestamps round-trip correctly for real wall-clock values used by runtime event inserts.
-- [x] #3 Targeted immersion-tracker regression coverage passes, and the previously failing `test:fast` lane no longer fails on these timestamp assertions.
-<!-- AC:END -->
-
-## Implementation Notes
-
-<!-- SECTION:NOTES:BEGIN -->
-Root cause split in two places: Bun/libsql corrupts large millisecond timestamp strings when coerced through `Number(...)`, and `imm_session_events.ts_ms` being `INTEGER` let runtime event inserts/readbacks return `-2147483648` on CI/runtime.
-
-Fix shipped by parsing timestamp strings without the broken `Number(largeString)` path, migrating `imm_session_events.ts_ms` to `TEXT`, ordering/retention queries via `CAST(ts_ms AS REAL)`, and avoiding `Number(currentMs)` when reusing already-normalized timestamp strings.
-
-Added regression coverage for both real runtime event inserts and schema migration/repair of previously truncated session-event rows.
-<!-- SECTION:NOTES:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Fixed immersion-tracker timestamp handling under Bun/libsql so large wall-clock millisecond values survive runtime writes, query reads, and schema migration. `bun run test:fast`, `bun run typecheck`, `bun run test:env`, `bun run build`, `bun run test:smoke:dist`, and `bun run changelog:lint` all pass after the patch.
-<!-- SECTION:FINAL_SUMMARY:END -->

backlog/tasks/task-289 - Finish-current-windows-qol-rebase.md

@@ -1,33 +0,0 @@
----
-id: TASK-289
-title: Finish current windows-qol rebase
-status: Done
-assignee: []
-created_date: '2026-04-11 22:07'
-updated_date: '2026-04-11 22:08'
-labels:
-  - maintenance
-  - rebase
-dependencies: []
-references:
-  - /home/sudacode/projects/japanese/SubMiner
-priority: medium
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Resolve the in-progress rebase on `windows-qol` and ensure the branch lands cleanly.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 Interactive rebase completes without conflicts.
-- [x] #2 Working tree is clean after the rebase finishes.
-<!-- AC:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Completed the interactive rebase on `windows-qol` and resolved the transient editor-blocked `git rebase --continue` step. Branch now rebased cleanly onto `49e46e6b`.
-<!-- SECTION:FINAL_SUMMARY:END -->

backlog/tasks/task-290 - Cut-stable-release-v0.12.0-on-main.md

@@ -1,56 +0,0 @@
----
-id: TASK-290
-title: Cut stable release v0.12.0 on main
-status: Done
-assignee:
-  - codex
-created_date: '2026-04-12 04:47'
-updated_date: '2026-04-12 04:51'
-labels: []
-dependencies: []
-documentation:
-  - docs/RELEASING.md
-priority: high
----
-
-## Description
-
-<!-- SECTION:DESCRIPTION:BEGIN -->
-Prepare the main branch for the stable SubMiner v0.12.0 release by applying the release-version updates, formatting changes required by the branch state, and rerunning the full release verification gate.
-<!-- SECTION:DESCRIPTION:END -->
-
-## Acceptance Criteria
-<!-- AC:BEGIN -->
-- [x] #1 Main branch version and stable release metadata are updated for v0.12.0.
-- [x] #2 Required formatting changes for the release candidate tree are applied and verified.
-- [x] #3 The documented release verification gate passes locally and any remaining push or tag prerequisites are documented.
-<!-- AC:END -->
-
-## Implementation Plan
-
-<!-- SECTION:PLAN:BEGIN -->
-1. Audit main-branch release state: package version, release artifacts, current CI status, and current formatting debt.
-2. Apply required formatting fixes to the files reported by `bun run format:check:src` and verify the formatting lane passes.
-3. Update the package version to 0.12.0 and generate stable release metadata (`CHANGELOG.md`, `release/release-notes.md`, `docs-site/changelog.md`) using the documented release workflow.
-4. Run the full local release gate on main (`changelog:lint`, `changelog:check --version 0.12.0`, `verify:config-example`, `typecheck`, `test:fast`, `test:env`, `build`, `docs:test`, `docs:build`, plus dist smoke) and document any remaining tag/push prerequisites.
-<!-- SECTION:PLAN:END -->
-
-## Implementation Notes
-
-<!-- SECTION:NOTES:BEGIN -->
-Applied Prettier to all 39 files reported by `bun run format:check:src` on main and verified the formatting lane now passes.
-
-Reapplied the stable changelog build entrypoint fix on main: added `writeStableReleaseArtifacts`, covered it with a focused regression test, and updated `package.json` so `changelog:build` forwards `--version` and `--date` through a single `build-release` command.
-
-Verified the formatted mainline release tree with `bun run changelog:lint`, `bun run changelog:check --version 0.12.0`, `bun run verify:config-example`, `bun run typecheck`, `bun run test:fast`, `bun run test:env`, `bun run build`, `bun run docs:test`, `bun run docs:build`, and `bun run test:smoke:dist`; all passed.
-
-Remote main CI also completed successfully for `Windows update (#49)` after the local release-prep pass. Remaining operational steps are commit/tag/push only.
-<!-- SECTION:NOTES:END -->
-
-## Final Summary
-
-<!-- SECTION:FINAL_SUMMARY:BEGIN -->
-Prepared `main` for the stable `v0.12.0` cut. Formatted the previously failing source files so `bun run format:check:src` is now clean, bumped `package.json` from `0.12.0-beta.3` to `0.12.0`, and generated the stable release artifacts with the explicit local cut date `2026-04-11`, which consumed the pending changelog fragments into `CHANGELOG.md`, `docs-site/changelog.md`, and `release/release-notes.md`.
-
-Also reintroduced the release-script fix on main: the old `changelog:build` package script still used `build && docs`, which can drop `--version/--date` on the first step. Added a focused regression test in `scripts/build-changelog.test.ts`, implemented `writeStableReleaseArtifacts` in `scripts/build-changelog.ts`, and switched `package.json` to `build-release` so release flags propagate correctly. Verification on the final tree passed for formatting, changelog lint/check, config example verification, typecheck, fast tests, env tests, build, docs tests/build, dist smoke, and remote main CI. The branch is release-ready pending commit, tag, and push.
-<!-- SECTION:FINAL_SUMMARY:END -->

bun.lock

@@ -12,7 +12,6 @@
         "commander": "^14.0.3",
         "hono": "^4.12.7",
         "jsonc-parser": "^3.3.1",
-        "koffi": "^2.15.6",
         "libsql": "^0.5.22",
         "ws": "^8.19.0",
       },
@@ -479,8 +478,6 @@
 
     "keyv": ["keyv@4.5.4", "", { "dependencies": { "json-buffer": "3.0.1" } }, "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="],
 
-    "koffi": ["koffi@2.15.6", "", {}, "sha512-WQBpM5uo74UQ17UpsFN+PUOrQQg4/nYdey4SGVluQun2drYYfePziLLWdSmFb4wSdWlJC1aimXQnjhPCheRKuw=="],
-
     "lazy-val": ["lazy-val@1.0.5", "", {}, "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="],
 
     "libsql": ["libsql@0.5.28", "", { "dependencies": { "@neon-rs/load": "^0.0.4", "detect-libc": "2.0.2" }, "optionalDependencies": { "@libsql/darwin-arm64": "0.5.28", "@libsql/darwin-x64": "0.5.28", "@libsql/linux-arm-gnueabihf": "0.5.28", "@libsql/linux-arm-musleabihf": "0.5.28", "@libsql/linux-arm64-gnu": "0.5.28", "@libsql/linux-arm64-musl": "0.5.28", "@libsql/linux-x64-gnu": "0.5.28", "@libsql/linux-x64-musl": "0.5.28", "@libsql/win32-x64-msvc": "0.5.28" }, "os": [ "linux", "win32", "darwin", ], "cpu": [ "arm", "x64", "arm64", ] }, "sha512-wKqx9FgtPcKHdPfR/Kfm0gejsnbuf8zV+ESPmltFvsq5uXwdeN9fsWn611DmqrdXj1e94NkARcMA2f1syiAqOg=="],

changes/2026-04-09-prerelease-workflow.md

@@ -0,0 +1,5 @@
+type: internal
+area: release
+
+- Added a dedicated beta/rc prerelease GitHub Actions workflow that publishes GitHub prereleases without consuming pending changelog fragments or updating AUR.
+- Added prerelease note generation so beta and release-candidate tags can reuse the current pending `changes/*.md` fragments while leaving stable changelog publication for the final release cut.

changes/fix-overlay-subtitle-drop-routing.md

@@ -0,0 +1,4 @@
+type: fixed
+area: overlay
+
+- Fixed overlay drag-and-drop routing so dropping external subtitle files like `.ass` onto mpv still loads them when the overlay is visible.

changes/fix-yomitan-nested-popup-focus.md

@@ -0,0 +1,4 @@
+type: fixed
+area: overlay
+
+- Fixed Windows Yomitan popup focus loss after closing nested lookups so the original popup stays interactive instead of falling through to mpv.

config.example.jsonc

@@ -173,11 +173,7 @@
     "toggleSecondarySub": "CommandOrControl+Shift+V", // Toggle secondary sub setting.
     "markAudioCard": "CommandOrControl+Shift+A", // Mark audio card setting.
     "openRuntimeOptions": "CommandOrControl+Shift+O", // Open runtime options setting.
-    "openJimaku": "Ctrl+Shift+J", // Open jimaku setting.
-    "openSessionHelp": "CommandOrControl+Shift+H", // Open session help setting.
-    "openControllerSelect": "Alt+C", // Open controller select setting.
-    "openControllerDebug": "Alt+Shift+C", // Open controller debug setting.
-    "toggleSubtitleSidebar": "Backslash" // Toggle subtitle sidebar setting.
+    "openJimaku": "Ctrl+Shift+J" // Open jimaku setting.
   }, // Overlay keyboard shortcuts. Set a shortcut to null to disable.
 
   // ==========================================

docs-site/changelog.md

@@ -1,49 +1,6 @@
 # Changelog
 
-## v0.12.0 (2026-04-11)
-
-**Changed**
-- Overlay: Added configurable overlay shortcuts for session help, controller select, and controller debug actions.
-- Overlay: Added mpv/plugin and CLI routing for session help, controller utilities, and subtitle sidebar toggling through the shared session-action path.
-- Overlay: Improved dedicated overlay modal retry and focus handling for runtime options, Jimaku, session help, controller tools, and the playlist browser.
-- Overlay: Fixed controller configuration and controller debug shortcut opens so configured bindings bring up their modals again instead of tripping renderer recovery.
-- Stats: Sessions are rolled up per episode within each day, with a bulk delete that wipes every session in the group.
-- Stats: Trends add a 365-day range next to the existing 7d/30d/90d/all options.
-- Stats: Library detail view gets a delete-episode action that removes the video and all its sessions.
-- Stats: Vocabulary Top 50 tightens the word/reading column so katakana entries no longer push the scores off screen.
-- Stats: Episode detail hides card events whose Anki notes have been deleted, instead of showing phantom mining activity.
-- Stats: Trend and watch-time charts share a unified theme with horizontal gridlines and larger ticks for legibility.
-- Stats: Overview, Library, Trends, Sessions, and Vocabulary now use generic "title" wording so YouTube videos and anime live comfortably side by side in the dashboard.
-- Stats: Session timeline no longer plots seek-forward/seek-backward markers — they were too noisy on sessions with lots of rewinds.
-- Stats: Replaced the "Library — Per Day" section on the Stats → Trends page with a "Library — Summary" section. The new section shows a top-10 watch-time leaderboard chart and a sortable per-title table (watch time, videos, sessions, cards, words, lookups, lookups/100w, date range), all scoped to the current date range selector.
-
-**Fixed**
-- Overlay: Fixed overlay drag-and-drop routing so dropping external subtitle files like `.ass` onto mpv still loads them when the overlay is visible.
-- Overlay: Addressed the latest CodeRabbit follow-ups on PR #49, including generation-scoped Lua session binding names, stricter session command validation, session-help shortcut visibility, the numeric-selection key guard, stats-overlay startup classification, and safer session-binding persistence.
-- Overlay: Addressed the latest CodeRabbit follow-ups on the Windows overlay flow, including exact mpv target resolution, lower-overlay helper arguments, Win32 failure detection, and overlay cleanup on tracker loss.
-- Overlay: Fixed Windows overlay z-order so the visible subtitle overlay stops staying above unrelated apps after mpv loses focus.
-- Overlay: Fixed Windows overlay tracking to use native window polling and owner/z-order binding, which keeps the subtitle overlay aligned to the active mpv window more reliably.
-- Overlay: Fixed Windows overlay hide/restore behavior so minimizing mpv immediately hides the overlay and restoring mpv brings it back on top of the mpv window without requiring a click.
-- Overlay: Fixed stats overlay layering so the in-player stats page now stays above mpv and the subtitle overlay while it is open.
-- Overlay: Fixed Windows subtitle overlay stability so transient tracker misses and restore events keep the current subtitle visible instead of waiting for the next subtitle line.
-- Overlay: Fixed Windows focus handoff from the interactive subtitle overlay back to mpv so the overlay no longer drops behind mpv and briefly disappears.
-- Overlay: Fixed Windows visible-overlay startup so it no longer briefly opens as an interactive or opaque surface before the tracked transparent overlay state settles.
-- Overlay: Fixed spurious auto-pause after overlay visibility recovery and window resize so the overlay no longer pauses mpv until the pointer genuinely re-enters the subtitle area.
-- Overlay: Fixed Windows secondary subtitle hover mode so the expanded hover hit area no longer blocks the native minimize, maximize, and close buttons.
-- Overlay: Fixed Windows Yomitan popup focus loss after closing nested lookups so the original popup stays interactive instead of falling through to mpv.
-- Stats: Fixed immersion-tracker timestamp handling under Bun/libsql so library rows, session timelines, and lifetime summaries keep real wall-clock millisecond values instead of truncating to invalid negative timestamps.
-- Mpv Plugin: Fixed the mpv Lua plugin so hover and environment modules no longer use the `goto continue` pattern that can fail to parse on some user Lua runtimes.
-
-**Internal**
-- Release: Added a dedicated beta/rc prerelease GitHub Actions workflow that publishes GitHub prereleases without consuming pending changelog fragments or updating AUR.
-- Release: Added prerelease note generation so beta and release-candidate tags can reuse the current pending `changes/*.md` fragments while leaving stable changelog publication for the final release cut.
-
-## Previous Versions
-
-<details>
-<summary>v0.11.x</summary>
-
-<h2>v0.11.2 (2026-04-07)</h2>
+## v0.11.2 (2026-04-07)
 
 **Changed**
 - Launcher: Replaced the launcher-only fullscreen toggle with `mpv.launchMode` so SubMiner-managed mpv playback can start in normal, maximized, or fullscreen mode.
@@ -53,13 +10,13 @@
 - Launcher: Local playback now promotes a single unlabeled external subtitle sidecar to the primary slot instead of leaving mpv's embedded English auto-selection in place.
 - Release: Fixed Linux AppImage startup packaging so Chromium child relaunches can resolve the bundled `libffmpeg.so` instead of crash-looping on startup.
 
-<h2>v0.11.1 (2026-04-04)</h2>
+## v0.11.1 (2026-04-04)
 
 **Fixed**
 - Release: Linux packaged builds now expose the canonical `SubMiner` app identity to Electron's startup metadata so native Wayland compositors stop reporting the window class/app-id as lowercase `subminer`.
 - Linux: Linux now restores the runtime options, Jimaku, and Subsync shortcuts after the Electron 39 regression by routing those actions through the overlay's mpv/IPC shortcut path.
 
-<h2>v0.11.0 (2026-04-03)</h2>
+## v0.11.0 (2026-04-03)
 
 **Added**
 - Overlay: Added a playlist browser overlay modal for browsing sibling video files and the live mpv queue during playback.
@@ -112,7 +69,7 @@
 - Release: Kept GitHub Releases green when AUR publish flakes and needs manual follow-up.
 - Release: Updated Electron to 39.8.6 and pinned patched transitive build dependencies to clear the reported high-severity audit findings.
 
-</details>
+## Previous Versions
 
 <details>
 <summary>v0.10.x</summary>

docs-site/configuration.md

@@ -536,11 +536,7 @@ See `config.example.jsonc` for detailed configuration options.
     "mineSentenceMultiple": "CommandOrControl+Shift+S",
     "markAudioCard": "CommandOrControl+Shift+A",
     "openRuntimeOptions": "CommandOrControl+Shift+O",
-    "openSessionHelp": "CommandOrControl+Shift+H",
-    "openControllerSelect": "Alt+C",
-    "openControllerDebug": "Alt+Shift+C",
     "openJimaku": "Ctrl+Shift+J",
-    "toggleSubtitleSidebar": "Backslash",
     "multiCopyTimeoutMs": 3000
   }
 }
@@ -560,11 +556,7 @@ See `config.example.jsonc` for detailed configuration options.
 | `toggleSecondarySub`          | string \| `null` | Accelerator for cycling secondary subtitle mode (default: `"CommandOrControl+Shift+V"`)                                                       |
 | `markAudioCard`               | string \| `null` | Accelerator for marking last card as audio card (default: `"CommandOrControl+Shift+A"`)                                                       |
 | `openRuntimeOptions`          | string \| `null` | Opens runtime options palette for live session-only toggles (default: `"CommandOrControl+Shift+O"`)                                           |
-| `openSessionHelp`             | string \| `null` | Opens the in-overlay session help modal (default: `"CommandOrControl+Shift+H"`)                                                               |
-| `openControllerSelect`        | string \| `null` | Opens the controller config/remap modal (default: `"Alt+C"`)                                                                                   |
-| `openControllerDebug`         | string \| `null` | Opens the controller debug modal (default: `"Alt+Shift+C"`)                                                                                    |
 | `openJimaku`                  | string \| `null` | Opens the Jimaku search modal (default: `"Ctrl+Shift+J"`)                                                                                     |
-| `toggleSubtitleSidebar`       | string \| `null` | Dispatches the subtitle sidebar toggle action (default: `"Backslash"`). `subtitleSidebar.toggleKey` remains the primary bare-key setting.     |
 
 **See `config.example.jsonc`** for the complete list of shortcut configuration options.
 
@@ -581,10 +573,9 @@ Important behavior:
 - Controller input is only active while keyboard-only mode is enabled.
 - Keyboard-only mode continues to work normally without a controller.
 - By default SubMiner uses the first connected controller.
-- `Alt+C` opens the controller config modal by default, and you can remap that shortcut through `shortcuts.openControllerSelect`.
+- `Alt+C` opens the controller config modal, where you can save the selected controller and remap actions inline.
 - Click `Learn`, then press the next fresh button, trigger, or stick direction you want to bind for that overlay action.
-- `Alt+Shift+C` opens the debug modal by default, and you can remap that shortcut through `shortcuts.openControllerDebug`.
-- The debug modal shows raw axes/button values plus a ready-to-copy `buttonIndices` config block.
+- `Alt+Shift+C` opens a live debug modal showing raw axes/button values plus a ready-to-copy `buttonIndices` config block.
 - `controller.buttonIndices` is a semantic reference/legacy mapping. Changing it does not rewrite the raw numeric descriptor values already stored under `controller.bindings`.
 - Turning keyboard-only mode off clears the keyboard-only token highlight state.
 - Closing the Yomitan popup clears the temporary native text-selection fill, but keeps controller token selection active.
@@ -703,7 +694,7 @@ These shortcuts are only active when the overlay window is visible and automatic
 
 ### Session Help Modal
 
-The session help modal opens from the overlay with `Ctrl/Cmd+Shift+H` by default. The mpv plugin also exposes it through the `Y-H` chord (falling back to `Y-K` if needed). It shows the current session keybindings and color legend.
+The session help modal is opened with `Y-H` by default (falls back to `Y-K` if needed) and shows the current session keybindings and color legend.
 
 You can filter the modal quickly with `/`:
 

docs-site/public/config.example.jsonc

@@ -173,11 +173,7 @@
     "toggleSecondarySub": "CommandOrControl+Shift+V", // Toggle secondary sub setting.
     "markAudioCard": "CommandOrControl+Shift+A", // Mark audio card setting.
     "openRuntimeOptions": "CommandOrControl+Shift+O", // Open runtime options setting.
-    "openJimaku": "Ctrl+Shift+J", // Open jimaku setting.
-    "openSessionHelp": "CommandOrControl+Shift+H", // Open session help setting.
-    "openControllerSelect": "Alt+C", // Open controller select setting.
-    "openControllerDebug": "Alt+Shift+C", // Open controller debug setting.
-    "toggleSubtitleSidebar": "Backslash" // Toggle subtitle sidebar setting.
+    "openJimaku": "Ctrl+Shift+J" // Open jimaku setting.
   }, // Overlay keyboard shortcuts. Set a shortcut to null to disable.
 
   // ==========================================

docs-site/shortcuts.md

@@ -67,7 +67,6 @@ Mouse-hover playback behavior is configured separately from shortcuts: `subtitle
 | ------------------ | -------------------------------------------------------- | ------------------------------ |
 | `Ctrl/Cmd+Shift+V` | Cycle secondary subtitle mode (hidden → visible → hover) | `shortcuts.toggleSecondarySub` |
 | `Ctrl/Cmd+Shift+O` | Open runtime options palette                             | `shortcuts.openRuntimeOptions` |
-| `Ctrl/Cmd+Shift+H` | Open session help modal                                  | `shortcuts.openSessionHelp`    |
 | `Ctrl+Shift+J`     | Open Jimaku subtitle search modal                        | `shortcuts.openJimaku`         |
 | `Ctrl+Alt+C`       | Open the manual YouTube subtitle picker                  | `keybindings`                  |
 | `Ctrl+Alt+S`       | Open subtitle sync (subsync) modal                       | `shortcuts.triggerSubsync`     |
@@ -80,12 +79,12 @@ The subtitle sidebar toggle is overlay-local and only opens when SubMiner has a
 
 ## Controller Shortcuts
 
-These overlay-local shortcuts open controller utilities for the Chrome Gamepad API integration.
+These overlay-local shortcuts are fixed and open controller utilities for the Chrome Gamepad API integration.
 
-| Shortcut      | Action                               | Configurable                     |
-| ------------- | ------------------------------------ | -------------------------------- |
-| `Alt+C`       | Open controller config + remap modal | `shortcuts.openControllerSelect` |
-| `Alt+Shift+C` | Open controller debug modal          | `shortcuts.openControllerDebug`  |
+| Shortcut      | Action                         | Configurable |
+| ------------- | ------------------------------ | ------------ |
+| `Alt+C`       | Open controller config + remap modal | Fixed        |
+| `Alt+Shift+C` | Open controller debug modal          | Fixed        |
 
 Controller input only drives the overlay while keyboard-only mode is enabled. The controller mapping and tuning live under the top-level `controller` config block; keyboard-only mode still works normally without a controller.
 
@@ -102,7 +101,6 @@ When the mpv plugin is installed, all commands use a `y` chord prefix — press
 | `y-o` | Open Yomitan settings    |
 | `y-r` | Restart overlay          |
 | `y-c` | Check overlay status     |
-| `y-h` | Open session help        |
 
 When the overlay has focus, press `y` then `d` to toggle DevTools (debugging helper).
 

docs-site/usage.md

@@ -272,12 +272,12 @@ SubMiner supports gamepad/controller input for couch-friendly usage via the Chro
 
 1. Connect a controller before or after launching SubMiner.
 2. Enable keyboard-only mode — press `Y` on the controller (default binding) or use the overlay keybinding.
-3. Press `Alt+C` in the overlay by default to pick the controller you want to save and remap any action inline.
+3. Press `Alt+C` in the overlay to pick the controller you want to save and remap any action inline.
 4. Click `Learn` on the overlay action you want, then press the matching button, trigger, or stick direction on the controller.
 5. Use the left stick to navigate subtitle tokens and scroll the popup; use the right stick vertically for popup page jumps.
 6. Press `A` to look up the selected word, `X` to mine a card, `B` to close the popup.
 
-By default SubMiner uses the first connected controller. `Alt+C` opens the controller config modal, where you can save the preferred controller and remap bindings inline, and `Alt+Shift+C` opens the live debug modal with raw axes/button values for non-standard pads. Both shortcuts can be changed through `shortcuts.openControllerSelect` and `shortcuts.openControllerDebug`.
+By default SubMiner uses the first connected controller. `Alt+C` opens the controller config modal, where you can save the preferred controller and remap bindings inline. `Alt+Shift+C` still opens the live debug modal with raw axes/button values for non-standard pads.
 
 ### Default Button Mapping
 
@@ -321,8 +321,6 @@ See [Keyboard Shortcuts](/shortcuts) for the full reference, including mining sh
 
 Useful overlay-local default keybinding: `Ctrl+Alt+P` opens the playlist browser for the current video's parent directory and the live mpv queue so you can append, reorder, remove, or jump between episodes without leaving playback.
 
-`Ctrl/Cmd+Shift+H` opens the session help modal with the current overlay and mpv keybindings. If you use the mpv plugin, the same help view is also available through the `y-h` chord.
-
 Hovering over subtitle text pauses mpv by default; leaving resumes it. Yomitan popups also pause playback by default. Set `subtitleStyle.autoPauseVideoOnHover: false` or `subtitleStyle.autoPauseVideoOnYomitanPopup: false` to disable either behavior.
 
 ### Drag-and-Drop

docs/superpowers/specs/2026-04-09-library-summary-replaces-per-day-design.md

@@ -1,184 +0,0 @@
-# Library Summary Replaces Per-Day Trends — Design
-
-**Status:** Draft
-**Date:** 2026-04-09
-**Scope:** `stats/` frontend, `src/core/services/immersion-tracker/query-trends.ts` backend
-
-## Problem
-
-The "Library — Per Day" section on the stats Trends tab (`stats/src/components/trends/TrendsTab.tsx:224-254`) renders six stacked-area charts — Videos, Watch Time, Cards, Words, Lookups, and Lookups/100w, each broken down per title per day.
-
-In practice these charts are not useful:
-
-- Most titles only have activity on one or two days in a window, so they render as isolated bumps on a noisy baseline.
-- Stacking 7+ titles with mostly-zero days makes individual lines hard to follow.
-- The top "Activity" and "Period Trends" sections already answer "what am I doing per day" globally.
-- The "Library — Cumulative" section directly below already answers "which titles am I progressing through" with less noise.
-
-The per-day section occupies significant vertical space without carrying its weight, and the user has confirmed it should be replaced.
-
-## Goal
-
-Replace the six per-day stacked charts with a single "Library — Summary" section that surfaces per-title aggregate statistics over the selected date range. The new view should make it trivially easy to answer: "For the selected window, which titles am I spending time on, how much mining output have they produced, and how efficient is my lookup rate on each?"
-
-## Non-goals
-
-- Changing the "Library — Cumulative" section (stays as-is).
-- Changing the "Activity", "Period Trends", or "Patterns" sections.
-- Adding a new API endpoint — the existing dashboard endpoint is extended in place.
-- Renaming internal `anime*` data-model identifiers (`animeId`, `imm_anime`, etc.). Those stay per the convention established in `c5e778d7`; only new fields/types/user-visible strings use generic "title"/"library" wording.
-- Supporting a true all-time library view on the Trends tab. If that's ever wanted, it belongs on a different tab.
-
-## Solution Overview
-
-Delete the "Library — Per Day" section. In its place, add "Library — Summary", composed of:
-
-1. A horizontal-bar leaderboard chart of watch time per title (top 10, descending).
-2. A sortable table of every title with activity in the selected window, with columns: Title, Watch Time, Videos, Sessions, Cards, Words, Lookups, Lookups/100w, Date Range.
-
-Both controls are scoped to the top-of-page date range selector. The existing shared Anime Visibility filter continues to work — it now gates Summary + Cumulative instead of Per-Day + Cumulative.
-
-## Backend
-
-### New type
-
-Add to `stats/src/types/stats.ts` and the backend query module:
-
-```ts
-type LibrarySummaryRow = {
-  title: string;              // display title — anime series, YouTube video title, etc.
-  watchTimeMin: number;       // sum(total_active_min) across the window
-  videos: number;             // distinct video_id count
-  sessions: number;           // session count from imm_sessions
-  cards: number;              // sum(total_cards)
-  words: number;              // sum(total_tokens_seen)
-  lookups: number;            // sum(lookup_count) from imm_sessions
-  lookupsPerHundred: number | null; // lookups / words * 100, null when words == 0
-  firstWatched: number;       // min(rollup_day) as epoch day, within the window
-  lastWatched: number;        // max(rollup_day) as epoch day, within the window
-};
-```
-
-### Query changes in `src/core/services/immersion-tracker/query-trends.ts`
-
-- Add `librarySummary: LibrarySummaryRow[]` to `TrendsDashboardQueryResult`.
-- Populate it from a single aggregating query over `imm_daily_rollups` joined to `imm_videos` → `imm_anime`, filtered by `rollup_day` within the selected window. Session count and lookup count come from `imm_sessions` aggregated by `video_id` and then grouped by the parent library entry. Use a single query (or at most two joined/unioned) — no N+1.
-- `imm_anime` is the generic library-grouping table; anime series, YouTube videos, and yt-dlp imports all land there. The internal table name stays `imm_anime`; only the new field uses generic naming.
-- Return rows pre-sorted by `watchTimeMin` descending so the leaderboard is zero-cost and the table default sort matches.
-- Emit `lookupsPerHundred: null` when `words == 0`.
-
-### Removed from API response
-
-Drop the entire `animePerDay` field from `TrendsDashboardQueryResult` (both backend in `src/core/services/immersion-tracker/query-trends.ts` and frontend in `stats/src/types/stats.ts`).
-
-Internally, the existing helpers (`buildPerAnimeFromDailyRollups`, `buildEpisodesPerAnimeFromDailyRollups`) are still used as intermediates to build `animeCumulative.*` via `buildCumulativePerAnime`. Keep those helpers — just scope their output to local variables inside `getTrendsDashboard` instead of exposing them on the response. The `buildPerAnimeFromSessions` call for lookups and the `buildLookupsPerHundredPerAnime` helper become unused and can be deleted.
-
-Before removing `animePerDay` from the frontend type, verify no other file under `stats/src/` references it. Based on current inspection, only `TrendsTab.tsx` and `stats/src/types/stats.ts` touch it.
-
-## Frontend
-
-### New component: `stats/src/components/trends/LibrarySummarySection.tsx`
-
-Owns the header, leaderboard chart, visibility-filtered data, and the table. Keeps `TrendsTab.tsx` from growing. Component props: `{ rows: LibrarySummaryRow[]; hiddenTitles: ReadonlySet<string>; windowStart: Date; windowEnd: Date }`.
-
-Internal state: `useState<{ column: ColumnId; direction: 'asc' | 'desc' }>` for sort, defaulting to `{ column: 'watchTimeMin', direction: 'desc' }`.
-
-### Layout
-
-Replaces `TrendsTab.tsx:224-254`:
-
-```
-[SectionHeader: "Library — Summary"]
-[AnimeVisibilityFilter — unchanged, shared with Cumulative below]
-[Card, col-span-full: Leaderboard — horizontal bar chart, ~260px tall]
-[Card, col-span-full: Sortable table, auto height up to ~480px with internal scroll]
-```
-
-Both cards use the existing chart/card wrapper styling.
-
-### Leaderboard chart
-
-- Recharts horizontal bar chart (matches the rest of the page — existing charts use `recharts`, not ECharts).
-- Top 10 titles by watch time. If fewer titles have activity, render what's there.
-- Y-axis: title (category), truncated with ellipsis at container width; full title visible in the Recharts tooltip.
-- X-axis: minutes (number).
-- Use `layout="vertical"` with `YAxis dataKey="title" type="category"` and `XAxis type="number"`.
-- Single series color: `#8aadf4` (matching the existing Watch Time color).
-- Reuse `CHART_DEFAULTS`, `CHART_THEME`, `TOOLTIP_CONTENT_STYLE` from `stats/src/lib/chart-theme.ts` so theming matches the rest of the dashboard.
-- Chart order is fixed at watch-time desc regardless of table sort — the leaderboard's meaning is fixed.
-
-### Table
-
-- Plain HTML `<table>` with Tailwind classes. No new deps.
-- Columns, in order:
-  1. **Title** — left-aligned, sticky, truncated with ellipsis, full title on hover.
-  2. **Watch Time** — formatted `Xh Ym` when ≥60 min, else `Xm`.
-  3. **Videos** — integer.
-  4. **Sessions** — integer.
-  5. **Cards** — integer.
-  6. **Words** — integer.
-  7. **Lookups** — integer.
-  8. **Lookups/100w** — one decimal place, `—` when null.
-  9. **Date Range** — `Mon D → Mon D` using the title's `firstWatched` / `lastWatched` within the window.
-- Click a column header to sort; click again to reverse. Visual arrow on the active column.
-- Numeric columns right-aligned.
-- Null `lookupsPerHundred` sorts as the lowest value in both directions (consistent with "no data").
-- Row hover highlight; no row click action (read-only view).
-- Empty state: "No library activity in the selected window."
-
-### Visibility filter integration
-
-Hiding a title via `AnimeVisibilityFilter` removes it from both the leaderboard and the table. The filter's set of available titles is built from the union of titles that appear in `librarySummary` and the existing `animeCumulative.*` arrays (matches current behavior in `buildAnimeVisibilityOptions`).
-
-### `TrendsTab.tsx` changes
-
-- Remove the `filteredEpisodesPerAnime`, `filteredWatchTimePerAnime`, `filteredCardsPerAnime`, `filteredWordsPerAnime`, `filteredLookupsPerAnime`, `filteredLookupsPerHundredPerAnime` locals.
-- Remove the six `<StackedTrendChart>` calls in the "Library — Per Day" section.
-- Remove the `<SectionHeader>Library — Per Day</SectionHeader>` and the `<AnimeVisibilityFilter>` from that position.
-- Insert `<SectionHeader>Library — Summary</SectionHeader>` + `<AnimeVisibilityFilter>` + `<LibrarySummarySection>` in the same place.
-- Update `buildAnimeVisibilityOptions` input to use `librarySummary` titles instead of the six dropped `animePerDay.*` arrays.
-
-## Data flow
-
-1. `useTrends(range, groupBy)` calls `/api/stats/trends/dashboard`.
-2. Response now includes `librarySummary` (sorted by watch time desc).
-3. `TrendsTab` holds the shared `hiddenAnime` set (unchanged).
-4. `LibrarySummarySection` receives `librarySummary` + `hiddenAnime`, filters out hidden rows, renders the leaderboard from the top-10 slice of the filtered list, renders the table from the filtered list with local sort state applied.
-5. Date-range selector changes trigger a new fetch; `groupBy` toggle does not affect the summary section (it's always window-total).
-
-## Edge cases
-
-- **No activity in window:** Section renders header + empty-state card. Leaderboard card hidden. Visibility filter hidden.
-- **One title only:** Leaderboard renders a single bar; table renders one row. No special-casing.
-- **Title with zero words but non-zero lookups:** `lookupsPerHundred` is `null`, rendered as `—`. Sort treats null as lowest.
-- **Title with zero cards/lookups/words but non-zero watch time:** Normal zero rendering, still shown.
-- **Very long titles:** Ellipsis in chart y-axis labels and table title column; full title in `title` attribute / ECharts tooltip.
-- **Mixed sources (anime + YouTube):** No special case — both land in `imm_anime` and are grouped uniformly.
-
-## Testing
-
-### Backend (`query-trends.ts`)
-
-New unit tests, following the existing pattern:
-
-1. Empty window returns `librarySummary: []`.
-2. Single title with a few rollups: all aggregates are correct; `firstWatched`/`lastWatched` match the bounding days within the window.
-3. Multiple titles: rows returned sorted by watch time desc.
-4. Mixed sources (anime-style + YouTube-style entries in `imm_anime`): both appear in the summary with their own aggregates.
-5. Title with `words == 0`: `lookupsPerHundred` is `null`.
-6. Date range excludes some rollups: excluded rollups are not counted; `firstWatched`/`lastWatched` reflect only within-window activity.
-7. `sessions` and `lookups` come from `imm_sessions`, not `imm_daily_rollups`, and are correctly attributed to the parent library entry.
-
-### Frontend
-
-- Existing Trends tab smoke test should continue to pass after wiring.
-- Optional: a targeted render test for `LibrarySummarySection` (empty state, single title, sort toggle, visibility filter interaction). Not required for merge if the smoke test exercises the happy path.
-
-## Release / docs
-
-- One fragment in `changes/*.md` summarizing the replacement.
-- No user-facing docs (`docs-site/`) changes unless the per-day section was documented there — verify during implementation.
-
-## Open items
-
-None.

docs/superpowers/specs/2026-04-09-stats-dashboard-feedback-pass-design.md

@@ -1,347 +0,0 @@
-# Stats Dashboard Feedback Pass — Design
-
-Date: 2026-04-09
-Scope: Stats dashboard UX follow-ups from user feedback (items 1–7).
-Delivery: **Single PR**, broken into logically scoped commits.
-
-## Goals
-
-Address seven concrete pieces of feedback against the Statistics menu:
-
-1. Library — collapse episodes behind a per-series dropdown.
-2. Sessions — roll up multiple sessions of the same episode within a day.
-3. Trends — add a 365d range option.
-4. Library — delete an episode (video) from its detail view.
-5. Vocabulary — tighten spacing between word and reading in the Top 50 table.
-6. Episode detail — hide cards whose Anki notes have been deleted.
-7. Trend/watch charts — add gridlines, fix tick legibility, unify theming.
-
-Out of scope for this pass: English-token ingestion cleanup and Overview stat-card drill-downs (feedback items 8 and 9). Those require a larger design decision and a migration respectively.
-
-## Files touched (inventory)
-
-Dashboard (`stats/src/`):
-- `components/library/LibraryTab.tsx` — collapsible groups (item 1).
-- `components/library/MediaDetailView.tsx`, `components/library/MediaHeader.tsx` — delete-episode action (item 4).
-- `components/sessions/SessionsTab.tsx`, `components/library/MediaSessionList.tsx` — episode rollup (item 2).
-- `components/trends/DateRangeSelector.tsx`, `hooks/useTrends.ts`, `lib/api-client.ts`, `lib/api-client.test.ts` — 365d (item 3).
-- `components/vocabulary/FrequencyRankTable.tsx` — word/reading column collapse (item 5).
-- `components/anime/EpisodeDetail.tsx` — filter deleted Anki cards (item 6).
-- `components/trends/TrendChart.tsx`, `components/trends/StackedTrendChart.tsx`, `components/overview/WatchTimeChart.tsx`, `lib/chart-theme.ts` — chart clarity (item 7).
-- New file: `stats/src/lib/session-grouping.ts` + `session-grouping.test.ts`.
-
-Backend (`src/core/services/`):
-- `immersion-tracker/query-trends.ts` — extend `TrendRange` and `TREND_DAY_LIMITS` (item 3).
-- `immersion-tracker/__tests__/query.test.ts` — 365d coverage (item 3).
-- `stats-server.ts` — passthrough if range validation lives here (check before editing).
-- `__tests__/stats-server.test.ts` — 365d coverage (item 3).
-
-## Commit plan
-
-One PR, one feature per commit. Order picks low-risk mechanical changes first so failures in later commits don't block merging of earlier ones.
-
-1. `feat(stats): add 365d range to trends dashboard` (item 3)
-2. `fix(stats): tighten word/reading column in Top 50 table` (item 5)
-3. `fix(stats): hide cards deleted from Anki in episode detail` (item 6)
-4. `feat(stats): delete episode from library detail view` (item 4)
-5. `feat(stats): collapsible series groups in library` (item 1)
-6. `feat(stats): roll up same-episode sessions within a day` (item 2)
-7. `feat(stats): gridlines and unified theme for trend charts` (item 7)
-
-Each commit must pass `bun run typecheck`, `bun run test:fast`, and any change-specific checks listed below.
-
----
-
-## Item 1 — Library collapsible series groups
-
-### Current behavior
-
-`LibraryTab.tsx` groups media via `groupMediaLibraryItems` and always renders the full grid of `MediaCard`s beneath each group header.
-
-### Target behavior
-
-Each group header becomes clickable. Groups with `items.length > 1` default to **collapsed**; single-video groups stay expanded (collapsing them would be visual noise).
-
-### Implementation
-
-- State: `const [collapsedGroups, setCollapsedGroups] = useState<Set<string>>(...)`. Initialize from `grouped` where `items.length > 1`.
-- Toggle helper: `toggleGroup(key: string)` adds/removes from the set.
-- Group header: wrap in a `<button>` with `aria-expanded` and a chevron icon (`▶`/`▼`). Keep the existing cover + title + subtitle layout inside the button.
-- Children grid is conditionally rendered on `!collapsedGroups.has(group.key)`.
-- Header summary (`N videos · duration · cards`) stays visible in both states so collapsed groups remain informative.
-
-### Tests
-
-- New `LibraryTab.test.tsx` (if not already present — check first) covering:
-  - Multi-video group renders collapsed on first mount.
-  - Single-video group renders expanded on first mount.
-  - Clicking the header toggles visibility.
-  - Header summary is visible in both states.
-
----
-
-## Item 2 — Sessions episode rollup within a day
-
-### Current behavior
-
-`SessionsTab.tsx:10-24` groups sessions by day label only (`formatSessionDayLabel(startedAtMs)`). Multiple sessions of the same episode on the same day show as independent rows. `MediaSessionList.tsx` has the same problem inside the library detail view.
-
-### Target behavior
-
-Within each day, sessions with the same `videoId` collapse into one parent row showing combined totals. A chevron reveals the individual sessions. Single-session buckets render flat (no pointless nesting).
-
-### Implementation
-
-- New helper in `stats/src/lib/session-grouping.ts`:
-  ```ts
-  export interface SessionBucket {
-    key: string;              // videoId as string, or `s-${sessionId}` for singletons
-    videoId: number | null;
-    sessions: SessionSummary[];
-    totalActiveMs: number;
-    totalCardsMined: number;
-    representativeSession: SessionSummary; // most recent, for header display
-  }
-  export function groupSessionsByVideo(sessions: SessionSummary[]): SessionBucket[];
-  ```
-  Sessions missing a `videoId` become singleton buckets.
-
-- `SessionsTab.tsx`: after day grouping, pipe each `daySessions` through `groupSessionsByVideo`. Render each bucket:
-  - `sessions.length === 1`: existing `SessionRow` behavior, unchanged.
-  - `sessions.length >= 2`: render a **bucket row** that looks like `SessionRow` but shows combined totals and session count (e.g. `3 sessions · 1h 24m · 12 cards`). Chevron state stored in a second `Set<string>` on bucket key. Expanded buckets render the child `SessionRow`s indented (`pl-8`) beneath the header.
-- `MediaSessionList.tsx`: within the media detail view, a single video's sessions are all the same `videoId` by definition — grouping here is by day only, and within a day multiple sessions render nested under a day header. Re-use the same visual pattern; factor the bucket row into a shared `SessionBucketRow` component.
-
-### Delete semantics
-
-- Deleting a bucket header offers "Delete all N sessions in this group" (reuse `confirmDayGroupDelete` pattern with a bucket-specific message, or add `confirmBucketDelete`).
-- Deleting an individual session from inside an expanded bucket keeps the existing single-delete flow.
-
-### Tests
-
-- `session-grouping.test.ts`:
-  - Empty input → empty output.
-  - All unique videos → N singleton buckets.
-  - Two sessions same videoId → one bucket with correct totals and representative (most recent start time).
-  - Missing videoId → singleton bucket keyed by sessionId.
-- `SessionsTab.test.tsx` (extend or add) verifying the rendered bucket rows expand/collapse and delete hooks fire with the right ID set.
-
----
-
-## Item 3 — 365d trends range
-
-### Backend
-
-`src/core/services/immersion-tracker/query-trends.ts`:
-- `type TrendRange = '7d' | '30d' | '90d' | '365d' | 'all';`
-- Add `'365d': 365` to `TREND_DAY_LIMITS`.
-- `getTrendDayLimit` picks up the new key automatically because of the `Exclude<TrendRange, 'all'>` generic.
-
-`src/core/services/stats-server.ts`:
-- Search for any hardcoded range validation (e.g. allow-list in the trends route handler) and extend it.
-
-### Frontend
-
-- `hooks/useTrends.ts`: widen the `TimeRange` union.
-- `components/trends/DateRangeSelector.tsx`: add `'365d'` to the options list. Display label stays as `365d`.
-- `lib/api-client.ts` / `api-client.test.ts`: if the client validates ranges, add `365d`.
-
-### Tests
-
-- `query.test.ts`: extend the existing range table to cover `365d` returning 365 days of data.
-- `stats-server.test.ts`: ensure the route accepts `range=365d`.
-- `api-client.test.ts`: ensure the client emits the new range.
-
-### Change-specific checks
-
-- `bun run test:config` is not required here (no schema/defaults change).
-- Run `bun run typecheck` + `bun run test:fast`.
-
----
-
-## Item 4 — Delete episode from library detail
-
-### Current behavior
-
-`MediaDetailView.tsx` provides session-level delete only. The backend `deleteVideo` exists (`query-maintenance.ts:509`), the API is exposed at `stats-server.ts:559`, and `api-client.deleteVideo` is already wired (`stats/src/lib/api-client.ts:146`). `EpisodeList.tsx:46` already uses it from the anime tab.
-
-### Target behavior
-
-A "Delete Episode" action in `MediaHeader` (top-right, small, `text-ctp-red`), gated by `confirmEpisodeDelete(title)`. On success, call `onBack()` and make sure the parent `LibraryTab` refetches.
-
-### Implementation
-
-- Add an `onDeleteEpisode?: () => void` prop to `MediaHeader` and render the button only if provided.
-- In `MediaDetailView`:
-  - New handler `handleDeleteEpisode` that calls `apiClient.deleteVideo(videoId)`, then `onBack()`.
-  - Reuse `confirmEpisodeDelete` from `stats/src/lib/delete-confirm.ts`.
-- In `LibraryTab`:
-  - `useMediaLibrary` returns fresh data on mount. The simplest fix: pass a `refresh` function from the hook (extend the hook if it doesn't already expose one) and call it when the detail view signals back.
-  - Alternative: force a remount by incrementing a `libraryVersion` key on the library list. Prefer `refresh` for clarity.
-
-### Tests
-
-- Extend the existing `MediaDetailView.test.tsx`: mock `apiClient.deleteVideo`, click the new button, confirm `onBack` fires after success.
-- `useMediaLibrary.test.ts`: if we add a `refresh` method, cover it.
-
----
-
-## Item 5 — Vocabulary word/reading column collapse
-
-### Current behavior
-
-`FrequencyRankTable.tsx:110-144` uses a 5-column table: `Rank | Word | Reading | POS | Seen`. Word and Reading are auto-sized, producing a large gap.
-
-### Target behavior
-
-Merge Word + Reading into a single column titled "Word". Reading sits immediately after the headword in a muted, smaller style.
-
-### Implementation
-
-- Drop the `<th>Reading</th>` header and cell.
-- Word cell becomes:
-  ```tsx
-  <td className="py-1.5 pr-3">
-    <span className="text-ctp-text font-medium">{w.headword}</span>
-    {reading && (
-      <span className="text-ctp-subtext0 text-xs ml-1.5">
-        【{reading}】
-      </span>
-    )}
-  </td>
-  ```
-  where `reading = fullReading(w.headword, w.reading)` and differs from `headword`.
-- Keep `fullReading` import from `reading-utils`.
-
-### Tests
-
-- Extend `FrequencyRankTable.test.tsx` (if present — otherwise add a focused test) to assert:
-  - Headword renders.
-  - Reading renders when different from headword.
-  - Reading does not render when equal to headword.
-
----
-
-## Item 6 — Hide Anki-deleted cards in Cards Mined
-
-### Current behavior
-
-`EpisodeDetail.tsx:109-147` iterates `cardEvents`, fetches note info via `ankiNotesInfo(allNoteIds)`, and for each `noteId` renders a row even if no matching `info` came back — the user sees an empty word with an "Open in Anki" button that leads nowhere.
-
-### Target behavior
-
-After `ankiNotesInfo` resolves:
-- Drop `noteId`s that are not in the resolved map.
-- Drop `cardEvents` whose `noteIds` list was non-empty but is now empty after filtering.
-- Card events with a positive `cardsDelta` but no `noteIds` (legacy rollup path) still render as `+N cards` — we have no way to cross-reference them, so leave them alone.
-
-### Implementation
-
-- Compute `filteredCardEvents` as a `useMemo` depending on `data.cardEvents` and `noteInfos`.
-- Iterate `filteredCardEvents` instead of `cardEvents` in the render.
-- Surface a subtle note (optional, muted) "N cards hidden (deleted from Anki)" at the end of the list if any were filtered — helps the user understand why counts here diverge from session totals. Final decision on the note can be made at PR review; default: **show it**.
-
-### Tests
-
-- Add a test in `EpisodeDetail.test.tsx` (add the file if not present) that stubs `ankiNotesInfo` to return only a subset of notes and verifies the missing ones are not rendered.
-
-### Other call sites
-
-- Grep so far shows `ankiNotesInfo` is only used in `EpisodeDetail.tsx`. Re-verify before landing the commit; if another call site appears, apply the same filter.
-
----
-
-## Item 7 — Trend/watch chart clarity pass
-
-### Current behavior
-
-`TrendChart.tsx`, `StackedTrendChart.tsx`, and `WatchTimeChart.tsx` render Recharts components with:
-- No `CartesianGrid` → no horizontal reference lines.
-- 9px axis ticks → borderline unreadable.
-- Height 120 → cramped.
-- Tooltip uses raw labels (`04/04` etc.).
-- No shared theme object; each chart redefines colors and tooltip styles inline.
-
-`stats/src/lib/chart-theme.ts` already exists and currently exports a single `CHART_THEME` constant with tick/tooltip colors and `barFill`. It will be extended, not replaced, to preserve existing consumers.
-
-### Target behavior
-
-All three charts share a theme, have horizontal gridlines, readable ticks, and sensible tooltips.
-
-### Implementation
-
-Extend `stats/src/lib/chart-theme.ts` with the additional shared defaults (keeping the existing `CHART_THEME` export intact so current consumers don't break):
-```ts
-export const CHART_THEME = {
-  tick: '#a5adcb',
-  tooltipBg: '#363a4f',
-  tooltipBorder: '#494d64',
-  tooltipText: '#cad3f5',
-  tooltipLabel: '#b8c0e0',
-  barFill: '#8aadf4',
-  grid: '#494d64',
-  axisLine: '#494d64',
-} as const;
-
-export const CHART_DEFAULTS = {
-  height: 160,
-  tickFontSize: 11,
-  margin: { top: 8, right: 8, bottom: 0, left: 0 },
-  grid: { strokeDasharray: '3 3', vertical: false },
-} as const;
-
-export const TOOLTIP_CONTENT_STYLE = {
-  background: CHART_THEME.tooltipBg,
-  border: `1px solid ${CHART_THEME.tooltipBorder}`,
-  borderRadius: 6,
-  color: CHART_THEME.tooltipText,
-  fontSize: 12,
-};
-```
-
-Apply to each chart:
-- Import `CartesianGrid` from recharts.
-- Insert `<CartesianGrid stroke={CHART_THEME.grid} {...CHART_DEFAULTS.grid} />` inside each chart container.
-- `<XAxis tick={{ fontSize: CHART_DEFAULTS.tickFontSize, fill: CHART_THEME.tick }} />` and equivalent `YAxis`.
-- `YAxis` gains `axisLine={{ stroke: CHART_THEME.axisLine }}`.
-- `ResponsiveContainer` height changes from 120 → `CHART_DEFAULTS.height`.
-- `Tooltip` `contentStyle` uses `TOOLTIP_CONTENT_STYLE`, and charts pass a `labelFormatter` when the label is a date key (e.g. show `Fri Apr 4`).
-
-### Unit formatters
-
-- `TrendChart` already accepts a `formatter` prop — extend usage sites to pass unit-aware formatters where they aren't already (`formatDuration`, `formatNumber`, etc.).
-
-### Tests
-
-- `chart-theme.test.ts` (if present — otherwise add a trivial snapshot to keep the shape stable).
-- `TrendChart` snapshot/render tests: no regression, gridline element present.
-
----
-
-## Verification gate
-
-Before requesting code review, run:
-
-```
-bun run typecheck
-bun run test:fast
-bun run test:env
-bun run test:runtime:compat   # dist-sensitive check for the charts
-bun run build
-bun run test:smoke:dist
-```
-
-No docs-site changes are planned in this spec; if `docs-site/` ends up touched (e.g. screenshots), also run `bun run docs:test` and `bun run docs:build`.
-
-No config schema changes → `bun run test:config` and `bun run generate:config-example` are not required.
-
-## Risks and open questions
-
-- **MediaDetailView refresh**: `useMediaLibrary` may not expose a `refresh` function. If it doesn't, the simplest path is adding one; the alternative (keying a remount) works but is harder to test. Decide during implementation.
-- **Session bucket delete UX**: "Delete all N sessions in this group" is powerful. The copy must make it clear the underlying sessions are being removed, not just the grouping. Reuse `confirmBucketDelete` wording from existing confirm helpers if possible.
-- **Anki-deleted-cards hidden notice**: Showing a subtle "N cards hidden" footer is a call that can be made at PR review.
-- **Bucket delete helper**: `confirmBucketDelete` does not currently exist in `delete-confirm.ts`. Implementation either adds it or reuses `confirmDayGroupDelete` with bucket-specific wording — decide during the session-rollup commit.
-
-## Changelog entry
-
-User-visible PR → needs a fragment under `changes/*.md`. Suggested title:
-`Stats dashboard: collapsible series, session rollups, 365d trends, chart polish, episode delete.`

package.json

@@ -2,7 +2,7 @@
   "name": "subminer",
   "productName": "SubMiner",
   "desktopName": "SubMiner.desktop",
-  "version": "0.12.0",
+  "version": "0.12.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",
@@ -20,7 +20,7 @@
     "dev:stats": "cd stats && bun run dev",
     "build": "bun run build:yomitan && bun run build:stats && tsc -p tsconfig.json && bun run build:renderer && 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",
-    "changelog:build": "bun run scripts/build-changelog.ts build-release",
+    "changelog:build": "bun run scripts/build-changelog.ts build && bun run changelog:docs",
     "changelog:check": "bun run scripts/build-changelog.ts check",
     "changelog:docs": "bun run scripts/build-changelog.ts docs",
     "changelog:lint": "bun run scripts/build-changelog.ts lint",
@@ -45,7 +45,7 @@
     "test:config:src": "bun test src/config/config.test.ts src/config/path-resolution.test.ts src/config/resolve/anki-connect.test.ts src/config/resolve/integrations.test.ts src/config/resolve/subtitle-style.test.ts src/config/resolve/jellyfin.test.ts src/config/definitions/domain-registry.test.ts src/generate-config-example.test.ts src/verify-config-example.test.ts",
     "test:config:dist": "bun test dist/config/config.test.js dist/config/path-resolution.test.js dist/config/resolve/anki-connect.test.js dist/config/resolve/integrations.test.js dist/config/resolve/subtitle-style.test.js dist/config/resolve/jellyfin.test.js dist/config/definitions/domain-registry.test.js dist/generate-config-example.test.js dist/verify-config-example.test.js",
     "test:config:smoke:dist": "bun test dist/config/path-resolution.test.js",
-    "test:plugin:src": "lua scripts/test-plugin-lua-compat.lua && lua scripts/test-plugin-start-gate.lua && lua scripts/test-plugin-binary-windows.lua",
+    "test:plugin:src": "lua scripts/test-plugin-start-gate.lua && lua scripts/test-plugin-binary-windows.lua",
     "test:launcher:smoke:src": "bun test launcher/smoke.e2e.test.ts",
     "test:launcher:src": "bun test launcher/config.test.ts launcher/config-domain-parsers.test.ts launcher/config/cli-parser-builder.test.ts launcher/config/args-normalizer.test.ts launcher/mpv.test.ts launcher/picker.test.ts launcher/parse-args.test.ts launcher/main.test.ts launcher/commands/command-modules.test.ts launcher/smoke.e2e.test.ts && bun run test:plugin:src",
     "test:core:src": "bun test src/cli/args.test.ts src/cli/help.test.ts src/shared/setup-state.test.ts src/core/services/cli-command.test.ts src/core/services/field-grouping-overlay.test.ts src/core/services/numeric-shortcut-session.test.ts src/core/services/secondary-subtitle.test.ts src/core/services/mpv-render-metrics.test.ts src/core/services/overlay-content-measurement.test.ts src/core/services/mpv-control.test.ts src/core/services/mpv.test.ts src/core/services/runtime-options-ipc.test.ts src/core/services/runtime-config.test.ts src/core/services/yomitan-extension-paths.test.ts src/core/services/config-hot-reload.test.ts src/core/services/discord-presence.test.ts src/core/services/tokenizer.test.ts src/core/services/tokenizer/annotation-stage.test.ts src/core/services/tokenizer/parser-selection-stage.test.ts src/core/services/tokenizer/parser-enrichment-stage.test.ts src/core/services/subsync.test.ts src/core/services/overlay-bridge.test.ts src/core/services/overlay-shortcut-handler.test.ts src/core/services/stats-window.test.ts src/core/services/mining.test.ts src/core/services/anki-jimaku.test.ts src/core/services/jimaku-download-path.test.ts src/core/services/jellyfin.test.ts src/core/services/jellyfin-remote.test.ts src/core/services/immersion-tracker-service.test.ts src/core/services/overlay-runtime-init.test.ts src/core/services/app-ready.test.ts src/core/services/startup-bootstrap.test.ts src/core/services/subtitle-processing-controller.test.ts src/core/services/anilist/anilist-update-queue.test.ts src/core/services/anilist/rate-limiter.test.ts src/core/services/jlpt-token-filter.test.ts src/core/services/subtitle-position.test.ts src/core/utils/shortcut-config.test.ts src/main/runtime/first-run-setup-plugin.test.ts src/main/runtime/first-run-setup-service.test.ts src/main/runtime/first-run-setup-window.test.ts src/main/runtime/tray-runtime.test.ts src/main/runtime/tray-main-actions.test.ts src/main/runtime/tray-main-deps.test.ts src/main/runtime/tray-runtime-handlers.test.ts src/main/runtime/cli-command-context-main-deps.test.ts src/main/runtime/app-ready-main-deps.test.ts src/renderer/error-recovery.test.ts src/renderer/subtitle-render.test.ts src/renderer/handlers/mouse.test.ts src/renderer/handlers/keyboard.test.ts src/renderer/modals/jimaku.test.ts src/subsync/utils.test.ts src/main/anilist-url-guard.test.ts src/window-trackers/hyprland-tracker.test.ts src/window-trackers/x11-tracker.test.ts src/window-trackers/windows-helper.test.ts src/window-trackers/windows-tracker.test.ts launcher/config.test.ts launcher/config-domain-parsers.test.ts launcher/config/cli-parser-builder.test.ts launcher/config/args-normalizer.test.ts launcher/parse-args.test.ts launcher/main.test.ts launcher/commands/command-modules.test.ts launcher/setup-gate.test.ts stats/src/lib/api-client.test.ts",
@@ -113,7 +113,6 @@
     "commander": "^14.0.3",
     "hono": "^4.12.7",
     "jsonc-parser": "^3.3.1",
-    "koffi": "^2.15.6",
     "libsql": "^0.5.22",
     "ws": "^8.19.0"
   },

plugin/subminer/bootstrap.lua

@@ -14,7 +14,7 @@ function M.init()
 	local utils = require("mp.utils")
 
 	local options_helper = require("options")
-	local environment = require("environment").create({ mp = mp, utils = utils })
+	local environment = require("environment").create({ mp = mp })
 	local opts = options_helper.load(options_lib, environment.default_socket_path())
 	local state = require("state").new()
 
@@ -61,9 +61,6 @@ function M.init()
 	ctx.process = make_lazy_proxy("process", function()
 		return require("process").create(ctx)
 	end)
-	ctx.session_bindings = make_lazy_proxy("session_bindings", function()
-		return require("session_bindings").create(ctx)
-	end)
 	ctx.ui = make_lazy_proxy("ui", function()
 		return require("ui").create(ctx)
 	end)
@@ -75,7 +72,6 @@ function M.init()
 	end)
 
 	ctx.ui.register_keybindings()
-	ctx.session_bindings.register_bindings()
 	ctx.messages.register_script_messages()
 	ctx.lifecycle.register_lifecycle_hooks()
 	ctx.log.subminer_log("info", "lifecycle", "SubMiner plugin loaded")

plugin/subminer/environment.lua

@@ -1,9 +1,7 @@
 local M = {}
-local unpack_fn = table.unpack or unpack
 
 function M.create(ctx)
 	local mp = ctx.mp
-	local utils = ctx.utils
 
 	local detected_backend = nil
 	local app_running_cache_value = nil
@@ -32,63 +30,6 @@ function M.create(ctx)
 		return "/tmp/subminer-socket"
 	end
 
-	local function path_separator()
-		return is_windows() and "\\" or "/"
-	end
-
-	local function join_path(...)
-		local parts = { ... }
-		if utils and type(utils.join_path) == "function" then
-			return utils.join_path(unpack_fn(parts))
-		end
-		return table.concat(parts, path_separator())
-	end
-
-	local function file_exists(path)
-		if not utils or type(utils.file_info) ~= "function" then
-			return false
-		end
-		return utils.file_info(path) ~= nil
-	end
-
-	local function resolve_subminer_config_dir()
-		local home = os.getenv("HOME") or os.getenv("USERPROFILE") or ""
-		local candidates = {}
-		if is_windows() then
-			local app_data = os.getenv("APPDATA") or join_path(home, "AppData", "Roaming")
-			candidates = {
-				join_path(app_data, "SubMiner"),
-			}
-		else
-			local xdg_config_home = os.getenv("XDG_CONFIG_HOME")
-			local primary_base = (type(xdg_config_home) == "string" and xdg_config_home ~= "")
-					and xdg_config_home
-				or join_path(home, ".config")
-			candidates = {
-				join_path(primary_base, "SubMiner"),
-				join_path(home, ".config", "SubMiner"),
-			}
-		end
-
-		for _, dir in ipairs(candidates) do
-			if file_exists(join_path(dir, "config.jsonc")) or file_exists(join_path(dir, "config.json")) then
-				return dir
-			end
-		end
-
-		for _, dir in ipairs(candidates) do
-			if file_exists(dir) then
-				return dir
-			end
-		end
-
-		return candidates[1]
-	end
-
-	local function resolve_session_bindings_artifact_path()
-		return join_path(resolve_subminer_config_dir(), "session-bindings.json")
-	end
-
 	local function is_linux()
 		return not is_windows() and not is_macos()
 	end
@@ -114,26 +55,33 @@ function M.create(ctx)
 				if not image then
 					image = line:match('^"([^"]+)"')
 				end
-				if image then
-					if image == "subminer" or image == "subminer.exe" or image == "subminer.appimage" or image == "subminer.app" then
-						return true
-					end
-					if image:find("subminer", 1, true) and not image:find(".lua", 1, true) then
-						return true
-					end
+				if not image then
+					goto continue
+				end
+				if image == "subminer" or image == "subminer.exe" or image == "subminer.appimage" or image == "subminer.app" then
+					return true
+				end
+				if image:find("subminer", 1, true) and not image:find(".lua", 1, true) then
+					return true
 				end
 			else
 				local argv0 = line:match('^"([^"]+)"') or line:match("^%s*([^%s]+)")
-				if argv0 and not argv0:find("subminer.lua", 1, true) and not argv0:find("subminer.conf", 1, true) then
-					local exe = argv0:match("([^/\\]+)$") or argv0
-					if exe == "SubMiner" or exe == "SubMiner.AppImage" or exe == "SubMiner.exe" or exe == "subminer" or exe == "subminer.appimage" or exe == "subminer.exe" then
-						return true
-					end
-					if exe:find("subminer", 1, true) and exe:find("%.lua", 1, true) == nil and exe:find("%.app", 1, true) == nil then
-						return true
-					end
+				if not argv0 then
+					goto continue
+				end
+				if argv0:find("subminer.lua", 1, true) or argv0:find("subminer.conf", 1, true) then
+					goto continue
+				end
+				local exe = argv0:match("([^/\\]+)$") or argv0
+				if exe == "SubMiner" or exe == "SubMiner.AppImage" or exe == "SubMiner.exe" or exe == "subminer" or exe == "subminer.appimage" or exe == "subminer.exe" then
+					return true
+				end
+				if exe:find("subminer", 1, true) and exe:find("%.lua", 1, true) == nil and exe:find("%.app", 1, true) == nil then
+					return true
 				end
 			end
+
+			::continue::
 		end
 		return false
 	end
@@ -250,10 +198,7 @@ function M.create(ctx)
 		is_windows = is_windows,
 		is_macos = is_macos,
 		is_linux = is_linux,
-		join_path = join_path,
 		default_socket_path = default_socket_path,
-		resolve_subminer_config_dir = resolve_subminer_config_dir,
-		resolve_session_bindings_artifact_path = resolve_session_bindings_artifact_path,
 		is_subminer_process_running = is_subminer_process_running,
 		is_subminer_app_running = is_subminer_app_running,
 		is_subminer_app_running_async = is_subminer_app_running_async,

plugin/subminer/hover.lua

@@ -189,37 +189,41 @@ function M.create(ctx)
 		local source_len = #plain
 		local cursor = 1
 		for _, token in ipairs(payload.tokens or {}) do
-			if type(token) == "table" and type(token.text) == "string" and token.text ~= "" then
-				local token_text = token.text
-				local start_pos = nil
-				local end_pos = nil
+			if type(token) ~= "table" or type(token.text) ~= "string" or token.text == "" then
+				goto continue
+			end
 
-				if type(token.startPos) == "number" and type(token.endPos) == "number" then
-					if token.startPos >= 0 and token.endPos >= token.startPos then
-						local candidate_start = token.startPos + 1
-						local candidate_stop = token.endPos
-						if candidate_start >= 1 and candidate_stop <= source_len and candidate_stop >= candidate_start and plain:sub(candidate_start, candidate_stop) == token_text then
-							start_pos = candidate_start
-							end_pos = candidate_stop
-						end
-					end
-				end
+			local token_text = token.text
+			local start_pos = nil
+			local end_pos = nil
 
-				if not start_pos or not end_pos then
-					local fallback_start, fallback_stop = plain:find(token_text, cursor, true)
-					if not fallback_start then
-						fallback_start, fallback_stop = plain:find(token_text, 1, true)
+			if type(token.startPos) == "number" and type(token.endPos) == "number" then
+				if token.startPos >= 0 and token.endPos >= token.startPos then
+					local candidate_start = token.startPos + 1
+					local candidate_stop = token.endPos
+					if candidate_start >= 1 and candidate_stop <= source_len and candidate_stop >= candidate_start and plain:sub(candidate_start, candidate_stop) == token_text then
+						start_pos = candidate_start
+						end_pos = candidate_stop
 					end
-					start_pos, end_pos = fallback_start, fallback_stop
-				end
-
-				if start_pos and end_pos then
-					if token.index == payload.hoveredTokenIndex then
-						return start_pos, end_pos
-					end
-					cursor = end_pos + 1
 				end
 			end
+
+			if not start_pos or not end_pos then
+				local fallback_start, fallback_stop = plain:find(token_text, cursor, true)
+				if not fallback_start then
+					fallback_start, fallback_stop = plain:find(token_text, 1, true)
+				end
+				start_pos, end_pos = fallback_start, fallback_stop
+			end
+
+			if start_pos and end_pos then
+				if token.index == payload.hoveredTokenIndex then
+					return start_pos, end_pos
+				end
+				cursor = end_pos + 1
+			end
+
+			::continue::
 		end
 
 		return nil

plugin/subminer/messages.lua

@@ -47,9 +47,6 @@ function M.create(ctx)
 		mp.register_script_message("subminer-stats-toggle", function()
 			mp.osd_message("Stats: press ` (backtick) in overlay", 3)
 		end)
-		mp.register_script_message("subminer-reload-session-bindings", function()
-			ctx.session_bindings.reload_bindings()
-		end)
 	end
 
 	return {

plugin/subminer/process.lua

@@ -229,22 +229,6 @@ function M.create(ctx)
 		end)
 	end
 
-	local function run_binary_command_async(args, callback)
-		subminer_log("debug", "process", "Binary command: " .. table.concat(args, " "))
-		mp.command_native_async({
-			name = "subprocess",
-			args = args,
-			playback_only = false,
-			capture_stdout = true,
-			capture_stderr = true,
-		}, function(success, result, error)
-			local ok = success and (result == nil or result.status == 0)
-			if callback then
-				callback(ok, result, error)
-			end
-		end)
-	end
-
 	local function parse_start_script_message_overrides(...)
 		local overrides = {}
 		for i = 1, select("#", ...) do
@@ -544,7 +528,6 @@ function M.create(ctx)
 		build_command_args = build_command_args,
 		has_matching_mpv_ipc_socket = has_matching_mpv_ipc_socket,
 		run_control_command_async = run_control_command_async,
-		run_binary_command_async = run_binary_command_async,
 		parse_start_script_message_overrides = parse_start_script_message_overrides,
 		ensure_texthooker_running = ensure_texthooker_running,
 		start_overlay = start_overlay,

plugin/subminer/session_bindings.lua

@@ -1,359 +0,0 @@
-local M = {}
-
-local unpack_fn = table.unpack or unpack
-
-local KEY_NAME_MAP = {
-	Space = "SPACE",
-	Tab = "TAB",
-	Enter = "ENTER",
-	Escape = "ESC",
-	Backspace = "BS",
-	Delete = "DEL",
-	ArrowUp = "UP",
-	ArrowDown = "DOWN",
-	ArrowLeft = "LEFT",
-	ArrowRight = "RIGHT",
-	Slash = "/",
-	Backslash = "\\",
-	Minus = "-",
-	Equal = "=",
-	Comma = ",",
-	Period = ".",
-	Quote = "'",
-	Semicolon = ";",
-	BracketLeft = "[",
-	BracketRight = "]",
-	Backquote = "`",
-}
-
-local MODIFIER_MAP = {
-	ctrl = "Ctrl",
-	alt = "Alt",
-	shift = "Shift",
-	meta = "Meta",
-}
-
-function M.create(ctx)
-	local mp = ctx.mp
-	local utils = ctx.utils
-	local state = ctx.state
-	local process = ctx.process
-	local environment = ctx.environment
-	local subminer_log = ctx.log.subminer_log
-	local show_osd = ctx.log.show_osd
-
-	local function read_file(path)
-		local handle = io.open(path, "r")
-		if not handle then
-			return nil
-		end
-		local content = handle:read("*a")
-		handle:close()
-		return content
-	end
-
-	local function remove_binding_names(names)
-		for _, name in ipairs(names) do
-			mp.remove_key_binding(name)
-		end
-		for index = #names, 1, -1 do
-			names[index] = nil
-		end
-	end
-
-	local function key_code_to_mpv_name(code)
-		if KEY_NAME_MAP[code] then
-			return KEY_NAME_MAP[code]
-		end
-
-		local letter = code:match("^Key([A-Z])$")
-		if letter then
-			return string.lower(letter)
-		end
-
-		local digit = code:match("^Digit([0-9])$")
-		if digit then
-			return digit
-		end
-
-		local function_key = code:match("^(F%d+)$")
-		if function_key then
-			return function_key
-		end
-
-		return nil
-	end
-
-	local function key_spec_to_mpv_binding(key)
-		if type(key) ~= "table" then
-			return nil
-		end
-
-		if type(key.code) ~= "string" then
-			return nil
-		end
-		if type(key.modifiers) ~= "table" then
-			return nil
-		end
-
-		local key_name = key_code_to_mpv_name(key.code)
-		if not key_name then
-			return nil
-		end
-
-		local parts = {}
-		for _, modifier in ipairs(key.modifiers) do
-			local mapped = MODIFIER_MAP[modifier]
-			if mapped then
-				parts[#parts + 1] = mapped
-			end
-		end
-		parts[#parts + 1] = key_name
-		return table.concat(parts, "+")
-	end
-
-	local function build_cli_args(action_id, payload)
-		if action_id == "toggleVisibleOverlay" then
-			return { "--toggle-visible-overlay" }
-		elseif action_id == "toggleStatsOverlay" then
-			return { "--toggle-stats-overlay" }
-		elseif action_id == "copySubtitle" then
-			return { "--copy-subtitle" }
-		elseif action_id == "copySubtitleMultiple" then
-			return { "--copy-subtitle-count", tostring(payload and payload.count or 1) }
-		elseif action_id == "updateLastCardFromClipboard" then
-			return { "--update-last-card-from-clipboard" }
-		elseif action_id == "triggerFieldGrouping" then
-			return { "--trigger-field-grouping" }
-		elseif action_id == "triggerSubsync" then
-			return { "--trigger-subsync" }
-		elseif action_id == "mineSentence" then
-			return { "--mine-sentence" }
-		elseif action_id == "mineSentenceMultiple" then
-			return { "--mine-sentence-count", tostring(payload and payload.count or 1) }
-		elseif action_id == "toggleSecondarySub" then
-			return { "--toggle-secondary-sub" }
-		elseif action_id == "toggleSubtitleSidebar" then
-			return { "--toggle-subtitle-sidebar" }
-		elseif action_id == "markAudioCard" then
-			return { "--mark-audio-card" }
-		elseif action_id == "openRuntimeOptions" then
-			return { "--open-runtime-options" }
-		elseif action_id == "openJimaku" then
-			return { "--open-jimaku" }
-		elseif action_id == "openYoutubePicker" then
-			return { "--open-youtube-picker" }
-		elseif action_id == "openSessionHelp" then
-			return { "--open-session-help" }
-		elseif action_id == "openControllerSelect" then
-			return { "--open-controller-select" }
-		elseif action_id == "openControllerDebug" then
-			return { "--open-controller-debug" }
-		elseif action_id == "openPlaylistBrowser" then
-			return { "--open-playlist-browser" }
-		elseif action_id == "replayCurrentSubtitle" then
-			return { "--replay-current-subtitle" }
-		elseif action_id == "playNextSubtitle" then
-			return { "--play-next-subtitle" }
-		elseif action_id == "shiftSubDelayPrevLine" then
-			return { "--shift-sub-delay-prev-line" }
-		elseif action_id == "shiftSubDelayNextLine" then
-			return { "--shift-sub-delay-next-line" }
-		elseif action_id == "cycleRuntimeOption" then
-			local runtime_option_id = payload and payload.runtimeOptionId or nil
-			if type(runtime_option_id) ~= "string" or runtime_option_id == "" then
-				return nil
-			end
-			local direction = payload and payload.direction == -1 and "prev" or "next"
-			return { "--cycle-runtime-option", runtime_option_id .. ":" .. direction }
-		end
-
-		return nil
-	end
-
-	local function invoke_cli_action(action_id, payload)
-		if not process.check_binary_available() then
-			show_osd("Error: binary not found")
-			return
-		end
-
-		local cli_args = build_cli_args(action_id, payload)
-		if not cli_args then
-			subminer_log("warn", "session-bindings", "No CLI mapping for action: " .. tostring(action_id))
-			return
-		end
-
-		local args = { state.binary_path }
-		for _, arg in ipairs(cli_args) do
-			args[#args + 1] = arg
-		end
-		local runner = process.run_binary_command_async
-		if type(runner) ~= "function" then
-			runner = function(binary_args, callback)
-				mp.command_native_async({
-					name = "subprocess",
-					args = binary_args,
-					playback_only = false,
-					capture_stdout = true,
-					capture_stderr = true,
-				}, function(success, result, error)
-					local ok = success and (result == nil or result.status == 0)
-					if callback then
-						callback(ok, result, error)
-					end
-				end)
-			end
-		end
-		runner(args, function(ok, result, error)
-			if ok then
-				return
-			end
-			local reason = error or (result and result.stderr) or "unknown error"
-			subminer_log("warn", "session-bindings", "Session action failed: " .. tostring(reason))
-			show_osd("Session action failed")
-		end)
-	end
-
-	local function clear_numeric_selection(show_cancelled)
-		if state.session_numeric_selection and state.session_numeric_selection.timeout then
-			state.session_numeric_selection.timeout:kill()
-		end
-		state.session_numeric_selection = nil
-		remove_binding_names(state.session_numeric_binding_names)
-		if show_cancelled then
-			show_osd("Cancelled")
-		end
-	end
-
-	local function start_numeric_selection(action_id, timeout_ms)
-		clear_numeric_selection(false)
-		for digit = 1, 9 do
-			local digit_string = tostring(digit)
-			local name = "subminer-session-digit-" .. digit_string
-			state.session_numeric_binding_names[#state.session_numeric_binding_names + 1] = name
-			mp.add_forced_key_binding(digit_string, name, function()
-				clear_numeric_selection(false)
-				invoke_cli_action(action_id, { count = digit })
-			end)
-		end
-
-		state.session_numeric_binding_names[#state.session_numeric_binding_names + 1] =
-			"subminer-session-digit-cancel"
-		mp.add_forced_key_binding("ESC", "subminer-session-digit-cancel", function()
-			clear_numeric_selection(true)
-		end)
-
-		state.session_numeric_selection = {
-			action_id = action_id,
-			timeout = mp.add_timeout((timeout_ms or 3000) / 1000, function()
-				clear_numeric_selection(false)
-				show_osd(action_id == "copySubtitleMultiple" and "Copy timeout" or "Mine timeout")
-			end),
-		}
-
-		show_osd(
-			action_id == "copySubtitleMultiple"
-					and "Copy how many lines? Press 1-9 (Esc to cancel)"
-				or "Mine how many lines? Press 1-9 (Esc to cancel)"
-		)
-	end
-
-	local function execute_mpv_command(command)
-		if type(command) ~= "table" or command[1] == nil then
-			return
-		end
-		mp.commandv(unpack_fn(command))
-	end
-
-	local function handle_binding(binding, numeric_selection_timeout_ms)
-		if binding.actionType == "mpv-command" then
-			execute_mpv_command(binding.command)
-			return
-		end
-
-		if binding.actionId == "copySubtitleMultiple" or binding.actionId == "mineSentenceMultiple" then
-			start_numeric_selection(binding.actionId, numeric_selection_timeout_ms)
-			return
-		end
-
-		invoke_cli_action(binding.actionId, binding.payload)
-	end
-
-	local function load_artifact()
-		local artifact_path = environment.resolve_session_bindings_artifact_path()
-		local raw = read_file(artifact_path)
-		if not raw or raw == "" then
-			return nil, "Missing session binding artifact: " .. tostring(artifact_path)
-		end
-
-		local parsed, parse_error = utils.parse_json(raw)
-		if not parsed then
-			return nil, "Failed to parse session binding artifact: " .. tostring(parse_error)
-		end
-		if type(parsed) ~= "table" or type(parsed.bindings) ~= "table" then
-			return nil, "Invalid session binding artifact"
-		end
-
-		return parsed, nil
-	end
-
-	local function clear_bindings()
-		clear_numeric_selection(false)
-		remove_binding_names(state.session_binding_names)
-	end
-
-	local function register_bindings()
-		local artifact, load_error = load_artifact()
-		if not artifact then
-			subminer_log("warn", "session-bindings", load_error)
-			return false
-		end
-
-		clear_numeric_selection(false)
-
-		local previous_binding_names = state.session_binding_names
-		local next_binding_names = {}
-		state.session_binding_generation = (state.session_binding_generation or 0) + 1
-		local generation = state.session_binding_generation
-
-		local timeout_ms = tonumber(artifact.numericSelectionTimeoutMs) or 3000
-		for index, binding in ipairs(artifact.bindings) do
-			local key_name = key_spec_to_mpv_binding(binding.key)
-			if key_name then
-				local name = "subminer-session-binding-" .. tostring(generation) .. "-" .. tostring(index)
-				next_binding_names[#next_binding_names + 1] = name
-				mp.add_forced_key_binding(key_name, name, function()
-					handle_binding(binding, timeout_ms)
-				end)
-			else
-				subminer_log(
-					"warn",
-					"session-bindings",
-					"Skipped unsupported key code from artifact: " .. tostring(binding.key and binding.key.code or "unknown")
-				)
-			end
-		end
-
-		remove_binding_names(previous_binding_names)
-		state.session_binding_names = next_binding_names
-
-		subminer_log(
-			"info",
-			"session-bindings",
-			"Registered " .. tostring(#next_binding_names) .. " shared session bindings"
-		)
-		return true
-	end
-
-	local function reload_bindings()
-		return register_bindings()
-	end
-
-	return {
-		register_bindings = register_bindings,
-		reload_bindings = reload_bindings,
-		clear_bindings = clear_bindings,
-	}
-end
-
-return M

plugin/subminer/state.lua

@@ -33,10 +33,6 @@ function M.new()
 		auto_play_ready_timeout = nil,
 		auto_play_ready_osd_timer = nil,
 		suppress_ready_overlay_restore = false,
-		session_binding_generation = 0,
-		session_binding_names = {},
-		session_numeric_binding_names = {},
-		session_numeric_selection = nil,
 	}
 end
 

plugin/subminer/ui.lua

@@ -90,12 +90,6 @@ function M.create(ctx)
 		mp.add_key_binding("y-c", "subminer-status", function()
 			process.check_status()
 		end)
-		mp.add_key_binding("y-h", "subminer-session-help", function()
-			if not ensure_binary_for_menu() then
-				return
-			end
-			process.run_control_command_async("open-session-help")
-		end)
 		if type(opts.aniskip_button_key) == "string" and opts.aniskip_button_key ~= "" then
 			mp.add_key_binding(opts.aniskip_button_key, "subminer-skip-intro", function()
 				aniskip.skip_intro_now()

scripts/build-changelog.test.ts

@@ -139,49 +139,6 @@ test('writeChangelogArtifacts skips changelog prepend when release section alrea
   }
 });
 
-test('writeStableReleaseArtifacts reuses the requested version and date for changelog, release notes, and docs-site output', async () => {
-  const { writeStableReleaseArtifacts } = await loadModule();
-  const workspace = createWorkspace('write-stable-release-artifacts');
-  const projectRoot = path.join(workspace, 'SubMiner');
-
-  fs.mkdirSync(path.join(projectRoot, 'changes'), { recursive: true });
-  fs.mkdirSync(path.join(projectRoot, 'docs-site'), { recursive: true });
-  fs.writeFileSync(
-    path.join(projectRoot, 'package.json'),
-    JSON.stringify({ name: 'subminer', version: '0.4.1' }, null, 2),
-    'utf8',
-  );
-  fs.writeFileSync(path.join(projectRoot, 'CHANGELOG.md'), '# Changelog\n', 'utf8');
-  fs.writeFileSync(
-    path.join(projectRoot, 'changes', '001.md'),
-    ['type: fixed', 'area: release', '', '- Reused explicit stable release date.'].join('\n'),
-    'utf8',
-  );
-
-  try {
-    const result = writeStableReleaseArtifacts({
-      cwd: projectRoot,
-      version: '0.4.1',
-      date: '2026-03-07',
-    });
-
-    assert.deepEqual(result.outputPaths, [path.join(projectRoot, 'CHANGELOG.md')]);
-    assert.equal(result.releaseNotesPath, path.join(projectRoot, 'release', 'release-notes.md'));
-    assert.equal(result.docsChangelogPath, path.join(projectRoot, 'docs-site', 'changelog.md'));
-
-    const changelog = fs.readFileSync(path.join(projectRoot, 'CHANGELOG.md'), 'utf8');
-    const docsChangelog = fs.readFileSync(
-      path.join(projectRoot, 'docs-site', 'changelog.md'),
-      'utf8',
-    );
-
-    assert.match(changelog, /## v0\.4\.1 \(2026-03-07\)/);
-    assert.match(docsChangelog, /## v0\.4\.1 \(2026-03-07\)/);
-  } finally {
-    fs.rmSync(workspace, { recursive: true, force: true });
-  }
-});
-
 test('verifyChangelogReadyForRelease ignores README but rejects pending fragments and missing version sections', async () => {
   const { verifyChangelogReadyForRelease } = await loadModule();
   const workspace = createWorkspace('verify-release');
@@ -405,11 +362,11 @@ test('writePrereleaseNotesForVersion writes cumulative beta notes without mutati
 
     const prereleaseNotes = fs.readFileSync(outputPath, 'utf8');
     assert.match(prereleaseNotes, /^> This is a prerelease build for testing\./m);
+    assert.match(prereleaseNotes, /## Highlights\n### Added\n- Overlay: Added prerelease coverage\./);
     assert.match(
       prereleaseNotes,
-      /## Highlights\n### Added\n- Overlay: Added prerelease coverage\./,
+      /### Fixed\n- Launcher: Fixed prerelease packaging checks\./,
     );
-    assert.match(prereleaseNotes, /### Fixed\n- Launcher: Fixed prerelease packaging checks\./);
     assert.match(prereleaseNotes, /## Installation\n\nSee the README and docs\/installation guide/);
   } finally {
     fs.rmSync(workspace, { recursive: true, force: true });

scripts/build-changelog.ts

@@ -430,21 +430,6 @@ export function writeChangelogArtifacts(options?: ChangelogOptions): {
   };
 }
 
-export function writeStableReleaseArtifacts(options?: ChangelogOptions): {
-  deletedFragmentPaths: string[];
-  docsChangelogPath: string;
-  outputPaths: string[];
-  releaseNotesPath: string;
-} {
-  const changelogResult = writeChangelogArtifacts(options);
-  const docsChangelogPath = generateDocsChangelog(options);
-
-  return {
-    ...changelogResult,
-    docsChangelogPath,
-  };
-}
-
 export function verifyChangelogFragments(options?: ChangelogOptions): void {
   readChangeFragments(options?.cwd ?? process.cwd(), options?.deps);
 }
@@ -741,11 +726,6 @@ function main(): void {
     return;
   }
 
-  if (command === 'build-release') {
-    writeStableReleaseArtifacts(options);
-    return;
-  }
-
   if (command === 'check') {
     verifyChangelogReadyForRelease(options);
     return;

scripts/get-mpv-window-windows.ps1

@@ -0,0 +1,175 @@
+param(
+  [ValidateSet('geometry')]
+  [string]$Mode = 'geometry',
+  [string]$SocketPath
+)
+
+$ErrorActionPreference = 'Stop'
+
+try {
+  Add-Type -TypeDefinition @"
+using System;
+using System.Runtime.InteropServices;
+
+public static class SubMinerWindowsHelper {
+  public delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+  [StructLayout(LayoutKind.Sequential)]
+  public struct RECT {
+    public int Left;
+    public int Top;
+    public int Right;
+    public int Bottom;
+  }
+
+  [DllImport("user32.dll")]
+  public static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+  [DllImport("user32.dll")]
+  [return: MarshalAs(UnmanagedType.Bool)]
+  public static extern bool IsWindowVisible(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  public static extern bool IsIconic(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  public static extern IntPtr GetForegroundWindow();
+
+  [DllImport("user32.dll", SetLastError = true)]
+  public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint processId);
+
+  [DllImport("user32.dll", SetLastError = true)]
+  [return: MarshalAs(UnmanagedType.Bool)]
+  public static extern bool GetWindowRect(IntPtr hWnd, out RECT rect);
+
+  [DllImport("dwmapi.dll")]
+  public static extern int DwmGetWindowAttribute(IntPtr hwnd, int dwAttribute, out RECT pvAttribute, int cbAttribute);
+}
+"@
+
+  $DWMWA_EXTENDED_FRAME_BOUNDS = 9
+
+  function Get-WindowBounds {
+    param([IntPtr]$hWnd)
+
+    $rect = New-Object SubMinerWindowsHelper+RECT
+    $size = [System.Runtime.InteropServices.Marshal]::SizeOf($rect)
+    $dwmResult = [SubMinerWindowsHelper]::DwmGetWindowAttribute(
+      $hWnd,
+      $DWMWA_EXTENDED_FRAME_BOUNDS,
+      [ref]$rect,
+      $size
+    )
+
+    if ($dwmResult -ne 0) {
+      if (-not [SubMinerWindowsHelper]::GetWindowRect($hWnd, [ref]$rect)) {
+        return $null
+      }
+    }
+
+    $width = $rect.Right - $rect.Left
+    $height = $rect.Bottom - $rect.Top
+    if ($width -le 0 -or $height -le 0) {
+      return $null
+    }
+
+    return [PSCustomObject]@{
+      X = $rect.Left
+      Y = $rect.Top
+      Width = $width
+      Height = $height
+      Area = $width * $height
+    }
+  }
+
+  $commandLineByPid = @{}
+  if (-not [string]::IsNullOrWhiteSpace($SocketPath)) {
+    foreach ($process in Get-CimInstance Win32_Process) {
+      $commandLineByPid[[uint32]$process.ProcessId] = $process.CommandLine
+    }
+  }
+
+  $mpvMatches = New-Object System.Collections.Generic.List[object]
+  $foregroundWindow = [SubMinerWindowsHelper]::GetForegroundWindow()
+  $callback = [SubMinerWindowsHelper+EnumWindowsProc]{
+    param([IntPtr]$hWnd, [IntPtr]$lParam)
+
+    if (-not [SubMinerWindowsHelper]::IsWindowVisible($hWnd)) {
+      return $true
+    }
+
+    if ([SubMinerWindowsHelper]::IsIconic($hWnd)) {
+      return $true
+    }
+
+    [uint32]$windowProcessId = 0
+    [void][SubMinerWindowsHelper]::GetWindowThreadProcessId($hWnd, [ref]$windowProcessId)
+    if ($windowProcessId -eq 0) {
+      return $true
+    }
+
+    try {
+      $process = Get-Process -Id $windowProcessId -ErrorAction Stop
+    } catch {
+      return $true
+    }
+
+    if ($process.ProcessName -ine 'mpv') {
+      return $true
+    }
+
+    if (-not [string]::IsNullOrWhiteSpace($SocketPath)) {
+      $commandLine = $commandLineByPid[[uint32]$windowProcessId]
+      if ([string]::IsNullOrWhiteSpace($commandLine)) {
+        return $true
+      }
+      if (
+        ($commandLine -notlike "*--input-ipc-server=$SocketPath*") -and
+        ($commandLine -notlike "*--input-ipc-server $SocketPath*")
+      ) {
+        return $true
+      }
+    }
+
+    $bounds = Get-WindowBounds -hWnd $hWnd
+    if ($null -eq $bounds) {
+      return $true
+    }
+
+    $mpvMatches.Add([PSCustomObject]@{
+      HWnd = $hWnd
+      X = $bounds.X
+      Y = $bounds.Y
+      Width = $bounds.Width
+      Height = $bounds.Height
+      Area = $bounds.Area
+      IsForeground = ($foregroundWindow -ne [IntPtr]::Zero -and $hWnd -eq $foregroundWindow)
+    })
+
+    return $true
+  }
+
+  [void][SubMinerWindowsHelper]::EnumWindows($callback, [IntPtr]::Zero)
+
+  $focusedMatch = $mpvMatches | Where-Object { $_.IsForeground } | Select-Object -First 1
+  if ($null -ne $focusedMatch) {
+    [Console]::Error.WriteLine('focus=focused')
+  } else {
+    [Console]::Error.WriteLine('focus=not-focused')
+  }
+
+  if ($mpvMatches.Count -eq 0) {
+    Write-Output 'not-found'
+    exit 0
+  }
+
+  $bestMatch = if ($null -ne $focusedMatch) {
+    $focusedMatch
+  } else {
+    $mpvMatches | Sort-Object -Property Area, Width, Height -Descending | Select-Object -First 1
+  }
+  Write-Output "$($bestMatch.X),$($bestMatch.Y),$($bestMatch.Width),$($bestMatch.Height)"
+} catch {
+  [Console]::Error.WriteLine($_.Exception.Message)
+  exit 1
+}

scripts/mkv-to-readme-video.sh

@@ -28,27 +28,6 @@ USAGE
 force=0
 generate_webp=0
 input=""
-ffmpeg_bin="${FFMPEG_BIN:-ffmpeg}"
-
-normalize_path() {
-	local value="$1"
-	if command -v cygpath > /dev/null 2>&1; then
-		case "$value" in
-			[A-Za-z]:\\* | [A-Za-z]:/*)
-				cygpath -u "$value"
-				return 0
-				;;
-		esac
-	fi
-	if [[ "$value" =~ ^([A-Za-z]):[\\/](.*)$ ]]; then
-		local drive="${BASH_REMATCH[1],,}"
-		local rest="${BASH_REMATCH[2]}"
-		rest="${rest//\\//}"
-		printf '/mnt/%s/%s\n' "$drive" "$rest"
-		return 0
-	fi
-	printf '%s\n' "$value"
-}
 
 while [[ $# -gt 0 ]]; do
 	case "$1" in
@@ -84,19 +63,9 @@ if [[ -z "$input" ]]; then
 	exit 1
 fi
 
-input="$(normalize_path "$input")"
-ffmpeg_bin="$(normalize_path "$ffmpeg_bin")"
-
-if [[ "$ffmpeg_bin" == */* ]]; then
-	if [[ ! -x "$ffmpeg_bin" ]]; then
-		echo "Error: ffmpeg binary is not executable: $ffmpeg_bin" >&2
-		exit 1
-	fi
-else
-	if ! command -v "$ffmpeg_bin" > /dev/null 2>&1; then
-		echo "Error: ffmpeg is not installed or not in PATH." >&2
-		exit 1
-	fi
+if ! command -v ffmpeg > /dev/null 2>&1; then
+	echo "Error: ffmpeg is not installed or not in PATH." >&2
+	exit 1
 fi
 
 if [[ ! -f "$input" ]]; then
@@ -133,7 +102,7 @@ fi
 
 has_encoder() {
 	local encoder="$1"
-	"$ffmpeg_bin" -hide_banner -encoders 2> /dev/null | awk -v encoder="$encoder" '$2 == encoder { found = 1 } END { exit(found ? 0 : 1) }'
+	ffmpeg -hide_banner -encoders 2> /dev/null | awk -v encoder="$encoder" '$2 == encoder { found = 1 } END { exit(found ? 0 : 1) }'
 }
 
 pick_webp_encoder() {
@@ -154,7 +123,7 @@ webm_vf="${crop_vf},fps=30"
 echo "Generating MP4: $mp4_out"
 if has_encoder "h264_nvenc"; then
 	echo "Trying GPU encoder for MP4: h264_nvenc"
-	if "$ffmpeg_bin" "$overwrite_flag" -i "$input" \
+	if ffmpeg "$overwrite_flag" -i "$input" \
 		-vf "$crop_vf" \
 		-c:v h264_nvenc -preset p6 -rc:v vbr -cq:v 20 -b:v 0 \
 		-pix_fmt yuv420p -movflags +faststart \
@@ -163,7 +132,7 @@ if has_encoder "h264_nvenc"; then
 		:
 	else
 		echo "GPU MP4 encode failed; retrying with CPU encoder: libx264"
-		"$ffmpeg_bin" "$overwrite_flag" -i "$input" \
+		ffmpeg "$overwrite_flag" -i "$input" \
 			-vf "$crop_vf" \
 			-c:v libx264 -preset slow -crf 20 \
 			-profile:v high -level 4.1 -pix_fmt yuv420p \
@@ -173,7 +142,7 @@ if has_encoder "h264_nvenc"; then
 	fi
 else
 	echo "Using CPU encoder for MP4: libx264"
-	"$ffmpeg_bin" "$overwrite_flag" -i "$input" \
+	ffmpeg "$overwrite_flag" -i "$input" \
 		-vf "$crop_vf" \
 		-c:v libx264 -preset slow -crf 20 \
 		-profile:v high -level 4.1 -pix_fmt yuv420p \
@@ -185,7 +154,7 @@ fi
 echo "Generating WebM: $webm_out"
 if has_encoder "av1_nvenc"; then
 	echo "Trying GPU encoder for WebM: av1_nvenc"
-	if "$ffmpeg_bin" "$overwrite_flag" -i "$input" \
+	if ffmpeg "$overwrite_flag" -i "$input" \
 		-vf "$webm_vf" \
 		-c:v av1_nvenc -preset p6 -cq:v 34 -b:v 0 \
 		-c:a libopus -b:a 96k \
@@ -193,7 +162,7 @@ if has_encoder "av1_nvenc"; then
 		:
 	else
 		echo "GPU WebM encode failed; retrying with CPU encoder: libvpx-vp9"
-		"$ffmpeg_bin" "$overwrite_flag" -i "$input" \
+		ffmpeg "$overwrite_flag" -i "$input" \
 			-vf "$webm_vf" \
 			-c:v libvpx-vp9 -crf 34 -b:v 0 \
 			-row-mt 1 -threads 8 \
@@ -202,7 +171,7 @@ if has_encoder "av1_nvenc"; then
 	fi
 else
 	echo "Using CPU encoder for WebM: libvpx-vp9"
-	"$ffmpeg_bin" "$overwrite_flag" -i "$input" \
+	ffmpeg "$overwrite_flag" -i "$input" \
 		-vf "$webm_vf" \
 		-c:v libvpx-vp9 -crf 34 -b:v 0 \
 		-row-mt 1 -threads 8 \
@@ -216,7 +185,7 @@ if [[ "$generate_webp" -eq 1 ]]; then
 		exit 1
 	fi
 	echo "Generating animated WebP with $webp_encoder: $webp_out"
-	"$ffmpeg_bin" "$overwrite_flag" -i "$input" \
+	ffmpeg "$overwrite_flag" -i "$input" \
 		-vf "${crop_vf},fps=24,scale=960:-1:flags=lanczos" \
 		-c:v "$webp_encoder" \
 		-q:v 80 \
@@ -226,7 +195,7 @@ if [[ "$generate_webp" -eq 1 ]]; then
 fi
 
 echo "Generating poster: $poster_out"
-"$ffmpeg_bin" "$overwrite_flag" -ss 00:00:05 -i "$input" \
+ffmpeg "$overwrite_flag" -ss 00:00:05 -i "$input" \
 	-vf "$crop_vf" \
 	-vframes 1 \
 	-q:v 2 \

scripts/mkv-to-readme-video.test.ts

@@ -19,33 +19,11 @@ function writeExecutable(filePath: string, contents: string): void {
   fs.chmodSync(filePath, 0o755);
 }
 
-function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, `'\"'\"'`)}'`;
-}
-
-function toBashPath(filePath: string): string {
-  if (process.platform !== 'win32') return filePath;
-
-  const normalized = filePath.replace(/\\/g, '/');
-  const match = normalized.match(/^([A-Za-z]):\/(.*)$/);
-  if (!match) return normalized;
-
-  const drive = match[1]!;
-  const rest = match[2]!;
-  const probe = spawnSync('bash', ['-c', 'uname -s'], { encoding: 'utf8' });
-  if (probe.status === 0 && /linux/i.test(probe.stdout)) {
-    return `/mnt/${drive.toLowerCase()}/${rest}`;
-  }
-
-  return `${drive.toUpperCase()}:/${rest}`;
-}
-
 test('mkv-to-readme-video accepts libwebp_anim when libwebp is unavailable', () => {
   withTempDir((root) => {
     const binDir = path.join(root, 'bin');
     const inputPath = path.join(root, 'sample.mkv');
     const ffmpegLogPath = path.join(root, 'ffmpeg-args.log');
-    const ffmpegLogPathBash = toBashPath(ffmpegLogPath);
 
     fs.mkdirSync(binDir, { recursive: true });
     fs.writeFileSync(inputPath, 'fake-video', 'utf8');
@@ -66,33 +44,22 @@ EOF
   exit 0
 fi
 
-if [[ "$#" -eq 0 ]]; then
-  exit 0
-fi
-
-printf '%s\\n' "$*" >> "${ffmpegLogPathBash}"
+printf '%s\\n' "$*" >> "${ffmpegLogPath}"
 output=""
 for arg in "$@"; do
   output="$arg"
 done
-if [[ -z "$output" ]]; then
-  exit 0
-fi
 mkdir -p "$(dirname "$output")"
 touch "$output"
 `,
     );
 
-    const ffmpegShimPath = toBashPath(path.join(binDir, 'ffmpeg'));
-    const ffmpegShimDir = toBashPath(binDir);
-    const inputBashPath = toBashPath(inputPath);
-    const command = [
-      `chmod +x ${shellQuote(ffmpegShimPath)}`,
-      `PATH=${shellQuote(`${ffmpegShimDir}:`)}"$PATH"`,
-      `scripts/mkv-to-readme-video.sh --webp ${shellQuote(inputBashPath)}`,
-    ].join('; ');
-    const result = spawnSync('bash', ['-lc', command], {
+    const result = spawnSync('bash', ['scripts/mkv-to-readme-video.sh', '--webp', inputPath], {
       cwd: process.cwd(),
+      env: {
+        ...process.env,
+        PATH: `${binDir}:${process.env.PATH || ''}`,
+      },
       encoding: 'utf8',
     });
 

scripts/prepare-build-assets.mjs

@@ -8,6 +8,8 @@ const repoRoot = path.resolve(scriptDir, '..');
 const rendererSourceDir = path.join(repoRoot, 'src', 'renderer');
 const rendererOutputDir = path.join(repoRoot, 'dist', 'renderer');
 const scriptsOutputDir = path.join(repoRoot, 'dist', 'scripts');
+const windowsHelperSourcePath = path.join(scriptDir, 'get-mpv-window-windows.ps1');
+const windowsHelperOutputPath = path.join(scriptsOutputDir, 'get-mpv-window-windows.ps1');
 const macosHelperSourcePath = path.join(scriptDir, 'get-mpv-window-macos.swift');
 const macosHelperBinaryPath = path.join(scriptsOutputDir, 'get-mpv-window-macos');
 const macosHelperSourceCopyPath = path.join(scriptsOutputDir, 'get-mpv-window-macos.swift');
@@ -31,6 +33,11 @@ function copyRendererAssets() {
   process.stdout.write(`Staged renderer assets in ${rendererOutputDir}\n`);
 }
 
+function stageWindowsHelper() {
+  copyFile(windowsHelperSourcePath, windowsHelperOutputPath);
+  process.stdout.write(`Staged Windows helper: ${windowsHelperOutputPath}\n`);
+}
+
 function fallbackToMacosSource() {
   copyFile(macosHelperSourcePath, macosHelperSourceCopyPath);
   process.stdout.write(`Staged macOS helper source fallback: ${macosHelperSourceCopyPath}\n`);
@@ -70,6 +77,7 @@ function buildMacosHelper() {
 
 function main() {
   copyRendererAssets();
+  stageWindowsHelper();
   buildMacosHelper();
 }
 

scripts/test-plugin-lua-compat.lua

@@ -1,141 +0,0 @@
-local MODULE_PATHS = {
-	"plugin/subminer/hover.lua",
-	"plugin/subminer/environment.lua",
-}
-
-local LEGACY_PARSER_CANDIDATES = {
-	"luajit",
-	"lua5.1",
-	"lua51",
-}
-
-local function assert_true(condition, message)
-	if condition then
-		return
-	end
-	error(message or "assert_true failed")
-end
-
-local function read_file(path)
-	local file = assert(io.open(path, "r"), "failed to open " .. path)
-	local content = file:read("*a")
-	file:close()
-	return content
-end
-
-local function find_legacy_incompatible_continue(source)
-	local goto_start, goto_end = source:find("%f[%a]goto%s+continue%f[%A]")
-	if goto_start then
-		return "goto continue", goto_start, goto_end
-	end
-
-	local label_start, label_end = source:find("::continue::", 1, true)
-	if label_start then
-		return "::continue::", label_start, label_end
-	end
-
-	return nil
-end
-
-local function assert_no_legacy_incompatible_continue(path)
-	local source = read_file(path)
-	local match = find_legacy_incompatible_continue(source)
-	assert_true(match == nil, path .. " still contains legacy-incompatible continue control flow: " .. tostring(match))
-end
-
-local function assert_loadfile_ok(path)
-	local chunk, err = loadfile(path)
-	assert_true(chunk ~= nil, "loadfile failed for " .. path .. ": " .. tostring(err))
-end
-
-local function normalize_execute_result(ok, why, code)
-	if type(ok) == "number" then
-		return ok == 0, ok
-	end
-	if type(ok) == "boolean" then
-		if ok then
-			return true, code or 0
-		end
-		return false, code or 1
-	end
-	return false, code or 1
-end
-
-local function command_succeeds(command)
-	local ok, why, code = os.execute(command)
-	return normalize_execute_result(ok, why, code)
-end
-
-local function command_exists(command)
-	local shell = package.config:sub(1, 1) == "\\" and "where " or "command -v "
-	local redirect = package.config:sub(1, 1) == "\\" and " >NUL 2>NUL" or " >/dev/null 2>&1"
-	local escaped = command
-	local success = command_succeeds(shell .. escaped .. redirect)
-	return success
-end
-
-local function find_legacy_parser()
-	for _, command in ipairs(LEGACY_PARSER_CANDIDATES) do
-		if command_exists(command) then
-			return command
-		end
-	end
-	return nil
-end
-
-local function shell_redirect()
-	if package.config:sub(1, 1) == "\\" then
-		return " >NUL 2>NUL"
-	end
-	return " >/dev/null 2>&1"
-end
-
-local function assert_parser_accepts_file(parser, path)
-	local command = string.format("%s -e %q%s", parser, "assert(loadfile(" .. string.format("%q", path) .. "))", shell_redirect())
-	local success = command_succeeds(command)
-	assert_true(success, parser .. " failed to parse " .. path)
-end
-
-local function assert_parser_rejects_legacy_fixture(parser)
-	local legacy_fixture = [[
-local tokens = {}
-for _, token in ipairs(tokens or {}) do
-	if type(token) ~= "table" then
-		goto continue
-	end
-	::continue::
-end
-]]
-	local command = string.format("%s -e %q%s", parser, legacy_fixture, shell_redirect())
-	local success = command_succeeds(command)
-	assert_true(not success, parser .. " unexpectedly accepted legacy goto/label continue fixture")
-end
-
-do
-	local legacy_fixture = [[
-for _, token in ipairs(tokens or {}) do
-	if type(token) ~= "table" then
-		goto continue
-	end
-	::continue::
-end
-]]
-	local match = find_legacy_incompatible_continue(legacy_fixture)
-	assert_true(match ~= nil, "legacy fixture should trigger incompatible continue detector")
-end
-
-for _, path in ipairs(MODULE_PATHS) do
-	assert_no_legacy_incompatible_continue(path)
-	assert_loadfile_ok(path)
-end
-
-local parser = find_legacy_parser()
-if parser then
-	assert_parser_rejects_legacy_fixture(parser)
-	for _, path in ipairs(MODULE_PATHS) do
-		assert_parser_accepts_file(parser, path)
-	end
-	print("plugin lua compatibility regression tests: OK (" .. parser .. ")")
-else
-	print("plugin lua compatibility regression tests: OK (legacy parser unavailable; structural checks only)")
-end

scripts/update-aur-package.sh

@@ -13,26 +13,6 @@ appimage=
 wrapper=
 assets=
 
-normalize_path() {
-  local value="$1"
-  if command -v cygpath >/dev/null 2>&1; then
-    case "$value" in
-      [A-Za-z]:\\* | [A-Za-z]:/*)
-        cygpath -u "$value"
-        return 0
-        ;;
-    esac
-  fi
-  if [[ "$value" =~ ^([A-Za-z]):[\\/](.*)$ ]]; then
-    local drive="${BASH_REMATCH[1],,}"
-    local rest="${BASH_REMATCH[2]}"
-    rest="${rest//\\//}"
-    printf '/mnt/%s/%s\n' "$drive" "$rest"
-    return 0
-  fi
-  printf '%s\n' "$value"
-}
-
 while [[ $# -gt 0 ]]; do
   case "$1" in
     --pkg-dir)
@@ -73,10 +53,6 @@ if [[ -z "$pkg_dir" || -z "$version" || -z "$appimage" || -z "$wrapper" || -z "$
 fi
 
 version="${version#v}"
-pkg_dir="$(normalize_path "$pkg_dir")"
-appimage="$(normalize_path "$appimage")"
-wrapper="$(normalize_path "$wrapper")"
-assets="$(normalize_path "$assets")"
 pkgbuild="${pkg_dir}/PKGBUILD"
 srcinfo="${pkg_dir}/.SRCINFO"
 
@@ -106,9 +82,6 @@ awk \
     found_pkgver = 0
     found_sha_block = 0
   }
-  {
-    sub(/\r$/, "")
-  }
   /^pkgver=/ {
     print "pkgver=" version
     found_pkgver = 1
@@ -167,9 +140,6 @@ awk \
     found_source_wrapper = 0
     found_source_assets = 0
   }
-  {
-    sub(/\r$/, "")
-  }
   /^\tpkgver = / {
     print "\tpkgver = " version
     found_pkgver = 1

scripts/update-aur-package.test.ts

@@ -1,6 +1,5 @@
 import assert from 'node:assert/strict';
-import { execFileSync, spawnSync } from 'node:child_process';
-import crypto from 'node:crypto';
+import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -10,23 +9,6 @@ function createWorkspace(name: string): string {
   return fs.mkdtempSync(path.join(os.tmpdir(), `${name}-`));
 }
 
-function toBashPath(filePath: string): string {
-  if (process.platform !== 'win32') return filePath;
-
-  const normalized = filePath.replace(/\\/g, '/');
-  const match = normalized.match(/^([A-Za-z]):\/(.*)$/);
-  if (!match) return normalized;
-
-  const drive = match[1]!;
-  const rest = match[2]!;
-  const probe = spawnSync('bash', ['-c', 'uname -s'], { encoding: 'utf8' });
-  if (probe.status === 0 && /linux/i.test(probe.stdout)) {
-    return `/mnt/${drive.toLowerCase()}/${rest}`;
-  }
-
-  return `${drive.toUpperCase()}:/${rest}`;
-}
-
 test('update-aur-package updates PKGBUILD and .SRCINFO without makepkg', () => {
   const workspace = createWorkspace('subminer-aur-package');
   const pkgDir = path.join(workspace, 'aur-subminer-bin');
@@ -47,15 +29,15 @@ test('update-aur-package updates PKGBUILD and .SRCINFO without makepkg', () => {
       [
         'scripts/update-aur-package.sh',
         '--pkg-dir',
-        toBashPath(pkgDir),
+        pkgDir,
         '--version',
         'v0.6.3',
         '--appimage',
-        toBashPath(appImagePath),
+        appImagePath,
         '--wrapper',
-        toBashPath(wrapperPath),
+        wrapperPath,
         '--assets',
-        toBashPath(assetsPath),
+        assetsPath,
       ],
       {
         cwd: process.cwd(),
@@ -65,8 +47,8 @@ test('update-aur-package updates PKGBUILD and .SRCINFO without makepkg', () => {
 
     const pkgbuild = fs.readFileSync(path.join(pkgDir, 'PKGBUILD'), 'utf8');
     const srcinfo = fs.readFileSync(path.join(pkgDir, '.SRCINFO'), 'utf8');
-    const expectedSums = [appImagePath, wrapperPath, assetsPath].map((filePath) =>
-      crypto.createHash('sha256').update(fs.readFileSync(filePath)).digest('hex'),
+    const expectedSums = [appImagePath, wrapperPath, assetsPath].map(
+      (filePath) => execFileSync('sha256sum', [filePath], { encoding: 'utf8' }).split(/\s+/)[0],
     );
 
     assert.match(pkgbuild, /^pkgver=0\.6\.3$/m);

src/cli/args.test.ts

@@ -73,46 +73,6 @@ test('parseArgs captures youtube startup forwarding flags', () => {
   assert.equal(shouldStartApp(args), true);
 });
 
-test('parseArgs captures session action forwarding flags', () => {
-  const args = parseArgs([
-    '--toggle-stats-overlay',
-    '--open-jimaku',
-    '--open-youtube-picker',
-    '--open-playlist-browser',
-    '--replay-current-subtitle',
-    '--play-next-subtitle',
-    '--shift-sub-delay-prev-line',
-    '--shift-sub-delay-next-line',
-    '--cycle-runtime-option',
-    'anki.autoUpdateNewCards:prev',
-    '--copy-subtitle-count',
-    '3',
-    '--mine-sentence-count=2',
-  ]);
-
-  assert.equal(args.toggleStatsOverlay, true);
-  assert.equal(args.openJimaku, true);
-  assert.equal(args.openYoutubePicker, true);
-  assert.equal(args.openPlaylistBrowser, true);
-  assert.equal(args.replayCurrentSubtitle, true);
-  assert.equal(args.playNextSubtitle, true);
-  assert.equal(args.shiftSubDelayPrevLine, true);
-  assert.equal(args.shiftSubDelayNextLine, true);
-  assert.equal(args.cycleRuntimeOptionId, 'anki.autoUpdateNewCards');
-  assert.equal(args.cycleRuntimeOptionDirection, -1);
-  assert.equal(args.copySubtitleCount, 3);
-  assert.equal(args.mineSentenceCount, 2);
-  assert.equal(hasExplicitCommand(args), true);
-  assert.equal(shouldStartApp(args), true);
-});
-
-test('parseArgs ignores non-positive numeric session action counts', () => {
-  const args = parseArgs(['--copy-subtitle-count=0', '--mine-sentence-count', '-1']);
-
-  assert.equal(args.copySubtitleCount, undefined);
-  assert.equal(args.mineSentenceCount, undefined);
-});
-
 test('youtube playback does not use generic overlay-runtime bootstrap classification', () => {
   const args = parseArgs(['--youtube-play', 'https://youtube.com/watch?v=abc']);
 
@@ -212,21 +172,6 @@ test('hasExplicitCommand and shouldStartApp preserve command intent', () => {
   assert.equal(hasExplicitCommand(anilistRetryQueue), true);
   assert.equal(shouldStartApp(anilistRetryQueue), false);
 
-  const toggleStatsOverlay = parseArgs(['--toggle-stats-overlay']);
-  assert.equal(toggleStatsOverlay.toggleStatsOverlay, true);
-  assert.equal(hasExplicitCommand(toggleStatsOverlay), true);
-  assert.equal(shouldStartApp(toggleStatsOverlay), true);
-
-  const cycleRuntimeOption = parseArgs(['--cycle-runtime-option', 'anki.autoUpdateNewCards:next']);
-  assert.equal(cycleRuntimeOption.cycleRuntimeOptionId, 'anki.autoUpdateNewCards');
-  assert.equal(cycleRuntimeOption.cycleRuntimeOptionDirection, 1);
-  assert.equal(hasExplicitCommand(cycleRuntimeOption), true);
-  assert.equal(shouldStartApp(cycleRuntimeOption), true);
-  assert.equal(commandNeedsOverlayRuntime(cycleRuntimeOption), true);
-
-  const toggleStatsOverlayRuntime = parseArgs(['--toggle-stats-overlay']);
-  assert.equal(commandNeedsOverlayRuntime(toggleStatsOverlayRuntime), true);
-
   const dictionary = parseArgs(['--dictionary']);
   assert.equal(dictionary.dictionary, true);
   assert.equal(hasExplicitCommand(dictionary), true);

src/cli/args.ts

@@ -24,23 +24,7 @@ export interface CliArgs {
   triggerFieldGrouping: boolean;
   triggerSubsync: boolean;
   markAudioCard: boolean;
-  toggleStatsOverlay: boolean;
-  toggleSubtitleSidebar: boolean;
   openRuntimeOptions: boolean;
-  openSessionHelp: boolean;
-  openControllerSelect: boolean;
-  openControllerDebug: boolean;
-  openJimaku: boolean;
-  openYoutubePicker: boolean;
-  openPlaylistBrowser: boolean;
-  replayCurrentSubtitle: boolean;
-  playNextSubtitle: boolean;
-  shiftSubDelayPrevLine: boolean;
-  shiftSubDelayNextLine: boolean;
-  cycleRuntimeOptionId?: string;
-  cycleRuntimeOptionDirection?: 1 | -1;
-  copySubtitleCount?: number;
-  mineSentenceCount?: number;
   anilistStatus: boolean;
   anilistLogout: boolean;
   anilistSetup: boolean;
@@ -118,19 +102,7 @@ export function parseArgs(argv: string[]): CliArgs {
     triggerFieldGrouping: false,
     triggerSubsync: false,
     markAudioCard: false,
-    toggleStatsOverlay: false,
-    toggleSubtitleSidebar: false,
     openRuntimeOptions: false,
-    openSessionHelp: false,
-    openControllerSelect: false,
-    openControllerDebug: false,
-    openJimaku: false,
-    openYoutubePicker: false,
-    openPlaylistBrowser: false,
-    replayCurrentSubtitle: false,
-    playNextSubtitle: false,
-    shiftSubDelayPrevLine: false,
-    shiftSubDelayNextLine: false,
     anilistStatus: false,
     anilistLogout: false,
     anilistSetup: false,
@@ -166,27 +138,6 @@ export function parseArgs(argv: string[]): CliArgs {
     return value;
   };
 
-  const parseCycleRuntimeOption = (
-    value: string | undefined,
-  ): { id: string; direction: 1 | -1 } | null => {
-    if (!value) return null;
-    const separatorIndex = value.lastIndexOf(':');
-    if (separatorIndex <= 0 || separatorIndex === value.length - 1) return null;
-    const id = value.slice(0, separatorIndex).trim();
-    const rawDirection = value
-      .slice(separatorIndex + 1)
-      .trim()
-      .toLowerCase();
-    if (!id) return null;
-    if (rawDirection === 'next' || rawDirection === '1') {
-      return { id, direction: 1 };
-    }
-    if (rawDirection === 'prev' || rawDirection === '-1') {
-      return { id, direction: -1 };
-    }
-    return null;
-  };
-
   for (let i = 0; i < argv.length; i += 1) {
     const arg = argv[i];
     if (!arg || !arg.startsWith('--')) continue;
@@ -228,44 +179,8 @@ export function parseArgs(argv: string[]): CliArgs {
     else if (arg === '--trigger-field-grouping') args.triggerFieldGrouping = true;
     else if (arg === '--trigger-subsync') args.triggerSubsync = true;
     else if (arg === '--mark-audio-card') args.markAudioCard = true;
-    else if (arg === '--toggle-stats-overlay') args.toggleStatsOverlay = true;
-    else if (arg === '--toggle-subtitle-sidebar') args.toggleSubtitleSidebar = true;
     else if (arg === '--open-runtime-options') args.openRuntimeOptions = true;
-    else if (arg === '--open-session-help') args.openSessionHelp = true;
-    else if (arg === '--open-controller-select') args.openControllerSelect = true;
-    else if (arg === '--open-controller-debug') args.openControllerDebug = true;
-    else if (arg === '--open-jimaku') args.openJimaku = true;
-    else if (arg === '--open-youtube-picker') args.openYoutubePicker = true;
-    else if (arg === '--open-playlist-browser') args.openPlaylistBrowser = true;
-    else if (arg === '--replay-current-subtitle') args.replayCurrentSubtitle = true;
-    else if (arg === '--play-next-subtitle') args.playNextSubtitle = true;
-    else if (arg === '--shift-sub-delay-prev-line') args.shiftSubDelayPrevLine = true;
-    else if (arg === '--shift-sub-delay-next-line') args.shiftSubDelayNextLine = true;
-    else if (arg.startsWith('--cycle-runtime-option=')) {
-      const parsed = parseCycleRuntimeOption(arg.split('=', 2)[1]);
-      if (parsed) {
-        args.cycleRuntimeOptionId = parsed.id;
-        args.cycleRuntimeOptionDirection = parsed.direction;
-      }
-    } else if (arg === '--cycle-runtime-option') {
-      const parsed = parseCycleRuntimeOption(readValue(argv[i + 1]));
-      if (parsed) {
-        args.cycleRuntimeOptionId = parsed.id;
-        args.cycleRuntimeOptionDirection = parsed.direction;
-      }
-    } else if (arg.startsWith('--copy-subtitle-count=')) {
-      const value = Number(arg.split('=', 2)[1]);
-      if (Number.isInteger(value) && value > 0) args.copySubtitleCount = value;
-    } else if (arg === '--copy-subtitle-count') {
-      const value = Number(readValue(argv[i + 1]));
-      if (Number.isInteger(value) && value > 0) args.copySubtitleCount = value;
-    } else if (arg.startsWith('--mine-sentence-count=')) {
-      const value = Number(arg.split('=', 2)[1]);
-      if (Number.isInteger(value) && value > 0) args.mineSentenceCount = value;
-    } else if (arg === '--mine-sentence-count') {
-      const value = Number(readValue(argv[i + 1]));
-      if (Number.isInteger(value) && value > 0) args.mineSentenceCount = value;
-    } else if (arg === '--anilist-status') args.anilistStatus = true;
+    else if (arg === '--anilist-status') args.anilistStatus = true;
     else if (arg === '--anilist-logout') args.anilistLogout = true;
     else if (arg === '--anilist-setup') args.anilistSetup = true;
     else if (arg === '--anilist-retry-queue') args.anilistRetryQueue = true;
@@ -456,22 +371,7 @@ export function hasExplicitCommand(args: CliArgs): boolean {
     args.triggerFieldGrouping ||
     args.triggerSubsync ||
     args.markAudioCard ||
-    args.toggleStatsOverlay ||
-    args.toggleSubtitleSidebar ||
     args.openRuntimeOptions ||
-    args.openSessionHelp ||
-    args.openControllerSelect ||
-    args.openControllerDebug ||
-    args.openJimaku ||
-    args.openYoutubePicker ||
-    args.openPlaylistBrowser ||
-    args.replayCurrentSubtitle ||
-    args.playNextSubtitle ||
-    args.shiftSubDelayPrevLine ||
-    args.shiftSubDelayNextLine ||
-    args.cycleRuntimeOptionId !== undefined ||
-    args.copySubtitleCount !== undefined ||
-    args.mineSentenceCount !== undefined ||
     args.anilistStatus ||
     args.anilistLogout ||
     args.anilistSetup ||
@@ -523,22 +423,7 @@ export function isStandaloneTexthookerCommand(args: CliArgs): boolean {
     !args.triggerFieldGrouping &&
     !args.triggerSubsync &&
     !args.markAudioCard &&
-    !args.toggleStatsOverlay &&
-    !args.toggleSubtitleSidebar &&
     !args.openRuntimeOptions &&
-    !args.openSessionHelp &&
-    !args.openControllerSelect &&
-    !args.openControllerDebug &&
-    !args.openJimaku &&
-    !args.openYoutubePicker &&
-    !args.openPlaylistBrowser &&
-    !args.replayCurrentSubtitle &&
-    !args.playNextSubtitle &&
-    !args.shiftSubDelayPrevLine &&
-    !args.shiftSubDelayNextLine &&
-    args.cycleRuntimeOptionId === undefined &&
-    args.copySubtitleCount === undefined &&
-    args.mineSentenceCount === undefined &&
     !args.anilistStatus &&
     !args.anilistLogout &&
     !args.anilistSetup &&
@@ -581,22 +466,7 @@ export function shouldStartApp(args: CliArgs): boolean {
     args.triggerFieldGrouping ||
     args.triggerSubsync ||
     args.markAudioCard ||
-    args.toggleStatsOverlay ||
-    args.toggleSubtitleSidebar ||
     args.openRuntimeOptions ||
-    args.openSessionHelp ||
-    args.openControllerSelect ||
-    args.openControllerDebug ||
-    args.openJimaku ||
-    args.openYoutubePicker ||
-    args.openPlaylistBrowser ||
-    args.replayCurrentSubtitle ||
-    args.playNextSubtitle ||
-    args.shiftSubDelayPrevLine ||
-    args.shiftSubDelayNextLine ||
-    args.cycleRuntimeOptionId !== undefined ||
-    args.copySubtitleCount !== undefined ||
-    args.mineSentenceCount !== undefined ||
     args.dictionary ||
     args.stats ||
     args.jellyfin ||
@@ -634,22 +504,7 @@ export function shouldRunSettingsOnlyStartup(args: CliArgs): boolean {
     !args.triggerFieldGrouping &&
     !args.triggerSubsync &&
     !args.markAudioCard &&
-    !args.toggleStatsOverlay &&
-    !args.toggleSubtitleSidebar &&
     !args.openRuntimeOptions &&
-    !args.openSessionHelp &&
-    !args.openControllerSelect &&
-    !args.openControllerDebug &&
-    !args.openJimaku &&
-    !args.openYoutubePicker &&
-    !args.openPlaylistBrowser &&
-    !args.replayCurrentSubtitle &&
-    !args.playNextSubtitle &&
-    !args.shiftSubDelayPrevLine &&
-    !args.shiftSubDelayNextLine &&
-    args.cycleRuntimeOptionId === undefined &&
-    args.copySubtitleCount === undefined &&
-    args.mineSentenceCount === undefined &&
     !args.anilistStatus &&
     !args.anilistLogout &&
     !args.anilistSetup &&
@@ -689,25 +544,10 @@ export function commandNeedsOverlayRuntime(args: CliArgs): boolean {
     args.mineSentenceMultiple ||
     args.updateLastCardFromClipboard ||
     args.toggleSecondarySub ||
-    args.toggleStatsOverlay ||
-    args.toggleSubtitleSidebar ||
     args.triggerFieldGrouping ||
     args.triggerSubsync ||
     args.markAudioCard ||
-    args.openRuntimeOptions ||
-    args.openSessionHelp ||
-    args.openControllerSelect ||
-    args.openControllerDebug ||
-    args.openJimaku ||
-    args.openYoutubePicker ||
-    args.openPlaylistBrowser ||
-    args.replayCurrentSubtitle ||
-    args.playNextSubtitle ||
-    args.shiftSubDelayPrevLine ||
-    args.shiftSubDelayNextLine ||
-    args.cycleRuntimeOptionId !== undefined ||
-    args.copySubtitleCount !== undefined ||
-    args.mineSentenceCount !== undefined
+    args.openRuntimeOptions
   );
 }
 

src/cli/help.ts

@@ -35,11 +35,7 @@ ${B}Mining${R}
   --trigger-field-grouping       Run Kiku field grouping
   --trigger-subsync              Run subtitle sync
   --toggle-secondary-sub         Cycle secondary subtitle mode
-  --toggle-subtitle-sidebar      Toggle subtitle sidebar panel
   --open-runtime-options         Open runtime options palette
-  --open-session-help            Open session help modal
-  --open-controller-select       Open controller select modal
-  --open-controller-debug        Open controller debug modal
 
 ${B}AniList${R}
   --anilist-setup                Open AniList authentication flow

src/config/config.test.ts

@@ -50,7 +50,6 @@ test('loads defaults when config is missing', () => {
   assert.equal(config.startupWarmups.yomitanExtension, true);
   assert.equal(config.startupWarmups.subtitleDictionaries, true);
   assert.equal(config.startupWarmups.jellyfinRemoteSession, true);
-  assert.equal(config.shortcuts.toggleSubtitleSidebar, 'Backslash');
   assert.equal(config.discordPresence.enabled, true);
   assert.equal(config.discordPresence.updateIntervalMs, 3_000);
   assert.equal(config.subtitleStyle.backgroundColor, 'rgb(30, 32, 48, 0.88)');

src/config/definitions/defaults-core.ts

@@ -88,10 +88,6 @@ export const CORE_DEFAULT_CONFIG: Pick<
     markAudioCard: 'CommandOrControl+Shift+A',
     openRuntimeOptions: 'CommandOrControl+Shift+O',
     openJimaku: 'Ctrl+Shift+J',
-    openSessionHelp: 'CommandOrControl+Shift+H',
-    openControllerSelect: 'Alt+C',
-    openControllerDebug: 'Alt+Shift+C',
-    toggleSubtitleSidebar: 'Backslash',
   },
   secondarySub: {
     secondarySubLanguages: [],

src/core/services/__tests__/stats-server.test.ts

@@ -166,20 +166,14 @@ const TRENDS_DASHBOARD = {
   ratios: {
     lookupsPerHundred: [{ label: 'Mar 1', value: 5 }],
   },
-  librarySummary: [
-    {
-      title: 'Little Witch Academia',
-      watchTimeMin: 25,
-      videos: 1,
-      sessions: 1,
-      cards: 5,
-      words: 300,
-      lookups: 15,
-      lookupsPerHundred: 5,
-      firstWatched: 20_000,
-      lastWatched: 20_000,
-    },
-  ],
+  animePerDay: {
+    episodes: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 1 }],
+    watchTime: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 25 }],
+    cards: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 5 }],
+    words: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 300 }],
+    lookups: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 15 }],
+    lookupsPerHundred: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 5 }],
+  },
   animeCumulative: {
     watchTime: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 25 }],
     episodes: [{ epochDay: 20_000, animeTitle: 'Little Witch Academia', value: 1 }],
@@ -604,23 +598,7 @@ describe('stats server API routes', () => {
     const body = await res.json();
     assert.deepEqual(seenArgs, ['90d', 'month']);
     assert.deepEqual(body.activity.watchTime, TRENDS_DASHBOARD.activity.watchTime);
-    assert.deepEqual(body.librarySummary, TRENDS_DASHBOARD.librarySummary);
-  });
-
-  it('GET /api/stats/trends/dashboard accepts 365d range', async () => {
-    let seenArgs: unknown[] = [];
-    const app = createStatsApp(
-      createMockTracker({
-        getTrendsDashboard: async (...args: unknown[]) => {
-          seenArgs = args;
-          return TRENDS_DASHBOARD;
-        },
-      }),
-    );
-
-    const res = await app.request('/api/stats/trends/dashboard?range=365d&groupBy=month');
-    assert.equal(res.status, 200);
-    assert.deepEqual(seenArgs, ['365d', 'month']);
+    assert.deepEqual(body.animePerDay.watchTime, TRENDS_DASHBOARD.animePerDay.watchTime);
   });
 
   it('GET /api/stats/trends/dashboard falls back to safe defaults for invalid params', async () => {

src/core/services/app-lifecycle.test.ts

@@ -28,21 +28,7 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
     triggerFieldGrouping: false,
     triggerSubsync: false,
     markAudioCard: false,
-    toggleStatsOverlay: false,
-    toggleSubtitleSidebar: false,
     openRuntimeOptions: false,
-    openSessionHelp: false,
-    openControllerSelect: false,
-    openControllerDebug: false,
-    openJimaku: false,
-    openYoutubePicker: false,
-    openPlaylistBrowser: false,
-    replayCurrentSubtitle: false,
-    playNextSubtitle: false,
-    shiftSubDelayPrevLine: false,
-    shiftSubDelayNextLine: false,
-    cycleRuntimeOptionId: undefined,
-    cycleRuntimeOptionDirection: undefined,
     anilistStatus: false,
     anilistLogout: false,
     anilistSetup: false,

src/core/services/app-ready.test.ts

@@ -75,7 +75,11 @@ test('runAppReadyRuntime starts websocket in auto mode when plugin missing', asy
     calls.indexOf('setVisibleOverlayVisible:true') < calls.indexOf('initializeOverlayRuntime'),
   );
   assert.ok(calls.includes('startBackgroundWarmups'));
-  assert.ok(calls.includes('log:Runtime ready: immersion tracker startup requested.'));
+  assert.ok(
+    calls.includes(
+      'log:Runtime ready: immersion tracker startup deferred until first media activity.',
+    ),
+  );
 });
 
 test('runAppReadyRuntime starts texthooker on startup when enabled in config', async () => {
@@ -99,17 +103,6 @@ test('runAppReadyRuntime starts texthooker on startup when enabled in config', a
   );
 });
 
-test('runAppReadyRuntime creates immersion tracker during heavy startup', async () => {
-  const { deps, calls } = makeDeps({
-    shouldAutoInitializeOverlayRuntimeFromConfig: () => false,
-  });
-
-  await runAppReadyRuntime(deps);
-
-  assert.equal(calls.includes('createImmersionTracker'), false);
-  assert.ok(calls.includes('log:Runtime ready: immersion tracker startup requested.'));
-});
-
 test('runAppReadyRuntime keeps annotation websocket enabled when regular websocket auto-skips', async () => {
   const { deps, calls } = makeDeps({
     getResolvedConfig: () => ({

src/core/services/cli-command.test.ts

@@ -29,22 +29,8 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
     triggerFieldGrouping: false,
     triggerSubsync: false,
     markAudioCard: false,
-    toggleStatsOverlay: false,
-    toggleSubtitleSidebar: false,
     refreshKnownWords: false,
     openRuntimeOptions: false,
-    openSessionHelp: false,
-    openControllerSelect: false,
-    openControllerDebug: false,
-    openJimaku: false,
-    openYoutubePicker: false,
-    openPlaylistBrowser: false,
-    replayCurrentSubtitle: false,
-    playNextSubtitle: false,
-    shiftSubDelayPrevLine: false,
-    shiftSubDelayNextLine: false,
-    cycleRuntimeOptionId: undefined,
-    cycleRuntimeOptionDirection: undefined,
     anilistStatus: false,
     anilistLogout: false,
     anilistSetup: false,
@@ -157,9 +143,6 @@ function createDeps(overrides: Partial<CliCommandServiceDeps> = {}) {
     openRuntimeOptionsPalette: () => {
       calls.push('openRuntimeOptionsPalette');
     },
-    dispatchSessionAction: async () => {
-      calls.push('dispatchSessionAction');
-    },
     getAnilistStatus: () => ({
       tokenStatus: 'resolved',
       tokenSource: 'stored',
@@ -516,7 +499,6 @@ test('handleCliCommand handles visibility and utility command dispatches', () =>
       expected: 'startPendingMineSentenceMultiple:2500',
     },
     { args: { toggleSecondarySub: true }, expected: 'cycleSecondarySubMode' },
-    { args: { toggleStatsOverlay: true }, expected: 'dispatchSessionAction' },
     {
       args: { openRuntimeOptions: true },
       expected: 'openRuntimeOptionsPalette',
@@ -536,33 +518,6 @@ test('handleCliCommand handles visibility and utility command dispatches', () =>
   }
 });
 
-test('handleCliCommand dispatches cycle-runtime-option session action', async () => {
-  let request: unknown = null;
-  const { deps } = createDeps({
-    dispatchSessionAction: async (nextRequest) => {
-      request = nextRequest;
-    },
-  });
-
-  handleCliCommand(
-    makeArgs({
-      cycleRuntimeOptionId: 'anki.autoUpdateNewCards',
-      cycleRuntimeOptionDirection: -1,
-    }),
-    'initial',
-    deps,
-  );
-  await new Promise((resolve) => setImmediate(resolve));
-
-  assert.deepEqual(request, {
-    actionId: 'cycleRuntimeOption',
-    payload: {
-      runtimeOptionId: 'anki.autoUpdateNewCards',
-      direction: -1,
-    },
-  });
-});
-
 test('handleCliCommand logs AniList status details', () => {
   const { deps, calls } = createDeps();
   handleCliCommand(makeArgs({ anilistStatus: true }), 'initial', deps);

src/core/services/cli-command.ts

@@ -1,5 +1,4 @@
 import { CliArgs, CliCommandSource, commandNeedsOverlayRuntime } from '../../cli/args';
-import type { SessionActionDispatchRequest } from '../../types/runtime';
 
 export interface CliCommandServiceDeps {
   setLogLevel?: (level: NonNullable<CliArgs['logLevel']>) => void;
@@ -33,7 +32,6 @@ export interface CliCommandServiceDeps {
   triggerSubsyncFromConfig: () => Promise<void>;
   markLastCardAsAudioCard: () => Promise<void>;
   openRuntimeOptionsPalette: () => void;
-  dispatchSessionAction: (request: SessionActionDispatchRequest) => Promise<void>;
   getAnilistStatus: () => {
     tokenStatus: 'not_checked' | 'resolved' | 'error';
     tokenSource: 'none' | 'literal' | 'stored';
@@ -170,7 +168,6 @@ export interface CliCommandDepsRuntimeOptions {
   };
   ui: UiCliRuntime;
   app: AppCliRuntime;
-  dispatchSessionAction: (request: SessionActionDispatchRequest) => Promise<void>;
   getMultiCopyTimeoutMs: () => number;
   schedule: (fn: () => void, delayMs: number) => unknown;
   log: (message: string) => void;
@@ -229,7 +226,6 @@ export function createCliCommandDepsRuntime(
     triggerSubsyncFromConfig: options.mining.triggerSubsyncFromConfig,
     markLastCardAsAudioCard: options.mining.markLastCardAsAudioCard,
     openRuntimeOptionsPalette: options.ui.openRuntimeOptionsPalette,
-    dispatchSessionAction: options.dispatchSessionAction,
     getAnilistStatus: options.anilist.getStatus,
     clearAnilistToken: options.anilist.clearToken,
     openAnilistSetup: options.anilist.openSetup,
@@ -272,14 +268,6 @@ export function handleCliCommand(
   source: CliCommandSource = 'initial',
   deps: CliCommandServiceDeps,
 ): void {
-  const dispatchCliSessionAction = (
-    request: SessionActionDispatchRequest,
-    logLabel: string,
-    osdLabel: string,
-  ): void => {
-    runAsyncWithOsd(() => deps.dispatchSessionAction(request), deps, logLabel, osdLabel);
-  };
-
   if (args.logLevel) {
     deps.setLogLevel?.(args.logLevel);
   }
@@ -391,100 +379,8 @@ export function handleCliCommand(
       'markLastCardAsAudioCard',
       'Audio card failed',
     );
-  } else if (args.toggleStatsOverlay) {
-    dispatchCliSessionAction(
-      { actionId: 'toggleStatsOverlay' },
-      'toggleStatsOverlay',
-      'Stats toggle failed',
-    );
-  } else if (args.toggleSubtitleSidebar) {
-    dispatchCliSessionAction(
-      { actionId: 'toggleSubtitleSidebar' },
-      'toggleSubtitleSidebar',
-      'Subtitle sidebar toggle failed',
-    );
   } else if (args.openRuntimeOptions) {
     deps.openRuntimeOptionsPalette();
-  } else if (args.openSessionHelp) {
-    dispatchCliSessionAction(
-      { actionId: 'openSessionHelp' },
-      'openSessionHelp',
-      'Open session help failed',
-    );
-  } else if (args.openControllerSelect) {
-    dispatchCliSessionAction(
-      { actionId: 'openControllerSelect' },
-      'openControllerSelect',
-      'Open controller select failed',
-    );
-  } else if (args.openControllerDebug) {
-    dispatchCliSessionAction(
-      { actionId: 'openControllerDebug' },
-      'openControllerDebug',
-      'Open controller debug failed',
-    );
-  } else if (args.openJimaku) {
-    dispatchCliSessionAction({ actionId: 'openJimaku' }, 'openJimaku', 'Open jimaku failed');
-  } else if (args.openYoutubePicker) {
-    dispatchCliSessionAction(
-      { actionId: 'openYoutubePicker' },
-      'openYoutubePicker',
-      'Open YouTube picker failed',
-    );
-  } else if (args.openPlaylistBrowser) {
-    dispatchCliSessionAction(
-      { actionId: 'openPlaylistBrowser' },
-      'openPlaylistBrowser',
-      'Open playlist browser failed',
-    );
-  } else if (args.replayCurrentSubtitle) {
-    dispatchCliSessionAction(
-      { actionId: 'replayCurrentSubtitle' },
-      'replayCurrentSubtitle',
-      'Replay subtitle failed',
-    );
-  } else if (args.playNextSubtitle) {
-    dispatchCliSessionAction(
-      { actionId: 'playNextSubtitle' },
-      'playNextSubtitle',
-      'Play next subtitle failed',
-    );
-  } else if (args.shiftSubDelayPrevLine) {
-    dispatchCliSessionAction(
-      { actionId: 'shiftSubDelayPrevLine' },
-      'shiftSubDelayPrevLine',
-      'Shift subtitle delay failed',
-    );
-  } else if (args.shiftSubDelayNextLine) {
-    dispatchCliSessionAction(
-      { actionId: 'shiftSubDelayNextLine' },
-      'shiftSubDelayNextLine',
-      'Shift subtitle delay failed',
-    );
-  } else if (args.cycleRuntimeOptionId !== undefined) {
-    dispatchCliSessionAction(
-      {
-        actionId: 'cycleRuntimeOption',
-        payload: {
-          runtimeOptionId: args.cycleRuntimeOptionId,
-          direction: args.cycleRuntimeOptionDirection ?? 1,
-        },
-      },
-      'cycleRuntimeOption',
-      'Runtime option change failed',
-    );
-  } else if (args.copySubtitleCount !== undefined) {
-    dispatchCliSessionAction(
-      { actionId: 'copySubtitleMultiple', payload: { count: args.copySubtitleCount } },
-      'copySubtitleMultiple',
-      'Copy failed',
-    );
-  } else if (args.mineSentenceCount !== undefined) {
-    dispatchCliSessionAction(
-      { actionId: 'mineSentenceMultiple', payload: { count: args.mineSentenceCount } },
-      'mineSentenceMultiple',
-      'Mine sentence failed',
-    );
   } else if (args.anilistStatus) {
     const status = deps.getAnilistStatus();
     deps.log(`AniList token status: ${status.tokenStatus} (source=${status.tokenSource})`);

src/core/services/immersion-tracker-service.ts

@@ -488,7 +488,7 @@ export class ImmersionTrackerService {
   }
 
   async getTrendsDashboard(
-    range: '7d' | '30d' | '90d' | '365d' | 'all' = '30d',
+    range: '7d' | '30d' | '90d' | 'all' = '30d',
     groupBy: 'day' | 'month' = 'day',
   ): Promise<unknown> {
     return getTrendsDashboard(this.db, range, groupBy);

src/core/services/immersion-tracker/__tests__/query.test.ts

@@ -687,7 +687,7 @@ test('getTrendsDashboard returns chart-ready aggregated series', () => {
     assert.equal(dashboard.progress.watchTime[1]?.value, 75);
     assert.equal(dashboard.progress.lookups[1]?.value, 18);
     assert.equal(dashboard.ratios.lookupsPerHundred[0]?.value, +((8 / 120) * 100).toFixed(1));
-    assert.equal(dashboard.librarySummary[0]?.title, 'Trend Dashboard Anime');
+    assert.equal(dashboard.animePerDay.watchTime[0]?.animeTitle, 'Trend Dashboard Anime');
     assert.equal(dashboard.animeCumulative.watchTime[1]?.value, 75);
     assert.equal(
       dashboard.patterns.watchTimeByDayOfWeek.reduce((sum, point) => sum + point.value, 0),
@@ -835,65 +835,6 @@ test('getTrendsDashboard keeps local-midnight session buckets separate', () => {
   }
 });
 
-test('getTrendsDashboard supports 365d range and caps day buckets at 365', () => {
-  const dbPath = makeDbPath();
-  const db = new Database(dbPath);
-  withMockNowMs('1772395200000', () => {
-    try {
-      ensureSchema(db);
-
-      const videoId = getOrCreateVideoRecord(db, 'local:/tmp/365d-trends.mkv', {
-        canonicalTitle: '365d Trends',
-        sourcePath: '/tmp/365d-trends.mkv',
-        sourceUrl: null,
-        sourceType: SOURCE_TYPE_LOCAL,
-      });
-      const animeId = getOrCreateAnimeRecord(db, {
-        parsedTitle: '365d Trends',
-        canonicalTitle: '365d Trends',
-        anilistId: null,
-        titleRomaji: null,
-        titleEnglish: null,
-        titleNative: null,
-        metadataJson: null,
-      });
-      linkVideoToAnimeRecord(db, videoId, {
-        animeId,
-        parsedBasename: '365d-trends.mkv',
-        parsedTitle: '365d Trends',
-        parsedSeason: 1,
-        parsedEpisode: 1,
-        parserSource: 'test',
-        parserConfidence: 1,
-        parseMetadataJson: null,
-      });
-
-      const insertDailyRollup = db.prepare(
-        `
-          INSERT INTO imm_daily_rollups (
-            rollup_day, video_id, total_sessions, total_active_min, total_lines_seen,
-            total_tokens_seen, total_cards, CREATED_DATE, LAST_UPDATE_DATE
-          ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-        `,
-      );
-      // Seed 400 distinct rollup days so we can prove the 365d range caps at 365.
-      const latestRollupDay = 20513;
-      const createdAtMs = '1772395200000';
-      for (let offset = 0; offset < 400; offset += 1) {
-        const rollupDay = latestRollupDay - offset;
-        insertDailyRollup.run(rollupDay, videoId, 1, 30, 4, 100, 2, createdAtMs, createdAtMs);
-      }
-
-      const dashboard = getTrendsDashboard(db, '365d', 'day');
-
-      assert.equal(dashboard.activity.watchTime.length, 365);
-    } finally {
-      db.close();
-      cleanupDbPath(dbPath);
-    }
-  });
-});
-
 test('getTrendsDashboard month grouping spans every touched calendar month and keeps progress monthly', () => {
   const dbPath = makeDbPath();
   const db = new Database(dbPath);
@@ -1938,50 +1879,6 @@ test('getSessionEvents returns events ordered by ts_ms ascending', () => {
   }
 });
 
-test('getSessionEvents round-trips wall-clock timestamps written through event inserts', () => {
-  const dbPath = makeDbPath();
-  const db = new Database(dbPath);
-
-  try {
-    ensureSchema(db);
-    const stmts = createTrackerPreparedStatements(db);
-
-    const videoId = getOrCreateVideoRecord(db, 'local:/tmp/events-wall-clock.mkv', {
-      canonicalTitle: 'Events Wall Clock',
-      sourcePath: '/tmp/events-wall-clock.mkv',
-      sourceUrl: null,
-      sourceType: SOURCE_TYPE_LOCAL,
-    });
-
-    const startedAtMs = Date.now() - 10_000;
-    const eventTsMs = startedAtMs + 5_000;
-    const { sessionId } = startSessionRecord(db, videoId, startedAtMs);
-
-    stmts.eventInsertStmt.run(
-      sessionId,
-      toDbTimestamp(eventTsMs),
-      EVENT_SUBTITLE_LINE,
-      0,
-      0,
-      500,
-      1,
-      0,
-      '{"line":"wall-clock"}',
-      toDbTimestamp(eventTsMs),
-      toDbTimestamp(eventTsMs),
-    );
-
-    const events = getSessionEvents(db, sessionId, 10);
-
-    assert.equal(events.length, 1);
-    assert.equal(events[0]?.tsMs, eventTsMs);
-    assert.equal(events[0]?.payload, '{"line":"wall-clock"}');
-  } finally {
-    db.close();
-    cleanupDbPath(dbPath);
-  }
-});
-
 test('getSessionEvents returns empty array for session with no events', () => {
   const dbPath = makeDbPath();
   const db = new Database(dbPath);
@@ -3769,206 +3666,3 @@ test('deleteSession removes zero-session media from library and trends', () => {
     cleanupDbPath(dbPath);
   }
 });
-
-test('getTrendsDashboard builds librarySummary with per-title aggregates', () => {
-  const dbPath = makeDbPath();
-  const db = new Database(dbPath);
-
-  try {
-    ensureSchema(db);
-    const stmts = createTrackerPreparedStatements(db);
-
-    const videoId = getOrCreateVideoRecord(db, 'local:/tmp/library-summary-test.mkv', {
-      canonicalTitle: 'Library Summary Test',
-      sourcePath: '/tmp/library-summary-test.mkv',
-      sourceUrl: null,
-      sourceType: SOURCE_TYPE_LOCAL,
-    });
-    const animeId = getOrCreateAnimeRecord(db, {
-      parsedTitle: 'Summary Anime',
-      canonicalTitle: 'Summary Anime',
-      anilistId: null,
-      titleRomaji: null,
-      titleEnglish: null,
-      titleNative: null,
-      metadataJson: null,
-    });
-    linkVideoToAnimeRecord(db, videoId, {
-      animeId,
-      parsedBasename: 'library-summary-test.mkv',
-      parsedTitle: 'Summary Anime',
-      parsedSeason: 1,
-      parsedEpisode: 1,
-      parserSource: 'test',
-      parserConfidence: 1,
-      parseMetadataJson: null,
-    });
-
-    const dayOneStart = 1_700_000_000_000;
-    const dayTwoStart = dayOneStart + 86_400_000;
-
-    const sessionOne = startSessionRecord(db, videoId, dayOneStart);
-    const sessionTwo = startSessionRecord(db, videoId, dayTwoStart);
-
-    for (const [sessionId, startedAtMs, activeMs, cards, tokens, lookups] of [
-      [sessionOne.sessionId, dayOneStart, 30 * 60_000, 2, 120, 8],
-      [sessionTwo.sessionId, dayTwoStart, 45 * 60_000, 3, 140, 10],
-    ] as const) {
-      stmts.telemetryInsertStmt.run(
-        sessionId,
-        `${startedAtMs + 60_000}`,
-        activeMs,
-        activeMs,
-        10,
-        tokens,
-        cards,
-        0,
-        0,
-        lookups,
-        0,
-        0,
-        0,
-        0,
-        `${startedAtMs + 60_000}`,
-        `${startedAtMs + 60_000}`,
-      );
-
-      db.prepare(
-        `
-          UPDATE imm_sessions
-          SET ended_at_ms = ?, total_watched_ms = ?, active_watched_ms = ?,
-              lines_seen = ?, tokens_seen = ?, cards_mined = ?, yomitan_lookup_count = ?
-          WHERE session_id = ?
-        `,
-      ).run(`${startedAtMs + activeMs}`, activeMs, activeMs, 10, tokens, cards, lookups, sessionId);
-    }
-
-    for (const [day, active, tokens, cards] of [
-      [Math.floor(dayOneStart / 86_400_000), 30, 120, 2],
-      [Math.floor(dayTwoStart / 86_400_000), 45, 140, 3],
-    ] as const) {
-      db.prepare(
-        `
-          INSERT INTO imm_daily_rollups (
-            rollup_day, video_id, total_sessions, total_active_min, total_lines_seen,
-            total_tokens_seen, total_cards
-          ) VALUES (?, ?, ?, ?, ?, ?, ?)
-        `,
-      ).run(day, videoId, 1, active, 10, tokens, cards);
-    }
-
-    const dashboard = getTrendsDashboard(db, 'all', 'day');
-
-    assert.equal(dashboard.librarySummary.length, 1);
-    const row = dashboard.librarySummary[0]!;
-    assert.equal(row.title, 'Summary Anime');
-    assert.equal(row.watchTimeMin, 75);
-    assert.equal(row.videos, 1);
-    assert.equal(row.sessions, 2);
-    assert.equal(row.cards, 5);
-    assert.equal(row.words, 260);
-    assert.equal(row.lookups, 18);
-    assert.equal(row.lookupsPerHundred, +((18 / 260) * 100).toFixed(1));
-    assert.equal(row.firstWatched, Math.floor(dayOneStart / 86_400_000));
-    assert.equal(row.lastWatched, Math.floor(dayTwoStart / 86_400_000));
-  } finally {
-    db.close();
-    cleanupDbPath(dbPath);
-  }
-});
-
-test('getTrendsDashboard librarySummary returns null lookupsPerHundred when words is zero', () => {
-  const dbPath = makeDbPath();
-  const db = new Database(dbPath);
-
-  try {
-    ensureSchema(db);
-    const stmts = createTrackerPreparedStatements(db);
-
-    const videoId = getOrCreateVideoRecord(db, 'local:/tmp/lib-summary-null.mkv', {
-      canonicalTitle: 'Null Lookups Title',
-      sourcePath: '/tmp/lib-summary-null.mkv',
-      sourceUrl: null,
-      sourceType: SOURCE_TYPE_LOCAL,
-    });
-    const animeId = getOrCreateAnimeRecord(db, {
-      parsedTitle: 'Null Lookups Anime',
-      canonicalTitle: 'Null Lookups Anime',
-      anilistId: null,
-      titleRomaji: null,
-      titleEnglish: null,
-      titleNative: null,
-      metadataJson: null,
-    });
-    linkVideoToAnimeRecord(db, videoId, {
-      animeId,
-      parsedBasename: 'lib-summary-null.mkv',
-      parsedTitle: 'Null Lookups Anime',
-      parsedSeason: 1,
-      parsedEpisode: 1,
-      parserSource: 'test',
-      parserConfidence: 1,
-      parseMetadataJson: null,
-    });
-
-    const startMs = 1_700_000_000_000;
-    const session = startSessionRecord(db, videoId, startMs);
-    stmts.telemetryInsertStmt.run(
-      session.sessionId,
-      `${startMs + 60_000}`,
-      20 * 60_000,
-      20 * 60_000,
-      5,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      `${startMs + 60_000}`,
-      `${startMs + 60_000}`,
-    );
-    db.prepare(
-      `
-        UPDATE imm_sessions
-        SET ended_at_ms = ?, total_watched_ms = ?, active_watched_ms = ?,
-            lines_seen = ?, tokens_seen = ?, cards_mined = ?, yomitan_lookup_count = ?
-        WHERE session_id = ?
-      `,
-    ).run(`${startMs + 20 * 60_000}`, 20 * 60_000, 20 * 60_000, 5, 0, 0, 0, session.sessionId);
-
-    db.prepare(
-      `
-        INSERT INTO imm_daily_rollups (
-          rollup_day, video_id, total_sessions, total_active_min, total_lines_seen,
-          total_tokens_seen, total_cards
-        ) VALUES (?, ?, ?, ?, ?, ?, ?)
-      `,
-    ).run(Math.floor(startMs / 86_400_000), videoId, 1, 20, 5, 0, 0);
-
-    const dashboard = getTrendsDashboard(db, 'all', 'day');
-    assert.equal(dashboard.librarySummary.length, 1);
-    assert.equal(dashboard.librarySummary[0]!.lookupsPerHundred, null);
-    assert.equal(dashboard.librarySummary[0]!.words, 0);
-  } finally {
-    db.close();
-    cleanupDbPath(dbPath);
-  }
-});
-
-test('getTrendsDashboard librarySummary is empty when no rollups exist', () => {
-  const dbPath = makeDbPath();
-  const db = new Database(dbPath);
-
-  try {
-    ensureSchema(db);
-    const dashboard = getTrendsDashboard(db, 'all', 'day');
-    assert.deepEqual(dashboard.librarySummary, []);
-  } finally {
-    db.close();
-    cleanupDbPath(dbPath);
-  }
-});

src/core/services/immersion-tracker/maintenance.ts

@@ -66,7 +66,7 @@ export function pruneRawRetention(
   const deletedSessionEvents = Number.isFinite(policy.eventsRetentionMs)
     ? (
         db
-          .prepare(`DELETE FROM imm_session_events WHERE CAST(ts_ms AS REAL) < CAST(? AS REAL)`)
+          .prepare(`DELETE FROM imm_session_events WHERE ts_ms < ?`)
           .run(resolveCutoff(policy.eventsRetentionMs, policy.eventsRetentionDays)) as {
           changes: number;
         }

src/core/services/immersion-tracker/query-lexical.ts

@@ -133,7 +133,7 @@ export function getSessionEvents(
   if (!eventTypes || eventTypes.length === 0) {
     const stmt = db.prepare(`
       SELECT event_type AS eventType, ts_ms AS tsMs, payload_json AS payload
-      FROM imm_session_events WHERE session_id = ? ORDER BY CAST(ts_ms AS REAL) ASC LIMIT ?
+      FROM imm_session_events WHERE session_id = ? ORDER BY ts_ms ASC LIMIT ?
     `);
     const rows = stmt.all(sessionId, limit) as Array<SessionEventRow & { tsMs: number | string }>;
     return rows.map((row) => ({
@@ -147,7 +147,7 @@ export function getSessionEvents(
     SELECT event_type AS eventType, ts_ms AS tsMs, payload_json AS payload
     FROM imm_session_events
     WHERE session_id = ? AND event_type IN (${placeholders})
-    ORDER BY CAST(ts_ms AS REAL) ASC
+    ORDER BY ts_ms ASC
     LIMIT ?
   `);
   const rows = stmt.all(sessionId, ...eventTypes, limit) as Array<

src/core/services/immersion-tracker/query-library.ts

@@ -602,7 +602,7 @@ export function getEpisodeCardEvents(db: DatabaseSync, videoId: number): Episode
     FROM imm_session_events e
     JOIN imm_sessions s ON s.session_id = e.session_id
     WHERE s.video_id = ? AND e.event_type = 4
-    ORDER BY CAST(e.ts_ms AS REAL) DESC
+    ORDER BY e.ts_ms DESC
   `,
     )
     .all(videoId) as Array<{

src/core/services/immersion-tracker/query-shared.ts

@@ -345,11 +345,7 @@ export function fromDbTimestamp(ms: number | bigint | string | null | undefined)
   if (typeof ms === 'bigint') {
     return Number(ms);
   }
-  const normalized = normalizeTimestampString(ms);
-  if (/^-?\d+$/.test(normalized)) {
-    return Number(BigInt(normalized));
-  }
-  return Math.trunc(Number.parseFloat(normalized));
+  return Number(ms);
 }
 
 function getNumericCalendarValue(

src/core/services/immersion-tracker/query-trends.ts

@@ -13,7 +13,7 @@ import {
 } from './query-shared';
 import { getDailyRollups, getMonthlyRollups } from './query-sessions';
 
-type TrendRange = '7d' | '30d' | '90d' | '365d' | 'all';
+type TrendRange = '7d' | '30d' | '90d' | 'all';
 type TrendGroupBy = 'day' | 'month';
 
 interface TrendChartPoint {
@@ -27,19 +27,6 @@ interface TrendPerAnimePoint {
   value: number;
 }
 
-export interface LibrarySummaryRow {
-  title: string;
-  watchTimeMin: number;
-  videos: number;
-  sessions: number;
-  cards: number;
-  words: number;
-  lookups: number;
-  lookupsPerHundred: number | null;
-  firstWatched: number;
-  lastWatched: number;
-}
-
 interface TrendSessionMetricRow {
   startedAtMs: number;
   epochDay: number;
@@ -74,6 +61,14 @@ export interface TrendsDashboardQueryResult {
   ratios: {
     lookupsPerHundred: TrendChartPoint[];
   };
+  animePerDay: {
+    episodes: TrendPerAnimePoint[];
+    watchTime: TrendPerAnimePoint[];
+    cards: TrendPerAnimePoint[];
+    words: TrendPerAnimePoint[];
+    lookups: TrendPerAnimePoint[];
+    lookupsPerHundred: TrendPerAnimePoint[];
+  };
   animeCumulative: {
     watchTime: TrendPerAnimePoint[];
     episodes: TrendPerAnimePoint[];
@@ -84,14 +79,12 @@ export interface TrendsDashboardQueryResult {
     watchTimeByDayOfWeek: TrendChartPoint[];
     watchTimeByHour: TrendChartPoint[];
   };
-  librarySummary: LibrarySummaryRow[];
 }
 
 const TREND_DAY_LIMITS: Record<Exclude<TrendRange, 'all'>, number> = {
   '7d': 7,
   '30d': 30,
   '90d': 90,
-  '365d': 365,
 };
 
 const MONTH_NAMES = [
@@ -307,6 +300,61 @@ function buildLookupsPerHundredWords(
     });
 }
 
+function buildPerAnimeFromSessions(
+  sessions: TrendSessionMetricRow[],
+  getValue: (session: TrendSessionMetricRow) => number,
+): TrendPerAnimePoint[] {
+  const byAnime = new Map<string, Map<number, number>>();
+
+  for (const session of sessions) {
+    const animeTitle = resolveTrendAnimeTitle(session);
+    const epochDay = session.epochDay;
+    const dayMap = byAnime.get(animeTitle) ?? new Map();
+    dayMap.set(epochDay, (dayMap.get(epochDay) ?? 0) + getValue(session));
+    byAnime.set(animeTitle, dayMap);
+  }
+
+  const result: TrendPerAnimePoint[] = [];
+  for (const [animeTitle, dayMap] of byAnime) {
+    for (const [epochDay, value] of dayMap) {
+      result.push({ epochDay, animeTitle, value });
+    }
+  }
+  return result;
+}
+
+function buildLookupsPerHundredPerAnime(sessions: TrendSessionMetricRow[]): TrendPerAnimePoint[] {
+  const lookups = new Map<string, Map<number, number>>();
+  const words = new Map<string, Map<number, number>>();
+
+  for (const session of sessions) {
+    const animeTitle = resolveTrendAnimeTitle(session);
+    const epochDay = session.epochDay;
+
+    const lookupMap = lookups.get(animeTitle) ?? new Map();
+    lookupMap.set(epochDay, (lookupMap.get(epochDay) ?? 0) + session.yomitanLookupCount);
+    lookups.set(animeTitle, lookupMap);
+
+    const wordMap = words.get(animeTitle) ?? new Map();
+    wordMap.set(epochDay, (wordMap.get(epochDay) ?? 0) + getTrendSessionWordCount(session));
+    words.set(animeTitle, wordMap);
+  }
+
+  const result: TrendPerAnimePoint[] = [];
+  for (const [animeTitle, dayMap] of lookups) {
+    const wordMap = words.get(animeTitle) ?? new Map();
+    for (const [epochDay, lookupCount] of dayMap) {
+      const wordCount = wordMap.get(epochDay) ?? 0;
+      result.push({
+        epochDay,
+        animeTitle,
+        value: wordCount > 0 ? +((lookupCount / wordCount) * 100).toFixed(1) : 0,
+      });
+    }
+  }
+  return result;
+}
+
 function buildCumulativePerAnime(points: TrendPerAnimePoint[]): TrendPerAnimePoint[] {
   const byAnime = new Map<string, Map<number, number>>();
   const allDays = new Set<number>();
@@ -342,88 +390,6 @@ function buildCumulativePerAnime(points: TrendPerAnimePoint[]): TrendPerAnimePoi
   return result;
 }
 
-function buildLibrarySummary(
-  rollups: ImmersionSessionRollupRow[],
-  sessions: TrendSessionMetricRow[],
-  titlesByVideoId: Map<number, string>,
-): LibrarySummaryRow[] {
-  type Accum = {
-    watchTimeMin: number;
-    videos: Set<number>;
-    cards: number;
-    words: number;
-    firstWatched: number;
-    lastWatched: number;
-    sessions: number;
-    lookups: number;
-  };
-
-  const byTitle = new Map<string, Accum>();
-
-  const ensure = (title: string): Accum => {
-    const existing = byTitle.get(title);
-    if (existing) return existing;
-    const created: Accum = {
-      watchTimeMin: 0,
-      videos: new Set<number>(),
-      cards: 0,
-      words: 0,
-      firstWatched: Number.POSITIVE_INFINITY,
-      lastWatched: Number.NEGATIVE_INFINITY,
-      sessions: 0,
-      lookups: 0,
-    };
-    byTitle.set(title, created);
-    return created;
-  };
-
-  for (const rollup of rollups) {
-    if (rollup.videoId === null) continue;
-    const title = resolveVideoAnimeTitle(rollup.videoId, titlesByVideoId);
-    const acc = ensure(title);
-    acc.watchTimeMin += rollup.totalActiveMin;
-    acc.cards += rollup.totalCards;
-    acc.words += rollup.totalTokensSeen;
-    acc.videos.add(rollup.videoId);
-    if (rollup.rollupDayOrMonth < acc.firstWatched) {
-      acc.firstWatched = rollup.rollupDayOrMonth;
-    }
-    if (rollup.rollupDayOrMonth > acc.lastWatched) {
-      acc.lastWatched = rollup.rollupDayOrMonth;
-    }
-  }
-
-  for (const session of sessions) {
-    const title = resolveTrendAnimeTitle(session);
-    if (!byTitle.has(title)) continue;
-    const acc = byTitle.get(title)!;
-    acc.sessions += 1;
-    acc.lookups += session.yomitanLookupCount;
-  }
-
-  const rows: LibrarySummaryRow[] = [];
-  for (const [title, acc] of byTitle) {
-    if (!Number.isFinite(acc.firstWatched) || !Number.isFinite(acc.lastWatched)) {
-      continue;
-    }
-    rows.push({
-      title,
-      watchTimeMin: Math.round(acc.watchTimeMin),
-      videos: acc.videos.size,
-      sessions: acc.sessions,
-      cards: acc.cards,
-      words: acc.words,
-      lookups: acc.lookups,
-      lookupsPerHundred: acc.words > 0 ? +((acc.lookups / acc.words) * 100).toFixed(1) : null,
-      firstWatched: acc.firstWatched,
-      lastWatched: acc.lastWatched,
-    });
-  }
-
-  rows.sort((a, b) => b.watchTimeMin - a.watchTimeMin || a.title.localeCompare(b.title));
-  return rows;
-}
-
 function getVideoAnimeTitleMap(
   db: DatabaseSync,
   videoIds: Array<number | null>,
@@ -696,6 +662,8 @@ export function getTrendsDashboard(
       titlesByVideoId,
       (rollup) => rollup.totalTokensSeen,
     ),
+    lookups: buildPerAnimeFromSessions(sessions, (session) => session.yomitanLookupCount),
+    lookupsPerHundred: buildLookupsPerHundredPerAnime(sessions),
   };
 
   return {
@@ -722,6 +690,7 @@ export function getTrendsDashboard(
     ratios: {
       lookupsPerHundred: buildLookupsPerHundredWords(sessions, groupBy),
     },
+    animePerDay,
     animeCumulative: {
       watchTime: buildCumulativePerAnime(animePerDay.watchTime),
       episodes: buildCumulativePerAnime(animePerDay.episodes),
@@ -732,6 +701,5 @@ export function getTrendsDashboard(
       watchTimeByDayOfWeek: buildWatchTimeByDayOfWeek(sessions),
       watchTimeByHour: buildWatchTimeByHour(sessions),
     },
-    librarySummary: buildLibrarySummary(dailyRollups, sessions, titlesByVideoId),
   };
 }

src/core/services/immersion-tracker/storage-session.test.ts

@@ -263,372 +263,6 @@ test('ensureSchema adds youtube metadata table to existing schema version 15 dat
   }
 });
 
-test('ensureSchema migrates session event timestamps to text and repairs libsql-truncated wall-clock values', () => {
-  const dbPath = makeDbPath();
-  const db = new Database(dbPath);
-
-  try {
-    db.exec(`
-      CREATE TABLE imm_schema_version (
-        schema_version INTEGER PRIMARY KEY,
-        applied_at_ms INTEGER NOT NULL
-      );
-      INSERT INTO imm_schema_version(schema_version, applied_at_ms) VALUES (16, 1000);
-
-      CREATE TABLE imm_rollup_state(
-        state_key TEXT PRIMARY KEY,
-        state_value INTEGER NOT NULL
-      );
-      INSERT INTO imm_rollup_state(state_key, state_value) VALUES ('last_rollup_sample_ms', 0);
-
-      CREATE TABLE imm_anime(
-        anime_id INTEGER PRIMARY KEY AUTOINCREMENT,
-        normalized_title_key TEXT NOT NULL UNIQUE,
-        canonical_title TEXT NOT NULL,
-        anilist_id INTEGER UNIQUE,
-        title_romaji TEXT,
-        title_english TEXT,
-        title_native TEXT,
-        episodes_total INTEGER,
-        description TEXT,
-        metadata_json TEXT,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT
-      );
-
-      CREATE TABLE imm_videos(
-        video_id INTEGER PRIMARY KEY AUTOINCREMENT,
-        video_key TEXT NOT NULL UNIQUE,
-        anime_id INTEGER,
-        canonical_title TEXT NOT NULL,
-        source_type INTEGER NOT NULL,
-        source_path TEXT,
-        source_url TEXT,
-        parsed_basename TEXT,
-        parsed_title TEXT,
-        parsed_season INTEGER,
-        parsed_episode INTEGER,
-        parser_source TEXT,
-        parser_confidence REAL,
-        parse_metadata_json TEXT,
-        watched INTEGER NOT NULL DEFAULT 0,
-        duration_ms INTEGER NOT NULL CHECK(duration_ms>=0),
-        file_size_bytes INTEGER CHECK(file_size_bytes>=0),
-        codec_id INTEGER, container_id INTEGER,
-        width_px INTEGER, height_px INTEGER, fps_x100 INTEGER,
-        bitrate_kbps INTEGER, audio_codec_id INTEGER,
-        hash_sha256 TEXT, screenshot_path TEXT,
-        metadata_json TEXT,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(anime_id) REFERENCES imm_anime(anime_id) ON DELETE SET NULL
-      );
-
-      CREATE TABLE imm_sessions(
-        session_id INTEGER PRIMARY KEY AUTOINCREMENT,
-        session_uuid TEXT NOT NULL UNIQUE,
-        video_id INTEGER NOT NULL,
-        started_at_ms TEXT NOT NULL,
-        ended_at_ms TEXT,
-        status INTEGER NOT NULL,
-        locale_id INTEGER,
-        target_lang_id INTEGER,
-        difficulty_tier INTEGER,
-        subtitle_mode INTEGER,
-        ended_media_ms INTEGER,
-        total_watched_ms INTEGER NOT NULL DEFAULT 0,
-        active_watched_ms INTEGER NOT NULL DEFAULT 0,
-        lines_seen INTEGER NOT NULL DEFAULT 0,
-        tokens_seen INTEGER NOT NULL DEFAULT 0,
-        cards_mined INTEGER NOT NULL DEFAULT 0,
-        lookup_count INTEGER NOT NULL DEFAULT 0,
-        lookup_hits INTEGER NOT NULL DEFAULT 0,
-        yomitan_lookup_count INTEGER NOT NULL DEFAULT 0,
-        pause_count INTEGER NOT NULL DEFAULT 0,
-        pause_ms INTEGER NOT NULL DEFAULT 0,
-        seek_forward_count INTEGER NOT NULL DEFAULT 0,
-        seek_backward_count INTEGER NOT NULL DEFAULT 0,
-        media_buffer_events INTEGER NOT NULL DEFAULT 0,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(video_id) REFERENCES imm_videos(video_id)
-      );
-
-      CREATE TABLE imm_session_telemetry(
-        telemetry_id INTEGER PRIMARY KEY AUTOINCREMENT,
-        session_id INTEGER NOT NULL,
-        sample_ms TEXT NOT NULL,
-        total_watched_ms INTEGER NOT NULL DEFAULT 0,
-        active_watched_ms INTEGER NOT NULL DEFAULT 0,
-        lines_seen INTEGER NOT NULL DEFAULT 0,
-        tokens_seen INTEGER NOT NULL DEFAULT 0,
-        cards_mined INTEGER NOT NULL DEFAULT 0,
-        lookup_count INTEGER NOT NULL DEFAULT 0,
-        lookup_hits INTEGER NOT NULL DEFAULT 0,
-        yomitan_lookup_count INTEGER NOT NULL DEFAULT 0,
-        pause_count INTEGER NOT NULL DEFAULT 0,
-        pause_ms INTEGER NOT NULL DEFAULT 0,
-        seek_forward_count INTEGER NOT NULL DEFAULT 0,
-        seek_backward_count INTEGER NOT NULL DEFAULT 0,
-        media_buffer_events INTEGER NOT NULL DEFAULT 0,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(session_id) REFERENCES imm_sessions(session_id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_session_events(
-        event_id INTEGER PRIMARY KEY AUTOINCREMENT,
-        session_id INTEGER NOT NULL,
-        ts_ms INTEGER NOT NULL,
-        event_type INTEGER NOT NULL,
-        line_index INTEGER,
-        segment_start_ms INTEGER,
-        segment_end_ms INTEGER,
-        tokens_delta INTEGER NOT NULL DEFAULT 0,
-        cards_delta INTEGER NOT NULL DEFAULT 0,
-        payload_json TEXT,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(session_id) REFERENCES imm_sessions(session_id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_daily_rollups(
-        rollup_day INTEGER NOT NULL,
-        video_id INTEGER,
-        total_sessions INTEGER NOT NULL DEFAULT 0,
-        total_active_min REAL NOT NULL DEFAULT 0,
-        total_lines_seen INTEGER NOT NULL DEFAULT 0,
-        total_tokens_seen INTEGER NOT NULL DEFAULT 0,
-        total_cards INTEGER NOT NULL DEFAULT 0,
-        cards_per_hour REAL,
-        tokens_per_min REAL,
-        lookup_hit_rate REAL,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        PRIMARY KEY (rollup_day, video_id)
-      );
-
-      CREATE TABLE imm_monthly_rollups(
-        rollup_month INTEGER NOT NULL,
-        video_id INTEGER,
-        total_sessions INTEGER NOT NULL DEFAULT 0,
-        total_active_min REAL NOT NULL DEFAULT 0,
-        total_lines_seen INTEGER NOT NULL DEFAULT 0,
-        total_tokens_seen INTEGER NOT NULL DEFAULT 0,
-        total_cards INTEGER NOT NULL DEFAULT 0,
-        cards_per_hour REAL,
-        tokens_per_min REAL,
-        lookup_hit_rate REAL,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        PRIMARY KEY (rollup_month, video_id)
-      );
-
-      CREATE TABLE imm_words(
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        headword TEXT NOT NULL,
-        word TEXT NOT NULL,
-        reading TEXT NOT NULL,
-        part_of_speech TEXT,
-        pos1 TEXT,
-        pos2 TEXT,
-        pos3 TEXT,
-        first_seen INTEGER NOT NULL,
-        last_seen INTEGER NOT NULL,
-        frequency INTEGER NOT NULL DEFAULT 0,
-        frequency_rank INTEGER,
-        UNIQUE(headword, word, reading)
-      );
-
-      CREATE TABLE imm_kanji(
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        kanji TEXT NOT NULL UNIQUE,
-        first_seen INTEGER NOT NULL,
-        last_seen INTEGER NOT NULL,
-        frequency INTEGER NOT NULL DEFAULT 0
-      );
-
-      CREATE TABLE imm_subtitle_lines(
-        line_id INTEGER PRIMARY KEY AUTOINCREMENT,
-        session_id INTEGER NOT NULL,
-        event_id INTEGER,
-        video_id INTEGER NOT NULL,
-        anime_id INTEGER,
-        line_index INTEGER NOT NULL,
-        segment_start_ms INTEGER,
-        segment_end_ms INTEGER,
-        text TEXT NOT NULL,
-        secondary_text TEXT,
-        CREATED_DATE INTEGER,
-        LAST_UPDATE_DATE INTEGER,
-        FOREIGN KEY(session_id) REFERENCES imm_sessions(session_id) ON DELETE CASCADE,
-        FOREIGN KEY(event_id) REFERENCES imm_session_events(event_id) ON DELETE SET NULL,
-        FOREIGN KEY(video_id) REFERENCES imm_videos(video_id) ON DELETE CASCADE,
-        FOREIGN KEY(anime_id) REFERENCES imm_anime(anime_id) ON DELETE SET NULL
-      );
-
-      CREATE TABLE imm_word_line_occurrences(
-        line_id INTEGER NOT NULL,
-        word_id INTEGER NOT NULL,
-        occurrence_count INTEGER NOT NULL,
-        PRIMARY KEY(line_id, word_id),
-        FOREIGN KEY(line_id) REFERENCES imm_subtitle_lines(line_id) ON DELETE CASCADE,
-        FOREIGN KEY(word_id) REFERENCES imm_words(id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_kanji_line_occurrences(
-        line_id INTEGER NOT NULL,
-        kanji_id INTEGER NOT NULL,
-        occurrence_count INTEGER NOT NULL,
-        PRIMARY KEY(line_id, kanji_id),
-        FOREIGN KEY(line_id) REFERENCES imm_subtitle_lines(line_id) ON DELETE CASCADE,
-        FOREIGN KEY(kanji_id) REFERENCES imm_kanji(id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_lifetime_global(
-        global_id INTEGER PRIMARY KEY CHECK(global_id = 1),
-        total_sessions INTEGER NOT NULL DEFAULT 0,
-        total_active_ms INTEGER NOT NULL DEFAULT 0,
-        total_cards INTEGER NOT NULL DEFAULT 0,
-        active_days INTEGER NOT NULL DEFAULT 0,
-        episodes_started INTEGER NOT NULL DEFAULT 0,
-        episodes_completed INTEGER NOT NULL DEFAULT 0,
-        anime_completed INTEGER NOT NULL DEFAULT 0,
-        last_rebuilt_ms TEXT,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT
-      );
-
-      CREATE TABLE imm_lifetime_anime(
-        anime_id INTEGER PRIMARY KEY,
-        total_sessions INTEGER NOT NULL DEFAULT 0,
-        total_active_ms INTEGER NOT NULL DEFAULT 0,
-        total_cards INTEGER NOT NULL DEFAULT 0,
-        total_lines_seen INTEGER NOT NULL DEFAULT 0,
-        total_tokens_seen INTEGER NOT NULL DEFAULT 0,
-        episodes_started INTEGER NOT NULL DEFAULT 0,
-        episodes_completed INTEGER NOT NULL DEFAULT 0,
-        first_watched_ms TEXT,
-        last_watched_ms TEXT,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(anime_id) REFERENCES imm_anime(anime_id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_lifetime_media(
-        video_id INTEGER PRIMARY KEY,
-        total_sessions INTEGER NOT NULL DEFAULT 0,
-        total_active_ms INTEGER NOT NULL DEFAULT 0,
-        total_cards INTEGER NOT NULL DEFAULT 0,
-        total_lines_seen INTEGER NOT NULL DEFAULT 0,
-        total_tokens_seen INTEGER NOT NULL DEFAULT 0,
-        completed INTEGER NOT NULL DEFAULT 0,
-        first_watched_ms TEXT,
-        last_watched_ms TEXT,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(video_id) REFERENCES imm_videos(video_id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_lifetime_applied_sessions(
-        session_id INTEGER PRIMARY KEY,
-        applied_at_ms TEXT NOT NULL,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(session_id) REFERENCES imm_sessions(session_id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_media_art(
-        video_id INTEGER PRIMARY KEY,
-        anilist_id INTEGER,
-        cover_url TEXT,
-        cover_blob BLOB,
-        cover_blob_hash TEXT,
-        fetched_at_ms TEXT,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(video_id) REFERENCES imm_videos(video_id) ON DELETE CASCADE
-      );
-
-      CREATE TABLE imm_cover_art_blobs(
-        blob_hash TEXT PRIMARY KEY,
-        cover_blob BLOB NOT NULL,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT
-      );
-
-      CREATE TABLE imm_youtube_videos(
-        video_id INTEGER PRIMARY KEY,
-        youtube_video_id TEXT,
-        video_url TEXT,
-        video_title TEXT,
-        video_thumbnail_url TEXT,
-        channel_id TEXT,
-        channel_name TEXT,
-        channel_url TEXT,
-        channel_thumbnail_url TEXT,
-        uploader_id TEXT,
-        uploader_url TEXT,
-        description TEXT,
-        metadata_json TEXT,
-        fetched_at_ms TEXT NOT NULL,
-        CREATED_DATE TEXT,
-        LAST_UPDATE_DATE TEXT,
-        FOREIGN KEY(video_id) REFERENCES imm_videos(video_id) ON DELETE CASCADE
-      );
-
-      INSERT INTO imm_videos (
-        video_id, video_key, canonical_title, source_type, source_path, source_url, watched, duration_ms,
-        CREATED_DATE, LAST_UPDATE_DATE
-      ) VALUES (
-        1, 'local:/tmp/repaired-event.mkv', 'Repaired Event', 1, '/tmp/repaired-event.mkv', NULL, 0, 0, '1000', '1000'
-      );
-
-      INSERT INTO imm_sessions (
-        session_id, session_uuid, video_id, started_at_ms, status, CREATED_DATE, LAST_UPDATE_DATE
-      ) VALUES (
-        1, 'session-1', 1, '1775940000000', 1, '1775940000000', '1775940000000'
-      );
-
-      INSERT INTO imm_session_events (
-        event_id, session_id, ts_ms, event_type, line_index, segment_start_ms, segment_end_ms,
-        tokens_delta, cards_delta, payload_json, CREATED_DATE, LAST_UPDATE_DATE
-      ) VALUES (
-        1, 1, -2147483648, 4, NULL, NULL, NULL, 0, 1, '{\"noteIds\":[1]}', '1775943304128', '1775943304128'
-      );
-    `);
-
-    ensureSchema(db);
-
-    const column = db.prepare(`PRAGMA table_info(imm_session_events)`).all() as Array<{
-      name: string;
-      type: string;
-    }>;
-    assert.equal(column.find((entry) => entry.name === 'ts_ms')?.type, 'TEXT');
-
-    const row = db
-      .prepare(
-        `
-        SELECT ts_ms AS tsMs, typeof(ts_ms) AS tsType, CREATED_DATE AS createdDate
-        FROM imm_session_events
-        WHERE event_id = 1
-      `,
-      )
-      .get() as {
-      tsMs: string;
-      tsType: string;
-      createdDate: string;
-    };
-
-    assert.equal(row.tsType, 'text');
-    assert.equal(row.tsMs, '1775943304128');
-    assert.equal(row.createdDate, '1775943304128');
-  } finally {
-    db.close();
-    cleanupDbPath(dbPath);
-  }
-});
-
 test('ensureSchema creates large-history performance indexes', () => {
   const dbPath = makeDbPath();
   const db = new Database(dbPath);

src/core/services/immersion-tracker/storage.ts

@@ -170,16 +170,6 @@ function hasColumn(db: DatabaseSync, tableName: string, columnName: string): boo
     .some((row: unknown) => (row as { name: string }).name === columnName);
 }
 
-function getColumnType(db: DatabaseSync, tableName: string, columnName: string): string | null {
-  const row = (
-    db.prepare(`PRAGMA table_info(${tableName})`).all() as Array<{
-      name: string;
-      type: string;
-    }>
-  ).find((entry) => entry.name === columnName);
-  return row?.type ?? null;
-}
-
 function addColumnIfMissing(
   db: DatabaseSync,
   tableName: string,
@@ -197,92 +187,6 @@ function dropColumnIfExists(db: DatabaseSync, tableName: string, columnName: str
   }
 }
 
-function migrateSessionEventTimestampsToText(db: DatabaseSync): void {
-  if (getColumnType(db, 'imm_session_events', 'ts_ms') === 'TEXT') {
-    return;
-  }
-
-  const lineIndexExpr = hasColumn(db, 'imm_session_events', 'line_index') ? 'line_index' : 'NULL';
-  const segmentStartExpr = hasColumn(db, 'imm_session_events', 'segment_start_ms')
-    ? 'segment_start_ms'
-    : 'NULL';
-  const segmentEndExpr = hasColumn(db, 'imm_session_events', 'segment_end_ms')
-    ? 'segment_end_ms'
-    : 'NULL';
-  const tokensDeltaExpr = hasColumn(db, 'imm_session_events', 'tokens_delta')
-    ? 'tokens_delta'
-    : '0';
-  const cardsDeltaExpr = hasColumn(db, 'imm_session_events', 'cards_delta') ? 'cards_delta' : '0';
-  const payloadExpr = hasColumn(db, 'imm_session_events', 'payload_json') ? 'payload_json' : 'NULL';
-  const createdDateExpr = hasColumn(db, 'imm_session_events', 'CREATED_DATE')
-    ? 'CAST(CREATED_DATE AS TEXT)'
-    : 'NULL';
-  const lastUpdateExpr = hasColumn(db, 'imm_session_events', 'LAST_UPDATE_DATE')
-    ? 'CAST(LAST_UPDATE_DATE AS TEXT)'
-    : 'NULL';
-  const repairedTimestampExpr =
-    hasColumn(db, 'imm_session_events', 'CREATED_DATE') ||
-    hasColumn(db, 'imm_session_events', 'LAST_UPDATE_DATE')
-      ? `CASE
-        WHEN ts_ms < 0 AND COALESCE(CREATED_DATE, LAST_UPDATE_DATE) IS NOT NULL
-          THEN CAST(COALESCE(CREATED_DATE, LAST_UPDATE_DATE) AS TEXT)
-        ELSE CAST(ts_ms AS TEXT)
-      END`
-      : 'CAST(ts_ms AS TEXT)';
-
-  db.exec('PRAGMA foreign_keys = OFF');
-  db.exec(`
-    CREATE TABLE imm_session_events_new(
-      event_id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id INTEGER NOT NULL,
-      ts_ms TEXT NOT NULL,
-      event_type INTEGER NOT NULL,
-      line_index INTEGER,
-      segment_start_ms INTEGER,
-      segment_end_ms INTEGER,
-      tokens_delta INTEGER NOT NULL DEFAULT 0,
-      cards_delta INTEGER NOT NULL DEFAULT 0,
-      payload_json TEXT,
-      CREATED_DATE TEXT,
-      LAST_UPDATE_DATE TEXT,
-      FOREIGN KEY(session_id) REFERENCES imm_sessions(session_id) ON DELETE CASCADE
-    );
-  `);
-  db.exec(`
-    INSERT INTO imm_session_events_new(
-      event_id,
-      session_id,
-      ts_ms,
-      event_type,
-      line_index,
-      segment_start_ms,
-      segment_end_ms,
-      tokens_delta,
-      cards_delta,
-      payload_json,
-      CREATED_DATE,
-      LAST_UPDATE_DATE
-    )
-    SELECT
-      event_id,
-      session_id,
-      ${repairedTimestampExpr},
-      event_type,
-      ${lineIndexExpr},
-      ${segmentStartExpr},
-      ${segmentEndExpr},
-      ${tokensDeltaExpr},
-      ${cardsDeltaExpr},
-      ${payloadExpr},
-      ${createdDateExpr},
-      ${lastUpdateExpr}
-    FROM imm_session_events
-  `);
-  db.exec('DROP TABLE imm_session_events');
-  db.exec('ALTER TABLE imm_session_events_new RENAME TO imm_session_events');
-  db.exec('PRAGMA foreign_keys = ON');
-}
-
 export function applyPragmas(db: DatabaseSync): void {
   db.exec('PRAGMA journal_mode = WAL');
   db.exec('PRAGMA synchronous = NORMAL');
@@ -781,7 +685,7 @@ export function ensureSchema(db: DatabaseSync): void {
     CREATE TABLE IF NOT EXISTS imm_session_events(
       event_id INTEGER PRIMARY KEY AUTOINCREMENT,
       session_id INTEGER NOT NULL,
-      ts_ms TEXT NOT NULL,
+      ts_ms INTEGER NOT NULL,
       event_type INTEGER NOT NULL,
       line_index INTEGER,
       segment_start_ms INTEGER,
@@ -1218,8 +1122,6 @@ export function ensureSchema(db: DatabaseSync): void {
     addColumnIfMissing(db, 'imm_sessions', 'ended_media_ms', 'INTEGER');
   }
 
-  migrateSessionEventTimestampsToText(db);
-
   ensureLifetimeSummaryTables(db);
 
   db.exec(`
@@ -1518,8 +1420,7 @@ export function executeQueuedWrite(write: QueuedWrite, stmts: TrackerPreparedSta
     ) {
       throw new Error('Incomplete telemetry write');
     }
-    const telemetrySampleMs =
-      write.sampleMs === undefined ? currentMs : toDbTimestamp(write.sampleMs);
+    const telemetrySampleMs = toDbTimestamp(write.sampleMs ?? Number(currentMs));
     stmts.telemetryInsertStmt.run(
       write.sessionId,
       telemetrySampleMs,
@@ -1594,7 +1495,7 @@ export function executeQueuedWrite(write: QueuedWrite, stmts: TrackerPreparedSta
 
   stmts.eventInsertStmt.run(
     write.sessionId,
-    write.sampleMs === undefined ? currentMs : toDbTimestamp(write.sampleMs),
+    toDbTimestamp(write.sampleMs ?? Number(currentMs)),
     write.eventType ?? 0,
     write.lineIndex ?? null,
     write.segmentStartMs ?? null,

src/core/services/immersion-tracker/types.ts

@@ -1,4 +1,4 @@
-export const SCHEMA_VERSION = 17;
+export const SCHEMA_VERSION = 16;
 export const DEFAULT_QUEUE_CAP = 1_000;
 export const DEFAULT_BATCH_SIZE = 25;
 export const DEFAULT_FLUSH_INTERVAL_MS = 500;

src/core/services/index.ts

@@ -72,7 +72,6 @@ export {
   createOverlayWindow,
   enforceOverlayLayerOrder,
   ensureOverlayWindowLevel,
-  isOverlayWindowContentReady,
   syncOverlayWindowLayer,
   updateOverlayWindowBounds,
 } from './overlay-window';

src/core/services/ipc.test.ts

@@ -3,11 +3,7 @@ import assert from 'node:assert/strict';
 
 import { createIpcDepsRuntime, registerIpcHandlers, type IpcServiceDeps } from './ipc';
 import { IPC_CHANNELS } from '../../shared/ipc/contracts';
-import type {
-  PlaylistBrowserSnapshot,
-  SessionActionDispatchRequest,
-  SubtitleSidebarSnapshot,
-} from '../../types';
+import type { PlaylistBrowserSnapshot, SubtitleSidebarSnapshot } from '../../types';
 
 interface FakeIpcRegistrar {
   on: Map<string, (event: unknown, ...args: unknown[]) => void>;
@@ -131,9 +127,7 @@ function createRegisterIpcDeps(overrides: Partial<IpcServiceDeps> = {}): IpcServ
     setMecabEnabled: () => {},
     handleMpvCommand: () => {},
     getKeybindings: () => [],
-    getSessionBindings: () => [],
     getConfiguredShortcuts: () => ({}),
-    dispatchSessionAction: async () => {},
     getStatsToggleKey: () => 'Backquote',
     getMarkWatchedKey: () => 'KeyW',
     getControllerConfig: () => createControllerConfigFixture(),
@@ -232,9 +226,7 @@ test('createIpcDepsRuntime wires AniList handlers', async () => {
     getMecabTokenizer: () => null,
     handleMpvCommand: () => {},
     getKeybindings: () => [],
-    getSessionBindings: () => [],
     getConfiguredShortcuts: () => ({}),
-    dispatchSessionAction: async () => {},
     getStatsToggleKey: () => 'Backquote',
     getMarkWatchedKey: () => 'KeyW',
     getControllerConfig: () => createControllerConfigFixture(),
@@ -390,9 +382,7 @@ test('registerIpcHandlers rejects malformed runtime-option payloads', async () =
       setMecabEnabled: () => {},
       handleMpvCommand: () => {},
       getKeybindings: () => [],
-      getSessionBindings: () => [],
       getConfiguredShortcuts: () => ({}),
-      dispatchSessionAction: async () => {},
       getStatsToggleKey: () => 'Backquote',
       getMarkWatchedKey: () => 'KeyW',
       getControllerConfig: () => createControllerConfigFixture(),
@@ -717,9 +707,7 @@ test('registerIpcHandlers ignores malformed fire-and-forget payloads', () => {
       setMecabEnabled: () => {},
       handleMpvCommand: () => {},
       getKeybindings: () => [],
-      getSessionBindings: () => [],
       getConfiguredShortcuts: () => ({}),
-      dispatchSessionAction: async () => {},
       getStatsToggleKey: () => 'Backquote',
       getMarkWatchedKey: () => 'KeyW',
       getControllerConfig: () => createControllerConfigFixture(),
@@ -798,9 +786,7 @@ test('registerIpcHandlers awaits saveControllerPreference through request-respon
       setMecabEnabled: () => {},
       handleMpvCommand: () => {},
       getKeybindings: () => [],
-      getSessionBindings: () => [],
       getConfiguredShortcuts: () => ({}),
-      dispatchSessionAction: async () => {},
       getStatsToggleKey: () => 'Backquote',
       getMarkWatchedKey: () => 'KeyW',
       getControllerConfig: () => createControllerConfigFixture(),
@@ -864,97 +850,6 @@ test('registerIpcHandlers awaits saveControllerPreference through request-respon
   ]);
 });
 
-test('registerIpcHandlers validates dispatchSessionAction payloads', async () => {
-  const { registrar, handlers } = createFakeIpcRegistrar();
-  const dispatched: SessionActionDispatchRequest[] = [];
-  registerIpcHandlers(
-    createRegisterIpcDeps({
-      dispatchSessionAction: async (request) => {
-        dispatched.push(request);
-      },
-    }),
-    registrar,
-  );
-
-  const dispatchHandler = handlers.handle.get(IPC_CHANNELS.command.dispatchSessionAction);
-  assert.ok(dispatchHandler);
-
-  await assert.rejects(async () => {
-    await dispatchHandler!({}, { actionId: 'cycleRuntimeOption', payload: { direction: 1 } });
-  }, /Invalid session action payload/);
-  await assert.rejects(async () => {
-    await dispatchHandler!({}, { actionId: 'unknown-action' });
-  }, /Invalid session action payload/);
-
-  await dispatchHandler!(
-    {},
-    {
-      actionId: 'copySubtitleMultiple',
-      payload: { count: 3 },
-    },
-  );
-  await dispatchHandler!(
-    {},
-    {
-      actionId: 'cycleRuntimeOption',
-      payload: {
-        runtimeOptionId: 'anki.autoUpdateNewCards',
-        direction: -1,
-      },
-    },
-  );
-  await dispatchHandler!(
-    {},
-    {
-      actionId: 'toggleSubtitleSidebar',
-    },
-  );
-  await dispatchHandler!(
-    {},
-    {
-      actionId: 'openSessionHelp',
-    },
-  );
-  await dispatchHandler!(
-    {},
-    {
-      actionId: 'openControllerSelect',
-    },
-  );
-  await dispatchHandler!(
-    {},
-    {
-      actionId: 'openControllerDebug',
-    },
-  );
-
-  assert.deepEqual(dispatched, [
-    {
-      actionId: 'copySubtitleMultiple',
-      payload: { count: 3 },
-    },
-    {
-      actionId: 'cycleRuntimeOption',
-      payload: {
-        runtimeOptionId: 'anki.autoUpdateNewCards',
-        direction: -1,
-      },
-    },
-    {
-      actionId: 'toggleSubtitleSidebar',
-    },
-    {
-      actionId: 'openSessionHelp',
-    },
-    {
-      actionId: 'openControllerSelect',
-    },
-    {
-      actionId: 'openControllerDebug',
-    },
-  ]);
-});
-
 test('registerIpcHandlers rejects malformed controller preference payloads', async () => {
   const { registrar, handlers } = createFakeIpcRegistrar();
   registerIpcHandlers(
@@ -977,9 +872,7 @@ test('registerIpcHandlers rejects malformed controller preference payloads', asy
       setMecabEnabled: () => {},
       handleMpvCommand: () => {},
       getKeybindings: () => [],
-      getSessionBindings: () => [],
       getConfiguredShortcuts: () => ({}),
-      dispatchSessionAction: async () => {},
       getStatsToggleKey: () => 'Backquote',
       getMarkWatchedKey: () => 'KeyW',
       getControllerConfig: () => createControllerConfigFixture(),

src/core/services/ipc.ts

@@ -1,7 +1,6 @@
 import electron from 'electron';
-import type { BrowserWindow as ElectronBrowserWindow, IpcMainEvent } from 'electron';
+import type { IpcMainEvent } from 'electron';
 import type {
-  CompiledSessionBinding,
   ControllerConfigUpdate,
   PlaylistBrowserMutationResult,
   PlaylistBrowserSnapshot,
@@ -13,7 +12,6 @@ import type {
   SubtitlePosition,
   SubsyncManualRunRequest,
   SubsyncResult,
-  SessionActionDispatchRequest,
   YoutubePickerResolveRequest,
   YoutubePickerResolveResult,
 } from '../../types';
@@ -27,23 +25,16 @@ import {
   parseRuntimeOptionDirection,
   parseRuntimeOptionId,
   parseRuntimeOptionValue,
-  parseSessionActionDispatchRequest,
   parseSubtitlePosition,
   parseSubsyncManualRunRequest,
   parseYoutubePickerResolveRequest,
 } from '../../shared/ipc/validators';
 
-const { ipcMain } = electron;
+const { BrowserWindow, ipcMain } = electron;
 
 export interface IpcServiceDeps {
-  onOverlayModalClosed: (
-    modal: OverlayHostedModal,
-    senderWindow: ElectronBrowserWindow | null,
-  ) => void;
-  onOverlayModalOpened?: (
-    modal: OverlayHostedModal,
-    senderWindow: ElectronBrowserWindow | null,
-  ) => void;
+  onOverlayModalClosed: (modal: OverlayHostedModal) => void;
+  onOverlayModalOpened?: (modal: OverlayHostedModal) => void;
   openYomitanSettings: () => void;
   quitApp: () => void;
   toggleDevTools: () => void;
@@ -65,9 +56,7 @@ export interface IpcServiceDeps {
   setMecabEnabled: (enabled: boolean) => void;
   handleMpvCommand: (command: Array<string | number>) => void;
   getKeybindings: () => unknown;
-  getSessionBindings?: () => CompiledSessionBinding[];
   getConfiguredShortcuts: () => unknown;
-  dispatchSessionAction?: (request: SessionActionDispatchRequest) => void | Promise<void>;
   getStatsToggleKey: () => string;
   getMarkWatchedKey: () => string;
   getControllerConfig: () => ResolvedControllerConfig;
@@ -164,14 +153,8 @@ interface IpcMainRegistrar {
 export interface IpcDepsRuntimeOptions {
   getMainWindow: () => WindowLike | null;
   getVisibleOverlayVisibility: () => boolean;
-  onOverlayModalClosed: (
-    modal: OverlayHostedModal,
-    senderWindow: ElectronBrowserWindow | null,
-  ) => void;
-  onOverlayModalOpened?: (
-    modal: OverlayHostedModal,
-    senderWindow: ElectronBrowserWindow | null,
-  ) => void;
+  onOverlayModalClosed: (modal: OverlayHostedModal) => void;
+  onOverlayModalOpened?: (modal: OverlayHostedModal) => void;
   openYomitanSettings: () => void;
   quitApp: () => void;
   toggleVisibleOverlay: () => void;
@@ -186,9 +169,7 @@ export interface IpcDepsRuntimeOptions {
   getMecabTokenizer: () => MecabTokenizerLike | null;
   handleMpvCommand: (command: Array<string | number>) => void;
   getKeybindings: () => unknown;
-  getSessionBindings?: () => CompiledSessionBinding[];
   getConfiguredShortcuts: () => unknown;
-  dispatchSessionAction?: (request: SessionActionDispatchRequest) => void | Promise<void>;
   getStatsToggleKey: () => string;
   getMarkWatchedKey: () => string;
   getControllerConfig: () => ResolvedControllerConfig;
@@ -257,9 +238,7 @@ export function createIpcDepsRuntime(options: IpcDepsRuntimeOptions): IpcService
     },
     handleMpvCommand: options.handleMpvCommand,
     getKeybindings: options.getKeybindings,
-    getSessionBindings: options.getSessionBindings ?? (() => []),
     getConfiguredShortcuts: options.getConfiguredShortcuts,
-    dispatchSessionAction: options.dispatchSessionAction ?? (async () => {}),
     getStatsToggleKey: options.getStatsToggleKey,
     getMarkWatchedKey: options.getMarkWatchedKey,
     getControllerConfig: options.getControllerConfig,
@@ -320,28 +299,23 @@ export function registerIpcHandlers(deps: IpcServiceDeps, ipc: IpcMainRegistrar
     (event: unknown, ignore: unknown, options: unknown = {}) => {
       if (typeof ignore !== 'boolean') return;
       const parsedOptions = parseOptionalForwardingOptions(options);
-      const senderWindow =
-        electron.BrowserWindow?.fromWebContents((event as IpcMainEvent).sender) ?? null;
+      const senderWindow = BrowserWindow.fromWebContents((event as IpcMainEvent).sender);
       if (senderWindow && !senderWindow.isDestroyed()) {
         senderWindow.setIgnoreMouseEvents(ignore, parsedOptions);
       }
     },
   );
 
-  ipc.on(IPC_CHANNELS.command.overlayModalClosed, (event: unknown, modal: unknown) => {
+  ipc.on(IPC_CHANNELS.command.overlayModalClosed, (_event: unknown, modal: unknown) => {
     const parsedModal = parseOverlayHostedModal(modal);
     if (!parsedModal) return;
-    const senderWindow =
-      electron.BrowserWindow?.fromWebContents((event as IpcMainEvent).sender) ?? null;
-    deps.onOverlayModalClosed(parsedModal, senderWindow);
+    deps.onOverlayModalClosed(parsedModal);
   });
-  ipc.on(IPC_CHANNELS.command.overlayModalOpened, (event: unknown, modal: unknown) => {
+  ipc.on(IPC_CHANNELS.command.overlayModalOpened, (_event: unknown, modal: unknown) => {
     const parsedModal = parseOverlayHostedModal(modal);
     if (!parsedModal) return;
     if (!deps.onOverlayModalOpened) return;
-    const senderWindow =
-      electron.BrowserWindow?.fromWebContents((event as IpcMainEvent).sender) ?? null;
-    deps.onOverlayModalOpened(parsedModal, senderWindow);
+    deps.onOverlayModalOpened(parsedModal);
   });
 
   ipc.handle(
@@ -457,25 +431,10 @@ export function registerIpcHandlers(deps: IpcServiceDeps, ipc: IpcMainRegistrar
     deps.handleMpvCommand(parsedCommand);
   });
 
-  ipc.handle(
-    IPC_CHANNELS.command.dispatchSessionAction,
-    async (_event: unknown, request: unknown) => {
-      const parsedRequest = parseSessionActionDispatchRequest(request);
-      if (!parsedRequest) {
-        throw new Error('Invalid session action payload');
-      }
-      await deps.dispatchSessionAction?.(parsedRequest);
-    },
-  );
-
   ipc.handle(IPC_CHANNELS.request.getKeybindings, () => {
     return deps.getKeybindings();
   });
 
-  ipc.handle(IPC_CHANNELS.request.getSessionBindings, () => {
-    return deps.getSessionBindings?.() ?? [];
-  });
-
   ipc.handle(IPC_CHANNELS.request.getConfigShortcuts, () => {
     return deps.getConfiguredShortcuts();
   });

src/core/services/overlay-drop.test.ts

@@ -45,7 +45,11 @@ test('collectDroppedVideoPaths parses text/uri-list entries and de-duplicates',
 
 test('collectDroppedSubtitlePaths keeps supported dropped subtitle paths in order', () => {
   const transfer = makeTransfer({
-    files: [{ path: '/subs/ep02.ass' }, { path: '/subs/readme.txt' }, { path: '/subs/ep03.SRT' }],
+    files: [
+      { path: '/subs/ep02.ass' },
+      { path: '/subs/readme.txt' },
+      { path: '/subs/ep03.SRT' },
+    ],
   });
 
   const result = collectDroppedSubtitlePaths(transfer);

src/core/services/overlay-runtime-init.test.ts

@@ -443,214 +443,3 @@ test('initializeOverlayRuntime refreshes visible overlay when tracker focus chan
 
   assert.equal(visibilityRefreshCalls, 2);
 });
-
-test('initializeOverlayRuntime refreshes the current subtitle when tracker finds the target window again', () => {
-  let subtitleRefreshCalls = 0;
-  const tracker = {
-    onGeometryChange: null as ((...args: unknown[]) => void) | null,
-    onWindowFound: null as ((...args: unknown[]) => void) | null,
-    onWindowLost: null as (() => void) | null,
-    onWindowFocusChange: null as ((focused: boolean) => void) | null,
-    start: () => {},
-  };
-
-  initializeOverlayRuntime({
-    backendOverride: null,
-    createMainWindow: () => {},
-    registerGlobalShortcuts: () => {},
-    updateVisibleOverlayBounds: () => {},
-    isVisibleOverlayVisible: () => true,
-    updateVisibleOverlayVisibility: () => {},
-    refreshCurrentSubtitle: () => {
-      subtitleRefreshCalls += 1;
-    },
-    getOverlayWindows: () => [],
-    syncOverlayShortcuts: () => {},
-    setWindowTracker: () => {},
-    getMpvSocketPath: () => '/tmp/mpv.sock',
-    createWindowTracker: () => tracker as never,
-    getResolvedConfig: () => ({
-      ankiConnect: { enabled: false } as never,
-    }),
-    getSubtitleTimingTracker: () => null,
-    getMpvClient: () => null,
-    getRuntimeOptionsManager: () => null,
-    setAnkiIntegration: () => {},
-    showDesktopNotification: () => {},
-    createFieldGroupingCallback: () => async () => ({
-      keepNoteId: 1,
-      deleteNoteId: 2,
-      deleteDuplicate: false,
-      cancelled: false,
-    }),
-    getKnownWordCacheStatePath: () => '/tmp/known-words-cache.json',
-  });
-
-  tracker.onWindowFound?.({ x: 100, y: 200, width: 1280, height: 720 });
-
-  assert.equal(subtitleRefreshCalls, 1);
-});
-
-test('initializeOverlayRuntime hides overlay windows when tracker loses the target window', () => {
-  const calls: string[] = [];
-  const tracker = {
-    onGeometryChange: null as ((...args: unknown[]) => void) | null,
-    onWindowFound: null as ((...args: unknown[]) => void) | null,
-    onWindowLost: null as (() => void) | null,
-    onWindowFocusChange: null as ((focused: boolean) => void) | null,
-    isTargetWindowMinimized: () => true,
-    start: () => {},
-  };
-  const overlayWindows = [
-    {
-      hide: () => calls.push('hide-visible'),
-    },
-    {
-      hide: () => calls.push('hide-modal'),
-    },
-  ];
-
-  initializeOverlayRuntime({
-    backendOverride: null,
-    createMainWindow: () => {},
-    registerGlobalShortcuts: () => {},
-    updateVisibleOverlayBounds: () => {},
-    isVisibleOverlayVisible: () => true,
-    updateVisibleOverlayVisibility: () => {},
-    refreshCurrentSubtitle: () => {},
-    getOverlayWindows: () => overlayWindows as never,
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    setWindowTracker: () => {},
-    getMpvSocketPath: () => '/tmp/mpv.sock',
-    createWindowTracker: () => tracker as never,
-    getResolvedConfig: () => ({
-      ankiConnect: { enabled: false } as never,
-    }),
-    getSubtitleTimingTracker: () => null,
-    getMpvClient: () => null,
-    getRuntimeOptionsManager: () => null,
-    setAnkiIntegration: () => {},
-    showDesktopNotification: () => {},
-    createFieldGroupingCallback: () => async () => ({
-      keepNoteId: 1,
-      deleteNoteId: 2,
-      deleteDuplicate: false,
-      cancelled: false,
-    }),
-    getKnownWordCacheStatePath: () => '/tmp/known-words-cache.json',
-  });
-
-  tracker.onWindowLost?.();
-
-  assert.deepEqual(calls, ['hide-visible', 'hide-modal', 'sync-shortcuts']);
-});
-
-test('initializeOverlayRuntime hides visible overlay on Windows tracker loss when target is not minimized', () => {
-  const calls: string[] = [];
-  const tracker = {
-    onGeometryChange: null as ((...args: unknown[]) => void) | null,
-    onWindowFound: null as ((...args: unknown[]) => void) | null,
-    onWindowLost: null as (() => void) | null,
-    onWindowFocusChange: null as ((focused: boolean) => void) | null,
-    isTargetWindowMinimized: () => false,
-    start: () => {},
-  };
-  const overlayWindows = [
-    {
-      hide: () => calls.push('hide-visible'),
-    },
-  ];
-
-  initializeOverlayRuntime({
-    backendOverride: null,
-    createMainWindow: () => {},
-    registerGlobalShortcuts: () => {},
-    updateVisibleOverlayBounds: () => {},
-    isVisibleOverlayVisible: () => true,
-    updateVisibleOverlayVisibility: () => {
-      calls.push('update-visible');
-    },
-    refreshCurrentSubtitle: () => {},
-    getOverlayWindows: () => overlayWindows as never,
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    setWindowTracker: () => {},
-    getMpvSocketPath: () => '/tmp/mpv.sock',
-    createWindowTracker: () => tracker as never,
-    getResolvedConfig: () => ({
-      ankiConnect: { enabled: false } as never,
-    }),
-    getSubtitleTimingTracker: () => null,
-    getMpvClient: () => null,
-    getRuntimeOptionsManager: () => null,
-    setAnkiIntegration: () => {},
-    showDesktopNotification: () => {},
-    createFieldGroupingCallback: () => async () => ({
-      keepNoteId: 1,
-      deleteNoteId: 2,
-      deleteDuplicate: false,
-      cancelled: false,
-    }),
-    getKnownWordCacheStatePath: () => '/tmp/known-words-cache.json',
-  });
-
-  calls.length = 0;
-  tracker.onWindowLost?.();
-
-  assert.deepEqual(calls, ['hide-visible', 'sync-shortcuts']);
-});
-
-test('initializeOverlayRuntime restores overlay bounds and visibility when tracker finds the target window again', () => {
-  const bounds: Array<{ x: number; y: number; width: number; height: number }> = [];
-  let visibilityRefreshCalls = 0;
-  const tracker = {
-    onGeometryChange: null as ((...args: unknown[]) => void) | null,
-    onWindowFound: null as ((...args: unknown[]) => void) | null,
-    onWindowLost: null as (() => void) | null,
-    onWindowFocusChange: null as ((focused: boolean) => void) | null,
-    start: () => {},
-  };
-
-  initializeOverlayRuntime({
-    backendOverride: null,
-    createMainWindow: () => {},
-    registerGlobalShortcuts: () => {},
-    updateVisibleOverlayBounds: (geometry) => {
-      bounds.push(geometry);
-    },
-    isVisibleOverlayVisible: () => true,
-    updateVisibleOverlayVisibility: () => {
-      visibilityRefreshCalls += 1;
-    },
-    refreshCurrentSubtitle: () => {},
-    getOverlayWindows: () => [],
-    syncOverlayShortcuts: () => {},
-    setWindowTracker: () => {},
-    getMpvSocketPath: () => '/tmp/mpv.sock',
-    createWindowTracker: () => tracker as never,
-    getResolvedConfig: () => ({
-      ankiConnect: { enabled: false } as never,
-    }),
-    getSubtitleTimingTracker: () => null,
-    getMpvClient: () => null,
-    getRuntimeOptionsManager: () => null,
-    setAnkiIntegration: () => {},
-    showDesktopNotification: () => {},
-    createFieldGroupingCallback: () => async () => ({
-      keepNoteId: 1,
-      deleteNoteId: 2,
-      deleteDuplicate: false,
-      cancelled: false,
-    }),
-    getKnownWordCacheStatePath: () => '/tmp/known-words-cache.json',
-  });
-
-  const restoredGeometry = { x: 100, y: 200, width: 1280, height: 720 };
-  tracker.onWindowFound?.(restoredGeometry);
-
-  assert.deepEqual(bounds, [restoredGeometry]);
-  assert.equal(visibilityRefreshCalls, 2);
-});

src/core/services/overlay-runtime-init.ts

@@ -71,7 +71,6 @@ export function initializeOverlayRuntime(options: {
   updateVisibleOverlayBounds: (geometry: WindowGeometry) => void;
   isVisibleOverlayVisible: () => boolean;
   updateVisibleOverlayVisibility: () => void;
-  refreshCurrentSubtitle?: () => void;
   getOverlayWindows: () => BrowserWindow[];
   syncOverlayShortcuts: () => void;
   setWindowTracker: (tracker: BaseWindowTracker | null) => void;
@@ -79,8 +78,6 @@ export function initializeOverlayRuntime(options: {
     override?: string | null,
     targetMpvSocketPath?: string | null,
   ) => BaseWindowTracker | null;
-  bindOverlayOwner?: () => void;
-  releaseOverlayOwner?: () => void;
 }): void {
   options.createMainWindow();
   options.registerGlobalShortcuts();
@@ -97,14 +94,11 @@ export function initializeOverlayRuntime(options: {
     };
     windowTracker.onWindowFound = (geometry: WindowGeometry) => {
       options.updateVisibleOverlayBounds(geometry);
-      options.bindOverlayOwner?.();
       if (options.isVisibleOverlayVisible()) {
         options.updateVisibleOverlayVisibility();
-        options.refreshCurrentSubtitle?.();
       }
     };
     windowTracker.onWindowLost = () => {
-      options.releaseOverlayOwner?.();
       for (const window of options.getOverlayWindows()) {
         window.hide();
       }

src/core/services/overlay-shortcut-handler.test.ts

@@ -6,11 +6,7 @@ import {
   OverlayShortcutRuntimeDeps,
   runOverlayShortcutLocalFallback,
 } from './overlay-shortcut-handler';
-import {
-  registerOverlayShortcutsRuntime,
-  shouldActivateOverlayShortcuts,
-  unregisterOverlayShortcutsRuntime,
-} from './overlay-shortcut';
+import { shouldActivateOverlayShortcuts } from './overlay-shortcut';
 
 function makeShortcuts(overrides: Partial<ConfiguredShortcuts> = {}): ConfiguredShortcuts {
   return {
@@ -27,10 +23,6 @@ function makeShortcuts(overrides: Partial<ConfiguredShortcuts> = {}): Configured
     markAudioCard: null,
     openRuntimeOptions: null,
     openJimaku: null,
-    openSessionHelp: null,
-    openControllerSelect: null,
-    openControllerDebug: null,
-    toggleSubtitleSidebar: null,
     ...overrides,
   };
 }
@@ -321,59 +313,3 @@ test('shouldActivateOverlayShortcuts preserves non-macOS behavior', () => {
     true,
   );
 });
-
-test('registerOverlayShortcutsRuntime reports active shortcuts when configured', () => {
-  const deps = {
-    getConfiguredShortcuts: () => makeShortcuts({ openJimaku: 'Ctrl+J' }),
-    getOverlayHandlers: () => ({
-      copySubtitle: () => {},
-      copySubtitleMultiple: () => {},
-      updateLastCardFromClipboard: () => {},
-      triggerFieldGrouping: () => {},
-      triggerSubsync: () => {},
-      mineSentence: () => {},
-      mineSentenceMultiple: () => {},
-      toggleSecondarySub: () => {},
-      markAudioCard: () => {},
-      openRuntimeOptions: () => {},
-      openJimaku: () => {},
-    }),
-    cancelPendingMultiCopy: () => {},
-    cancelPendingMineSentenceMultiple: () => {},
-  };
-
-  const result = registerOverlayShortcutsRuntime(deps);
-  assert.equal(result, true);
-  assert.equal(unregisterOverlayShortcutsRuntime(result, deps), false);
-});
-
-test('unregisterOverlayShortcutsRuntime clears pending shortcut work when active', () => {
-  const calls: string[] = [];
-  const deps = {
-    getConfiguredShortcuts: () => makeShortcuts({ openJimaku: 'Ctrl+J' }),
-    getOverlayHandlers: () => ({
-      copySubtitle: () => {},
-      copySubtitleMultiple: () => {},
-      updateLastCardFromClipboard: () => {},
-      triggerFieldGrouping: () => {},
-      triggerSubsync: () => {},
-      mineSentence: () => {},
-      mineSentenceMultiple: () => {},
-      toggleSecondarySub: () => {},
-      markAudioCard: () => {},
-      openRuntimeOptions: () => {},
-      openJimaku: () => {},
-    }),
-    cancelPendingMultiCopy: () => {
-      calls.push('cancel-multi-copy');
-    },
-    cancelPendingMineSentenceMultiple: () => {
-      calls.push('cancel-mine-sentence-multiple');
-    },
-  };
-
-  assert.equal(registerOverlayShortcutsRuntime(deps), true);
-  const result = unregisterOverlayShortcutsRuntime(true, deps);
-  assert.equal(result, false);
-  assert.deepEqual(calls, ['cancel-multi-copy', 'cancel-mine-sentence-multiple']);
-});

src/core/services/overlay-shortcut.test.ts

@@ -1,98 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import type { ConfiguredShortcuts } from '../utils/shortcut-config';
-import {
-  registerOverlayShortcuts,
-  syncOverlayShortcutsRuntime,
-  unregisterOverlayShortcutsRuntime,
-} from './overlay-shortcut';
-
-function createShortcuts(overrides: Partial<ConfiguredShortcuts> = {}): ConfiguredShortcuts {
-  return {
-    toggleVisibleOverlayGlobal: null,
-    copySubtitle: null,
-    copySubtitleMultiple: null,
-    updateLastCardFromClipboard: null,
-    triggerFieldGrouping: null,
-    triggerSubsync: null,
-    mineSentence: null,
-    mineSentenceMultiple: null,
-    multiCopyTimeoutMs: 2500,
-    toggleSecondarySub: null,
-    markAudioCard: null,
-    openRuntimeOptions: null,
-    openJimaku: null,
-    openSessionHelp: null,
-    openControllerSelect: null,
-    openControllerDebug: null,
-    toggleSubtitleSidebar: null,
-    ...overrides,
-  };
-}
-
-test('registerOverlayShortcuts reports active overlay shortcuts when configured', () => {
-  assert.equal(
-    registerOverlayShortcuts(createShortcuts({ openJimaku: 'Ctrl+J' }), {
-      copySubtitle: () => {},
-      copySubtitleMultiple: () => {},
-      updateLastCardFromClipboard: () => {},
-      triggerFieldGrouping: () => {},
-      triggerSubsync: () => {},
-      mineSentence: () => {},
-      mineSentenceMultiple: () => {},
-      toggleSecondarySub: () => {},
-      markAudioCard: () => {},
-      openRuntimeOptions: () => {},
-      openJimaku: () => {},
-    }),
-    true,
-  );
-});
-
-test('registerOverlayShortcuts stays inactive when overlay shortcuts are absent', () => {
-  assert.equal(
-    registerOverlayShortcuts(createShortcuts(), {
-      copySubtitle: () => {},
-      copySubtitleMultiple: () => {},
-      updateLastCardFromClipboard: () => {},
-      triggerFieldGrouping: () => {},
-      triggerSubsync: () => {},
-      mineSentence: () => {},
-      mineSentenceMultiple: () => {},
-      toggleSecondarySub: () => {},
-      markAudioCard: () => {},
-      openRuntimeOptions: () => {},
-      openJimaku: () => {},
-    }),
-    false,
-  );
-});
-
-test('syncOverlayShortcutsRuntime deactivates cleanly when shortcuts were active', () => {
-  const calls: string[] = [];
-  const result = syncOverlayShortcutsRuntime(false, true, {
-    getConfiguredShortcuts: () => createShortcuts(),
-    getOverlayHandlers: () => ({
-      copySubtitle: () => {},
-      copySubtitleMultiple: () => {},
-      updateLastCardFromClipboard: () => {},
-      triggerFieldGrouping: () => {},
-      triggerSubsync: () => {},
-      mineSentence: () => {},
-      mineSentenceMultiple: () => {},
-      toggleSecondarySub: () => {},
-      markAudioCard: () => {},
-      openRuntimeOptions: () => {},
-      openJimaku: () => {},
-    }),
-    cancelPendingMultiCopy: () => {
-      calls.push('cancel-multi-copy');
-    },
-    cancelPendingMineSentenceMultiple: () => {
-      calls.push('cancel-mine-sentence-multiple');
-    },
-  });
-
-  assert.equal(result, false);
-  assert.deepEqual(calls, ['cancel-multi-copy', 'cancel-mine-sentence-multiple']);
-});

src/core/services/overlay-shortcut.ts

@@ -1,4 +1,10 @@
+import electron from 'electron';
 import { ConfiguredShortcuts } from '../utils/shortcut-config';
+import { isGlobalShortcutRegisteredSafe } from './shortcut-fallback';
+import { createLogger } from '../../logger';
+
+const { globalShortcut } = electron;
+const logger = createLogger('main:overlay-shortcut-service');
 
 export interface OverlayShortcutHandlers {
   copySubtitle: () => void;
@@ -21,27 +27,6 @@ export interface OverlayShortcutLifecycleDeps {
   cancelPendingMineSentenceMultiple: () => void;
 }
 
-const OVERLAY_SHORTCUT_KEYS: Array<keyof Omit<ConfiguredShortcuts, 'multiCopyTimeoutMs'>> = [
-  'copySubtitle',
-  'copySubtitleMultiple',
-  'updateLastCardFromClipboard',
-  'triggerFieldGrouping',
-  'triggerSubsync',
-  'mineSentence',
-  'mineSentenceMultiple',
-  'toggleSecondarySub',
-  'markAudioCard',
-  'openRuntimeOptions',
-  'openJimaku',
-];
-
-function hasConfiguredOverlayShortcuts(shortcuts: ConfiguredShortcuts): boolean {
-  return OVERLAY_SHORTCUT_KEYS.some((key) => {
-    const shortcut = shortcuts[key];
-    return typeof shortcut === 'string' && shortcut.trim().length > 0;
-  });
-}
-
 export function shouldActivateOverlayShortcuts(args: {
   overlayRuntimeInitialized: boolean;
   isMacOSPlatform: boolean;
@@ -58,12 +43,139 @@ export function shouldActivateOverlayShortcuts(args: {
 
 export function registerOverlayShortcuts(
   shortcuts: ConfiguredShortcuts,
-  _handlers: OverlayShortcutHandlers,
+  handlers: OverlayShortcutHandlers,
 ): boolean {
-  return hasConfiguredOverlayShortcuts(shortcuts);
+  let registeredAny = false;
+  const registerOverlayShortcut = (
+    accelerator: string,
+    handler: () => void,
+    label: string,
+  ): void => {
+    if (isGlobalShortcutRegisteredSafe(accelerator)) {
+      registeredAny = true;
+      return;
+    }
+    const ok = globalShortcut.register(accelerator, handler);
+    if (!ok) {
+      logger.warn(`Failed to register overlay shortcut ${label}: ${accelerator}`);
+      return;
+    }
+    registeredAny = true;
+  };
+
+  if (shortcuts.copySubtitleMultiple) {
+    registerOverlayShortcut(
+      shortcuts.copySubtitleMultiple,
+      () => handlers.copySubtitleMultiple(shortcuts.multiCopyTimeoutMs),
+      'copySubtitleMultiple',
+    );
+  }
+
+  if (shortcuts.copySubtitle) {
+    registerOverlayShortcut(shortcuts.copySubtitle, () => handlers.copySubtitle(), 'copySubtitle');
+  }
+
+  if (shortcuts.triggerFieldGrouping) {
+    registerOverlayShortcut(
+      shortcuts.triggerFieldGrouping,
+      () => handlers.triggerFieldGrouping(),
+      'triggerFieldGrouping',
+    );
+  }
+
+  if (shortcuts.triggerSubsync) {
+    registerOverlayShortcut(
+      shortcuts.triggerSubsync,
+      () => handlers.triggerSubsync(),
+      'triggerSubsync',
+    );
+  }
+
+  if (shortcuts.mineSentence) {
+    registerOverlayShortcut(shortcuts.mineSentence, () => handlers.mineSentence(), 'mineSentence');
+  }
+
+  if (shortcuts.mineSentenceMultiple) {
+    registerOverlayShortcut(
+      shortcuts.mineSentenceMultiple,
+      () => handlers.mineSentenceMultiple(shortcuts.multiCopyTimeoutMs),
+      'mineSentenceMultiple',
+    );
+  }
+
+  if (shortcuts.toggleSecondarySub) {
+    registerOverlayShortcut(
+      shortcuts.toggleSecondarySub,
+      () => handlers.toggleSecondarySub(),
+      'toggleSecondarySub',
+    );
+  }
+
+  if (shortcuts.updateLastCardFromClipboard) {
+    registerOverlayShortcut(
+      shortcuts.updateLastCardFromClipboard,
+      () => handlers.updateLastCardFromClipboard(),
+      'updateLastCardFromClipboard',
+    );
+  }
+
+  if (shortcuts.markAudioCard) {
+    registerOverlayShortcut(
+      shortcuts.markAudioCard,
+      () => handlers.markAudioCard(),
+      'markAudioCard',
+    );
+  }
+
+  if (shortcuts.openRuntimeOptions) {
+    registerOverlayShortcut(
+      shortcuts.openRuntimeOptions,
+      () => handlers.openRuntimeOptions(),
+      'openRuntimeOptions',
+    );
+  }
+  if (shortcuts.openJimaku) {
+    registerOverlayShortcut(shortcuts.openJimaku, () => handlers.openJimaku(), 'openJimaku');
+  }
+
+  return registeredAny;
 }
 
-export function unregisterOverlayShortcuts(_shortcuts: ConfiguredShortcuts): void {}
+export function unregisterOverlayShortcuts(shortcuts: ConfiguredShortcuts): void {
+  if (shortcuts.copySubtitle) {
+    globalShortcut.unregister(shortcuts.copySubtitle);
+  }
+  if (shortcuts.copySubtitleMultiple) {
+    globalShortcut.unregister(shortcuts.copySubtitleMultiple);
+  }
+  if (shortcuts.updateLastCardFromClipboard) {
+    globalShortcut.unregister(shortcuts.updateLastCardFromClipboard);
+  }
+  if (shortcuts.triggerFieldGrouping) {
+    globalShortcut.unregister(shortcuts.triggerFieldGrouping);
+  }
+  if (shortcuts.triggerSubsync) {
+    globalShortcut.unregister(shortcuts.triggerSubsync);
+  }
+  if (shortcuts.mineSentence) {
+    globalShortcut.unregister(shortcuts.mineSentence);
+  }
+  if (shortcuts.mineSentenceMultiple) {
+    globalShortcut.unregister(shortcuts.mineSentenceMultiple);
+  }
+  if (shortcuts.toggleSecondarySub) {
+    globalShortcut.unregister(shortcuts.toggleSecondarySub);
+  }
+  if (shortcuts.markAudioCard) {
+    globalShortcut.unregister(shortcuts.markAudioCard);
+  }
+  if (shortcuts.openRuntimeOptions) {
+    globalShortcut.unregister(shortcuts.openRuntimeOptions);
+  }
+  if (shortcuts.openJimaku) {
+    globalShortcut.unregister(shortcuts.openJimaku);
+  }
+}
 
 export function registerOverlayShortcutsRuntime(deps: OverlayShortcutLifecycleDeps): boolean {
   return registerOverlayShortcuts(deps.getConfiguredShortcuts(), deps.getOverlayHandlers());

src/core/services/overlay-visibility.test.ts

@@ -1,80 +1,36 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { OVERLAY_WINDOW_CONTENT_READY_FLAG } from './overlay-window-flags';
 import { setVisibleOverlayVisible, updateVisibleOverlayVisibility } from './overlay-visibility';
 
 type WindowTrackerStub = {
   isTracking: () => boolean;
   getGeometry: () => { x: number; y: number; width: number; height: number } | null;
-  isTargetWindowFocused?: () => boolean;
-  isTargetWindowMinimized?: () => boolean;
 };
 
 function createMainWindowRecorder() {
   const calls: string[] = [];
   let visible = false;
-  let focused = false;
-  let opacity = 1;
-  let contentReady = true;
   const window = {
-    webContents: {},
     isDestroyed: () => false,
     isVisible: () => visible,
-    isFocused: () => focused,
     hide: () => {
       visible = false;
-      focused = false;
       calls.push('hide');
     },
     show: () => {
       visible = true;
       calls.push('show');
     },
-    showInactive: () => {
-      visible = true;
-      calls.push('show-inactive');
-    },
     focus: () => {
-      focused = true;
       calls.push('focus');
     },
-    setAlwaysOnTop: (flag: boolean) => {
-      calls.push(`always-on-top:${flag}`);
-    },
     setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
       calls.push(`mouse-ignore:${ignore}:${options?.forward === true ? 'forward' : 'plain'}`);
     },
-    setOpacity: (nextOpacity: number) => {
-      opacity = nextOpacity;
-      calls.push(`opacity:${nextOpacity}`);
-    },
-    moveTop: () => {
-      calls.push('move-top');
-    },
   };
-  (
-    window as {
-      [OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean;
-    }
-  )[OVERLAY_WINDOW_CONTENT_READY_FLAG] = contentReady;
 
-  return {
-    window,
-    calls,
-    getOpacity: () => opacity,
-    setContentReady: (nextContentReady: boolean) => {
-      contentReady = nextContentReady;
-      (
-        window as {
-          [OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean;
-        }
-      )[OVERLAY_WINDOW_CONTENT_READY_FLAG] = contentReady;
-    },
-    setFocused: (nextFocused: boolean) => {
-      focused = nextFocused;
-    },
-  };
+  return { window, calls };
 }
 
 test('macOS keeps visible overlay hidden while tracker is not ready and emits one loading OSD', () => {
@@ -211,7 +167,7 @@ test('untracked non-macOS overlay keeps fallback visible behavior when no tracke
   assert.ok(!calls.includes('osd'));
 });
 
-test('Windows visible overlay stays click-through and binds to mpv while tracked', () => {
+test('Windows visible overlay stays click-through and does not steal focus while tracked', () => {
   const { window, calls } = createMainWindowRecorder();
   const tracker: WindowTrackerStub = {
     isTracking: () => true,
@@ -230,9 +186,6 @@ test('Windows visible overlay stays click-through and binds to mpv while tracked
     ensureOverlayWindowLevel: () => {
       calls.push('ensure-level');
     },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
     syncPrimaryOverlayWindowLayer: () => {
       calls.push('sync-layer');
     },
@@ -246,110 +199,12 @@ test('Windows visible overlay stays click-through and binds to mpv while tracked
     isWindowsPlatform: true,
   } as never);
 
-  assert.ok(calls.includes('opacity:0'));
   assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(calls.includes('show-inactive'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-  assert.ok(!calls.includes('move-top'));
-  assert.ok(!calls.includes('ensure-level'));
-  assert.ok(!calls.includes('enforce-order'));
+  assert.ok(calls.includes('show'));
   assert.ok(!calls.includes('focus'));
 });
 
-test('Windows visible overlay restores opacity after the deferred reveal delay', async () => {
-  const { window, calls, getOpacity } = createMainWindowRecorder();
-  let syncWindowsZOrderCalls = 0;
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      syncWindowsZOrderCalls += 1;
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  assert.equal(getOpacity(), 0);
-  assert.equal(syncWindowsZOrderCalls, 1);
-  await new Promise<void>((resolve) => setTimeout(resolve, 60));
-  assert.equal(getOpacity(), 1);
-  assert.equal(syncWindowsZOrderCalls, 2);
-  assert.ok(calls.includes('opacity:1'));
-});
-
-test('Windows visible overlay waits for content-ready before first reveal', () => {
-  const { window, calls, setContentReady } = createMainWindowRecorder();
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-  };
-  setContentReady(false);
-
-  const run = () =>
-    updateVisibleOverlayVisibility({
-      visibleOverlayVisible: true,
-      mainWindow: window as never,
-      windowTracker: tracker as never,
-      trackerNotReadyWarningShown: false,
-      setTrackerNotReadyWarningShown: () => {},
-      updateVisibleOverlayBounds: () => {
-        calls.push('update-bounds');
-      },
-      ensureOverlayWindowLevel: () => {
-        calls.push('ensure-level');
-      },
-      syncWindowsOverlayToMpvZOrder: () => {
-        calls.push('sync-windows-z-order');
-      },
-      syncPrimaryOverlayWindowLayer: () => {
-        calls.push('sync-layer');
-      },
-      enforceOverlayLayerOrder: () => {
-        calls.push('enforce-order');
-      },
-      syncOverlayShortcuts: () => {
-        calls.push('sync-shortcuts');
-      },
-      isMacOSPlatform: false,
-      isWindowsPlatform: true,
-    } as never);
-
-  run();
-
-  assert.ok(!calls.includes('show-inactive'));
-  assert.ok(!calls.includes('show'));
-
-  setContentReady(true);
-  run();
-
-  assert.ok(calls.includes('show-inactive'));
-});
-
-test('tracked Windows overlay refresh rebinds while already visible', () => {
+test('tracked Windows overlay refresh preserves renderer-managed mouse interaction when already visible', () => {
   const { window, calls } = createMainWindowRecorder();
   const tracker: WindowTrackerStub = {
     isTracking: () => true,
@@ -368,9 +223,6 @@ test('tracked Windows overlay refresh rebinds while already visible', () => {
     ensureOverlayWindowLevel: () => {
       calls.push('ensure-level');
     },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
     syncPrimaryOverlayWindowLayer: () => {
       calls.push('sync-layer');
     },
@@ -398,9 +250,6 @@ test('tracked Windows overlay refresh rebinds while already visible', () => {
     ensureOverlayWindowLevel: () => {
       calls.push('ensure-level');
     },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
     syncPrimaryOverlayWindowLayer: () => {
       calls.push('sync-layer');
     },
@@ -414,11 +263,9 @@ test('tracked Windows overlay refresh rebinds while already visible', () => {
     isWindowsPlatform: true,
   } as never);
 
-  assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-  assert.ok(!calls.includes('move-top'));
+  assert.ok(!calls.includes('mouse-ignore:true:forward'));
   assert.ok(!calls.includes('show'));
-  assert.ok(!calls.includes('ensure-level'));
+  assert.ok(calls.includes('ensure-level'));
   assert.ok(calls.includes('sync-shortcuts'));
 });
 
@@ -441,9 +288,6 @@ test('forced passthrough still reapplies while visible on Windows', () => {
     ensureOverlayWindowLevel: () => {
       calls.push('ensure-level');
     },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
     syncPrimaryOverlayWindowLayer: () => {
       calls.push('sync-layer');
     },
@@ -471,9 +315,6 @@ test('forced passthrough still reapplies while visible on Windows', () => {
     ensureOverlayWindowLevel: () => {
       calls.push('ensure-level');
     },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
     syncPrimaryOverlayWindowLayer: () => {
       calls.push('sync-layer');
     },
@@ -489,360 +330,6 @@ test('forced passthrough still reapplies while visible on Windows', () => {
   } as never);
 
   assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(!calls.includes('always-on-top:false'));
-  assert.ok(!calls.includes('move-top'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-  assert.ok(!calls.includes('ensure-level'));
-  assert.ok(!calls.includes('enforce-order'));
-});
-
-test('forced passthrough still shows tracked overlay while bound to mpv on Windows', () => {
-  const { window, calls } = createMainWindowRecorder();
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-    forceMousePassthrough: true,
-  } as never);
-
-  assert.ok(calls.includes('show-inactive'));
-  assert.ok(!calls.includes('always-on-top:false'));
-  assert.ok(!calls.includes('move-top'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-});
-
-test('forced mouse passthrough drops macOS tracked overlay below higher-priority windows', () => {
-  const { window, calls } = createMainWindowRecorder();
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: true,
-    isWindowsPlatform: false,
-    forceMousePassthrough: true,
-  } as never);
-
-  assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(calls.includes('always-on-top:false'));
-  assert.ok(!calls.includes('ensure-level'));
-  assert.ok(!calls.includes('enforce-order'));
-});
-
-test('tracked Windows overlay rebinds without hiding when tracker focus changes', () => {
-  const { window, calls } = createMainWindowRecorder();
-  let focused = true;
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-    isTargetWindowFocused: () => focused,
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  calls.length = 0;
-  focused = false;
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  assert.ok(!calls.includes('always-on-top:false'));
-  assert.ok(!calls.includes('move-top'));
-  assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-  assert.ok(!calls.includes('ensure-level'));
-  assert.ok(!calls.includes('enforce-order'));
-  assert.ok(!calls.includes('show'));
-});
-
-test('tracked Windows overlay stays interactive while the overlay window itself is focused', () => {
-  const { window, calls, setFocused } = createMainWindowRecorder();
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-    isTargetWindowFocused: () => false,
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  calls.length = 0;
-  setFocused(true);
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  assert.ok(calls.includes('mouse-ignore:false:plain'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-  assert.ok(!calls.includes('move-top'));
-  assert.ok(!calls.includes('ensure-level'));
-  assert.ok(!calls.includes('enforce-order'));
-});
-
-test('tracked Windows overlay reshows click-through even if focus state is stale after a modal closes', () => {
-  const { window, calls, setFocused } = createMainWindowRecorder();
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-    isTargetWindowFocused: () => false,
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  calls.length = 0;
-  window.hide();
-  calls.length = 0;
-  setFocused(true);
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(calls.includes('show-inactive'));
-  assert.ok(!calls.includes('show'));
-});
-
-test('tracked Windows overlay binds above mpv even when tracker focus lags', () => {
-  const { window, calls } = createMainWindowRecorder();
-  const tracker: WindowTrackerStub = {
-    isTracking: () => true,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-    isTargetWindowFocused: () => false,
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  assert.ok(!calls.includes('always-on-top:false'));
-  assert.ok(!calls.includes('move-top'));
-  assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-  assert.ok(!calls.includes('ensure-level'));
 });
 
 test('visible overlay stays hidden while a modal window is active', () => {
@@ -1000,157 +487,6 @@ test('Windows keeps visible overlay hidden while tracker is not ready', () => {
   assert.ok(!calls.includes('update-bounds'));
 });
 
-test('Windows preserves visible overlay and rebinds to mpv while tracker transiently loses a non-minimized window', () => {
-  const { window, calls } = createMainWindowRecorder();
-  let tracking = true;
-  const tracker: WindowTrackerStub = {
-    isTracking: () => tracking,
-    getGeometry: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
-    isTargetWindowFocused: () => false,
-    isTargetWindowMinimized: () => false,
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  calls.length = 0;
-  tracking = false;
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  assert.ok(!calls.includes('hide'));
-  assert.ok(!calls.includes('show'));
-  assert.ok(!calls.includes('always-on-top:false'));
-  assert.ok(!calls.includes('move-top'));
-  assert.ok(calls.includes('mouse-ignore:true:forward'));
-  assert.ok(calls.includes('sync-windows-z-order'));
-  assert.ok(!calls.includes('ensure-level'));
-  assert.ok(calls.includes('sync-shortcuts'));
-});
-
-test('Windows hides the visible overlay when the tracked window is minimized', () => {
-  const { window, calls } = createMainWindowRecorder();
-  let tracking = true;
-  const tracker: WindowTrackerStub = {
-    isTracking: () => tracking,
-    getGeometry: () => (tracking ? { x: 0, y: 0, width: 1280, height: 720 } : null),
-    isTargetWindowMinimized: () => !tracking,
-  };
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  calls.length = 0;
-  tracking = false;
-
-  updateVisibleOverlayVisibility({
-    visibleOverlayVisible: true,
-    mainWindow: window as never,
-    windowTracker: tracker as never,
-    trackerNotReadyWarningShown: false,
-    setTrackerNotReadyWarningShown: () => {},
-    updateVisibleOverlayBounds: () => {
-      calls.push('update-bounds');
-    },
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    syncWindowsOverlayToMpvZOrder: () => {
-      calls.push('sync-windows-z-order');
-    },
-    syncPrimaryOverlayWindowLayer: () => {
-      calls.push('sync-layer');
-    },
-    enforceOverlayLayerOrder: () => {
-      calls.push('enforce-order');
-    },
-    syncOverlayShortcuts: () => {
-      calls.push('sync-shortcuts');
-    },
-    isMacOSPlatform: false,
-    isWindowsPlatform: true,
-  } as never);
-
-  assert.ok(calls.includes('hide'));
-  assert.ok(!calls.includes('sync-windows-z-order'));
-});
-
 test('macOS keeps visible overlay hidden while tracker is not initialized yet', () => {
   const { window, calls } = createMainWindowRecorder();
   let trackerWarning = false;

src/core/services/overlay-visibility.ts

@@ -1,52 +1,6 @@
 import type { BrowserWindow } from 'electron';
 import { BaseWindowTracker } from '../../window-trackers';
 import { WindowGeometry } from '../../types';
-import { OVERLAY_WINDOW_CONTENT_READY_FLAG } from './overlay-window-flags';
-
-const WINDOWS_OVERLAY_REVEAL_DELAY_MS = 48;
-const pendingWindowsOverlayRevealTimeoutByWindow = new WeakMap<
-  BrowserWindow,
-  ReturnType<typeof setTimeout>
->();
-function setOverlayWindowOpacity(window: BrowserWindow, opacity: number): void {
-  const opacityCapableWindow = window as BrowserWindow & {
-    setOpacity?: (opacity: number) => void;
-  };
-  opacityCapableWindow.setOpacity?.(opacity);
-}
-
-function clearPendingWindowsOverlayReveal(window: BrowserWindow): void {
-  const pendingTimeout = pendingWindowsOverlayRevealTimeoutByWindow.get(window);
-  if (!pendingTimeout) {
-    return;
-  }
-  clearTimeout(pendingTimeout);
-  pendingWindowsOverlayRevealTimeoutByWindow.delete(window);
-}
-
-function scheduleWindowsOverlayReveal(
-  window: BrowserWindow,
-  onReveal?: (window: BrowserWindow) => void,
-): void {
-  clearPendingWindowsOverlayReveal(window);
-  const timeout = setTimeout(() => {
-    pendingWindowsOverlayRevealTimeoutByWindow.delete(window);
-    if (window.isDestroyed() || !window.isVisible()) {
-      return;
-    }
-    setOverlayWindowOpacity(window, 1);
-    onReveal?.(window);
-  }, WINDOWS_OVERLAY_REVEAL_DELAY_MS);
-  pendingWindowsOverlayRevealTimeoutByWindow.set(window, timeout);
-}
-
-function isOverlayWindowContentReady(window: BrowserWindow): boolean {
-  return (
-    (window as BrowserWindow & { [OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean })[
-      OVERLAY_WINDOW_CONTENT_READY_FLAG
-    ] === true
-  );
-}
 
 export function updateVisibleOverlayVisibility(args: {
   visibleOverlayVisible: boolean;
@@ -54,14 +8,10 @@ export function updateVisibleOverlayVisibility(args: {
   forceMousePassthrough?: boolean;
   mainWindow: BrowserWindow | null;
   windowTracker: BaseWindowTracker | null;
-  lastKnownWindowsForegroundProcessName?: string | null;
-  windowsOverlayProcessName?: string | null;
-  windowsFocusHandoffGraceActive?: boolean;
   trackerNotReadyWarningShown: boolean;
   setTrackerNotReadyWarningShown: (shown: boolean) => void;
   updateVisibleOverlayBounds: (geometry: WindowGeometry) => void;
   ensureOverlayWindowLevel: (window: BrowserWindow) => void;
-  syncWindowsOverlayToMpvZOrder?: (window: BrowserWindow) => void;
   syncPrimaryOverlayWindowLayer: (layer: 'visible') => void;
   enforceOverlayLayerOrder: () => void;
   syncOverlayShortcuts: () => void;
@@ -80,10 +30,6 @@ export function updateVisibleOverlayVisibility(args: {
   const mainWindow = args.mainWindow;
 
   if (args.modalActive) {
-    if (args.isWindowsPlatform) {
-      clearPendingWindowsOverlayReveal(mainWindow);
-      setOverlayWindowOpacity(mainWindow, 0);
-    }
     mainWindow.hide();
     args.syncOverlayShortcuts();
     return;
@@ -91,99 +37,21 @@ export function updateVisibleOverlayVisibility(args: {
 
   const showPassiveVisibleOverlay = (): void => {
     const forceMousePassthrough = args.forceMousePassthrough === true;
-    const wasVisible = mainWindow.isVisible();
     const shouldDefaultToPassthrough =
       args.isMacOSPlatform || args.isWindowsPlatform || forceMousePassthrough;
-    const isVisibleOverlayFocused =
-      typeof mainWindow.isFocused === 'function' && mainWindow.isFocused();
-    const windowsForegroundProcessName =
-      args.lastKnownWindowsForegroundProcessName?.trim().toLowerCase() ?? null;
-    const windowsOverlayProcessName = args.windowsOverlayProcessName?.trim().toLowerCase() ?? null;
-    const hasWindowsForegroundProcessSignal =
-      args.isWindowsPlatform && windowsForegroundProcessName !== null;
-    const isTrackedWindowsTargetFocused = args.windowTracker?.isTargetWindowFocused?.() ?? true;
-    const isTrackedWindowsTargetMinimized =
-      args.isWindowsPlatform &&
-      typeof args.windowTracker?.isTargetWindowMinimized === 'function' &&
-      args.windowTracker.isTargetWindowMinimized();
-    const shouldPreserveWindowsOverlayDuringFocusHandoff =
-      args.isWindowsPlatform &&
-      args.windowsFocusHandoffGraceActive === true &&
-      !!args.windowTracker &&
-      (!hasWindowsForegroundProcessSignal ||
-        windowsForegroundProcessName === 'mpv' ||
-        (windowsOverlayProcessName !== null &&
-          windowsForegroundProcessName === windowsOverlayProcessName)) &&
-      !isTrackedWindowsTargetMinimized &&
-      (args.windowTracker.isTracking() || args.windowTracker.getGeometry() !== null);
-    const shouldForcePassiveReshow = args.isWindowsPlatform && !wasVisible;
-    const shouldIgnoreMouseEvents =
-      forceMousePassthrough ||
-      (shouldDefaultToPassthrough && (!isVisibleOverlayFocused || shouldForcePassiveReshow));
-    const shouldBindTrackedWindowsOverlay = args.isWindowsPlatform && !!args.windowTracker;
-    const shouldKeepTrackedWindowsOverlayTopmost =
-      !args.isWindowsPlatform ||
-      !args.windowTracker ||
-      isVisibleOverlayFocused ||
-      isTrackedWindowsTargetFocused ||
-      shouldPreserveWindowsOverlayDuringFocusHandoff ||
-      (hasWindowsForegroundProcessSignal && windowsForegroundProcessName === 'mpv');
-    if (shouldIgnoreMouseEvents) {
-      mainWindow.setIgnoreMouseEvents(true, { forward: true });
-    } else {
-      mainWindow.setIgnoreMouseEvents(false);
-    }
+    const wasVisible = mainWindow.isVisible();
 
-    if (shouldBindTrackedWindowsOverlay) {
-      // On Windows, z-order is enforced by the OS via the owner window mechanism
-      // (SetWindowLongPtr GWLP_HWNDPARENT). The overlay is always above mpv
-      // without any manual z-order management.
-    } else if (!forceMousePassthrough) {
-      args.ensureOverlayWindowLevel(mainWindow);
-    } else {
-      mainWindow.setAlwaysOnTop(false);
-    }
-    if (!wasVisible) {
-      const hasWebContents =
-        typeof (mainWindow as unknown as { webContents?: unknown }).webContents === 'object';
-      if (
-        args.isWindowsPlatform &&
-        hasWebContents &&
-        !isOverlayWindowContentReady(mainWindow as unknown as import('electron').BrowserWindow)
-      ) {
-        // skip — ready-to-show hasn't fired yet; the onWindowContentReady
-        // callback will trigger another visibility update when the renderer
-        // has painted its first frame.
-      } else if (args.isWindowsPlatform && shouldIgnoreMouseEvents) {
-        setOverlayWindowOpacity(mainWindow, 0);
-        mainWindow.showInactive();
+    if (!wasVisible || forceMousePassthrough) {
+      if (shouldDefaultToPassthrough) {
         mainWindow.setIgnoreMouseEvents(true, { forward: true });
-        scheduleWindowsOverlayReveal(
-          mainWindow,
-          shouldBindTrackedWindowsOverlay
-            ? (window) => args.syncWindowsOverlayToMpvZOrder?.(window)
-            : undefined,
-        );
       } else {
-        if (args.isWindowsPlatform) {
-          setOverlayWindowOpacity(mainWindow, 0);
-        }
-        mainWindow.show();
-        if (args.isWindowsPlatform) {
-          scheduleWindowsOverlayReveal(
-            mainWindow,
-            shouldBindTrackedWindowsOverlay
-              ? (window) => args.syncWindowsOverlayToMpvZOrder?.(window)
-              : undefined,
-          );
-        }
+        mainWindow.setIgnoreMouseEvents(false);
       }
     }
-
-    if (shouldBindTrackedWindowsOverlay) {
-      args.syncWindowsOverlayToMpvZOrder?.(mainWindow);
+    args.ensureOverlayWindowLevel(mainWindow);
+    if (!wasVisible) {
+      mainWindow.show();
     }
-
     if (!args.isWindowsPlatform && !args.isMacOSPlatform && !forceMousePassthrough) {
       mainWindow.focus();
     }
@@ -203,27 +71,12 @@ export function updateVisibleOverlayVisibility(args: {
   if (!args.visibleOverlayVisible) {
     args.setTrackerNotReadyWarningShown(false);
     args.resetOverlayLoadingOsdSuppression?.();
-    if (args.isWindowsPlatform) {
-      clearPendingWindowsOverlayReveal(mainWindow);
-      setOverlayWindowOpacity(mainWindow, 0);
-    }
     mainWindow.hide();
     args.syncOverlayShortcuts();
     return;
   }
 
   if (args.windowTracker && args.windowTracker.isTracking()) {
-    if (
-      args.isWindowsPlatform &&
-      typeof args.windowTracker.isTargetWindowMinimized === 'function' &&
-      args.windowTracker.isTargetWindowMinimized()
-    ) {
-      clearPendingWindowsOverlayReveal(mainWindow);
-      setOverlayWindowOpacity(mainWindow, 0);
-      mainWindow.hide();
-      args.syncOverlayShortcuts();
-      return;
-    }
     args.setTrackerNotReadyWarningShown(false);
     const geometry = args.windowTracker.getGeometry();
     if (geometry) {
@@ -231,9 +84,7 @@ export function updateVisibleOverlayVisibility(args: {
     }
     args.syncPrimaryOverlayWindowLayer('visible');
     showPassiveVisibleOverlay();
-    if (!args.forceMousePassthrough && !args.isWindowsPlatform) {
-      args.enforceOverlayLayerOrder();
-    }
+    args.enforceOverlayLayerOrder();
     args.syncOverlayShortcuts();
     return;
   }
@@ -244,10 +95,6 @@ export function updateVisibleOverlayVisibility(args: {
         args.setTrackerNotReadyWarningShown(true);
         maybeShowOverlayLoadingOsd();
       }
-      if (args.isWindowsPlatform) {
-        clearPendingWindowsOverlayReveal(mainWindow);
-        setOverlayWindowOpacity(mainWindow, 0);
-      }
       mainWindow.hide();
       args.syncOverlayShortcuts();
       return;
@@ -260,32 +107,11 @@ export function updateVisibleOverlayVisibility(args: {
     return;
   }
 
-  if (
-    args.isWindowsPlatform &&
-    typeof args.windowTracker.isTargetWindowMinimized === 'function' &&
-    !args.windowTracker.isTargetWindowMinimized() &&
-    (mainWindow.isVisible() || args.windowTracker.getGeometry() !== null)
-  ) {
-    args.setTrackerNotReadyWarningShown(false);
-    const geometry = args.windowTracker.getGeometry();
-    if (geometry) {
-      args.updateVisibleOverlayBounds(geometry);
-    }
-    args.syncPrimaryOverlayWindowLayer('visible');
-    showPassiveVisibleOverlay();
-    args.syncOverlayShortcuts();
-    return;
-  }
-
   if (!args.trackerNotReadyWarningShown) {
     args.setTrackerNotReadyWarningShown(true);
     maybeShowOverlayLoadingOsd();
   }
 
-  if (args.isWindowsPlatform) {
-    clearPendingWindowsOverlayReveal(mainWindow);
-    setOverlayWindowOpacity(mainWindow, 0);
-  }
   mainWindow.hide();
   args.syncOverlayShortcuts();
 }

src/core/services/overlay-window-config.test.ts

@@ -8,31 +8,7 @@ test('overlay window config explicitly disables renderer sandbox for preload com
     yomitanSession: null,
   });
 
-  assert.equal(options.backgroundColor, '#00000000');
   assert.equal(options.webPreferences?.sandbox, false);
-  assert.equal(options.webPreferences?.backgroundThrottling, false);
-});
-
-test('Windows visible overlay window config does not start as always-on-top', () => {
-  const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform');
-
-  Object.defineProperty(process, 'platform', {
-    configurable: true,
-    value: 'win32',
-  });
-
-  try {
-    const options = buildOverlayWindowOptions('visible', {
-      isDev: false,
-      yomitanSession: null,
-    });
-
-    assert.equal(options.alwaysOnTop, false);
-  } finally {
-    if (originalPlatformDescriptor) {
-      Object.defineProperty(process, 'platform', originalPlatformDescriptor);
-    }
-  }
 });
 
 test('overlay window config uses the provided Yomitan session when available', () => {

src/core/services/overlay-window-flags.ts

@@ -1 +0,0 @@
-export const OVERLAY_WINDOW_CONTENT_READY_FLAG = '__subminerOverlayContentReady';

src/core/services/overlay-window-input.ts

@@ -66,14 +66,7 @@ export function handleOverlayWindowBlurred(options: {
   isOverlayVisible: (kind: OverlayWindowKind) => boolean;
   ensureOverlayWindowLevel: () => void;
   moveWindowTop: () => void;
-  onWindowsVisibleOverlayBlur?: () => void;
-  platform?: NodeJS.Platform;
 }): boolean {
-  if ((options.platform ?? process.platform) === 'win32' && options.kind === 'visible') {
-    options.onWindowsVisibleOverlayBlur?.();
-    return false;
-  }
-
   if (options.kind === 'visible' && !options.isOverlayVisible(options.kind)) {
     return false;
   }

src/core/services/overlay-window-options.ts

@@ -10,7 +10,6 @@ export function buildOverlayWindowOptions(
   },
 ): BrowserWindowConstructorOptions {
   const showNativeDebugFrame = process.platform === 'win32' && options.isDev;
-  const shouldStartAlwaysOnTop = !(process.platform === 'win32' && kind === 'visible');
 
   return {
     show: false,
@@ -19,9 +18,8 @@ export function buildOverlayWindowOptions(
     x: 0,
     y: 0,
     transparent: true,
-    backgroundColor: '#00000000',
     frame: false,
-    alwaysOnTop: shouldStartAlwaysOnTop,
+    alwaysOnTop: true,
     skipTaskbar: true,
     resizable: false,
     hasShadow: false,
@@ -33,7 +31,6 @@ export function buildOverlayWindowOptions(
       contextIsolation: true,
       nodeIntegration: false,
       sandbox: false,
-      backgroundThrottling: false,
       webSecurity: true,
       session: options.yomitanSession ?? undefined,
       additionalArguments: [`--overlay-layer=${kind}`],

src/core/services/overlay-window.test.ts

@@ -103,49 +103,6 @@ test('handleOverlayWindowBlurred skips visible overlay restacking after manual h
   assert.deepEqual(calls, []);
 });
 
-test('handleOverlayWindowBlurred skips Windows visible overlay restacking after focus loss', () => {
-  const calls: string[] = [];
-
-  const handled = handleOverlayWindowBlurred({
-    kind: 'visible',
-    windowVisible: true,
-    isOverlayVisible: () => true,
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    moveWindowTop: () => {
-      calls.push('move-top');
-    },
-    platform: 'win32',
-  });
-
-  assert.equal(handled, false);
-  assert.deepEqual(calls, []);
-});
-
-test('handleOverlayWindowBlurred notifies Windows visible overlay blur callback without restacking', () => {
-  const calls: string[] = [];
-
-  const handled = handleOverlayWindowBlurred({
-    kind: 'visible',
-    windowVisible: true,
-    isOverlayVisible: () => true,
-    ensureOverlayWindowLevel: () => {
-      calls.push('ensure-level');
-    },
-    moveWindowTop: () => {
-      calls.push('move-top');
-    },
-    onWindowsVisibleOverlayBlur: () => {
-      calls.push('windows-visible-blur');
-    },
-    platform: 'win32',
-  });
-
-  assert.equal(handled, false);
-  assert.deepEqual(calls, ['windows-visible-blur']);
-});
-
 test('handleOverlayWindowBlurred preserves active visible/modal window stacking', () => {
   const calls: string[] = [];
 
@@ -160,7 +117,6 @@ test('handleOverlayWindowBlurred preserves active visible/modal window stacking'
       moveWindowTop: () => {
         calls.push('move-visible');
       },
-      platform: 'linux',
     }),
     true,
   );

src/core/services/overlay-window.ts

@@ -10,24 +10,9 @@ import {
 } from './overlay-window-input';
 import { buildOverlayWindowOptions } from './overlay-window-options';
 import { normalizeOverlayWindowBoundsForPlatform } from './overlay-window-bounds';
-import { OVERLAY_WINDOW_CONTENT_READY_FLAG } from './overlay-window-flags';
-export { OVERLAY_WINDOW_CONTENT_READY_FLAG } from './overlay-window-flags';
 
 const logger = createLogger('main:overlay-window');
 const overlayWindowLayerByInstance = new WeakMap<BrowserWindow, OverlayWindowKind>();
-const overlayWindowContentReady = new WeakSet<BrowserWindow>();
-
-export function isOverlayWindowContentReady(window: BrowserWindow): boolean {
-  if (window.isDestroyed()) {
-    return false;
-  }
-  return (
-    overlayWindowContentReady.has(window) ||
-    (window as BrowserWindow & { [OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean })[
-      OVERLAY_WINDOW_CONTENT_READY_FLAG
-    ] === true
-  );
-}
 
 function getOverlayWindowHtmlPath(): string {
   return path.join(__dirname, '..', '..', 'renderer', 'index.html');
@@ -91,20 +76,13 @@ export function createOverlayWindow(
     isOverlayVisible: (kind: OverlayWindowKind) => boolean;
     tryHandleOverlayShortcutLocalFallback: (input: Electron.Input) => boolean;
     forwardTabToMpv: () => void;
-    onVisibleWindowBlurred?: () => void;
-    onWindowContentReady?: () => void;
     onWindowClosed: (kind: OverlayWindowKind) => void;
     yomitanSession?: Session | null;
   },
 ): BrowserWindow {
   const window = new BrowserWindow(buildOverlayWindowOptions(kind, options));
-  (window as BrowserWindow & { [OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean })[
-    OVERLAY_WINDOW_CONTENT_READY_FLAG
-  ] = false;
 
-  if (!(process.platform === 'win32' && kind === 'visible')) {
-    options.ensureOverlayWindowLevel(window);
-  }
+  options.ensureOverlayWindowLevel(window);
   loadOverlayWindowLayer(window, kind);
 
   window.webContents.on('did-fail-load', (_event, errorCode, errorDescription, validatedURL) => {
@@ -115,14 +93,6 @@ export function createOverlayWindow(
     options.onRuntimeOptionsChanged();
   });
 
-  window.once('ready-to-show', () => {
-    overlayWindowContentReady.add(window);
-    (window as BrowserWindow & { [OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean })[
-      OVERLAY_WINDOW_CONTENT_READY_FLAG
-    ] = true;
-    options.onWindowContentReady?.();
-  });
-
   if (kind === 'visible') {
     window.webContents.on('devtools-opened', () => {
       options.setOverlayDebugVisualizationEnabled(true);
@@ -166,8 +136,6 @@ export function createOverlayWindow(
       moveWindowTop: () => {
         window.moveTop();
       },
-      onWindowsVisibleOverlayBlur:
-        kind === 'visible' ? () => options.onVisibleWindowBlurred?.() : undefined,
     });
   });
 

src/core/services/session-actions.ts

@@ -1,131 +0,0 @@
-import type { RuntimeOptionApplyResult, RuntimeOptionId } from '../../types';
-import type { SessionActionId } from '../../types/session-bindings';
-import type { SessionActionDispatchRequest } from '../../types/runtime';
-
-export interface SessionActionExecutorDeps {
-  toggleStatsOverlay: () => void;
-  toggleVisibleOverlay: () => void;
-  copyCurrentSubtitle: () => void;
-  copySubtitleCount: (count: number) => void;
-  updateLastCardFromClipboard: () => Promise<void>;
-  triggerFieldGrouping: () => Promise<void>;
-  triggerSubsyncFromConfig: () => Promise<void>;
-  mineSentenceCard: () => Promise<void>;
-  mineSentenceCount: (count: number) => void;
-  toggleSecondarySub: () => void;
-  toggleSubtitleSidebar: () => void;
-  markLastCardAsAudioCard: () => Promise<void>;
-  openRuntimeOptionsPalette: () => void;
-  openSessionHelp: () => void;
-  openControllerSelect: () => void;
-  openControllerDebug: () => void;
-  openJimaku: () => void;
-  openYoutubeTrackPicker: () => void | Promise<void>;
-  openPlaylistBrowser: () => boolean | void | Promise<boolean | void>;
-  replayCurrentSubtitle: () => void;
-  playNextSubtitle: () => void;
-  shiftSubDelayToAdjacentSubtitle: (direction: 'next' | 'previous') => Promise<void>;
-  cycleRuntimeOption: (id: RuntimeOptionId, direction: 1 | -1) => RuntimeOptionApplyResult;
-  showMpvOsd: (text: string) => void;
-}
-
-function resolveCount(count: number | undefined): number {
-  const normalized = typeof count === 'number' && Number.isInteger(count) ? count : 1;
-  return Math.min(9, Math.max(1, normalized));
-}
-
-function assertUnreachableSessionAction(actionId: never): never {
-  throw new Error(`Unhandled session action: ${String(actionId)}`);
-}
-
-export async function dispatchSessionAction(
-  request: SessionActionDispatchRequest,
-  deps: SessionActionExecutorDeps,
-): Promise<void> {
-  switch (request.actionId) {
-    case 'toggleStatsOverlay':
-      deps.toggleStatsOverlay();
-      return;
-    case 'toggleVisibleOverlay':
-      deps.toggleVisibleOverlay();
-      return;
-    case 'copySubtitle':
-      deps.copyCurrentSubtitle();
-      return;
-    case 'copySubtitleMultiple':
-      deps.copySubtitleCount(resolveCount(request.payload?.count));
-      return;
-    case 'updateLastCardFromClipboard':
-      await deps.updateLastCardFromClipboard();
-      return;
-    case 'triggerFieldGrouping':
-      await deps.triggerFieldGrouping();
-      return;
-    case 'triggerSubsync':
-      await deps.triggerSubsyncFromConfig();
-      return;
-    case 'mineSentence':
-      await deps.mineSentenceCard();
-      return;
-    case 'mineSentenceMultiple':
-      deps.mineSentenceCount(resolveCount(request.payload?.count));
-      return;
-    case 'toggleSecondarySub':
-      deps.toggleSecondarySub();
-      return;
-    case 'toggleSubtitleSidebar':
-      deps.toggleSubtitleSidebar();
-      return;
-    case 'markAudioCard':
-      await deps.markLastCardAsAudioCard();
-      return;
-    case 'openRuntimeOptions':
-      deps.openRuntimeOptionsPalette();
-      return;
-    case 'openSessionHelp':
-      deps.openSessionHelp();
-      return;
-    case 'openControllerSelect':
-      deps.openControllerSelect();
-      return;
-    case 'openControllerDebug':
-      deps.openControllerDebug();
-      return;
-    case 'openJimaku':
-      deps.openJimaku();
-      return;
-    case 'openYoutubePicker':
-      await deps.openYoutubeTrackPicker();
-      return;
-    case 'openPlaylistBrowser':
-      await deps.openPlaylistBrowser();
-      return;
-    case 'replayCurrentSubtitle':
-      deps.replayCurrentSubtitle();
-      return;
-    case 'playNextSubtitle':
-      deps.playNextSubtitle();
-      return;
-    case 'shiftSubDelayPrevLine':
-      await deps.shiftSubDelayToAdjacentSubtitle('previous');
-      return;
-    case 'shiftSubDelayNextLine':
-      await deps.shiftSubDelayToAdjacentSubtitle('next');
-      return;
-    case 'cycleRuntimeOption': {
-      const runtimeOptionId = request.payload?.runtimeOptionId as RuntimeOptionId | undefined;
-      if (!runtimeOptionId) {
-        deps.showMpvOsd('Runtime option id is required.');
-        return;
-      }
-      const direction = request.payload?.direction === -1 ? -1 : 1;
-      const result = deps.cycleRuntimeOption(runtimeOptionId, direction);
-      if (!result.ok && result.error) {
-        deps.showMpvOsd(result.error);
-      }
-      return;
-    }
-    default:
-      return assertUnreachableSessionAction(request.actionId);
-  }
-}

src/core/services/session-bindings.test.ts

@@ -1,311 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import type { Keybinding } from '../../types';
-import type { ConfiguredShortcuts } from '../utils/shortcut-config';
-import { SPECIAL_COMMANDS } from '../../config/definitions';
-import { compileSessionBindings } from './session-bindings';
-
-function createShortcuts(overrides: Partial<ConfiguredShortcuts> = {}): ConfiguredShortcuts {
-  return {
-    toggleVisibleOverlayGlobal: null,
-    copySubtitle: null,
-    copySubtitleMultiple: null,
-    updateLastCardFromClipboard: null,
-    triggerFieldGrouping: null,
-    triggerSubsync: null,
-    mineSentence: null,
-    mineSentenceMultiple: null,
-    multiCopyTimeoutMs: 2500,
-    toggleSecondarySub: null,
-    markAudioCard: null,
-    openRuntimeOptions: null,
-    openJimaku: null,
-    openSessionHelp: null,
-    openControllerSelect: null,
-    openControllerDebug: null,
-    toggleSubtitleSidebar: null,
-    ...overrides,
-  };
-}
-
-function createKeybinding(key: string, command: Keybinding['command']): Keybinding {
-  return { key, command };
-}
-
-test('compileSessionBindings merges shortcuts and keybindings into one canonical list', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts({
-      toggleVisibleOverlayGlobal: 'Alt+Shift+O',
-      openJimaku: 'Ctrl+Shift+J',
-      openControllerSelect: 'Alt+C',
-    }),
-    keybindings: [
-      createKeybinding('KeyF', ['cycle', 'fullscreen']),
-      createKeybinding('Ctrl+Shift+Y', [SPECIAL_COMMANDS.YOUTUBE_PICKER_OPEN]),
-    ],
-    platform: 'linux',
-  });
-
-  assert.equal(result.warnings.length, 0);
-  assert.deepEqual(
-    result.bindings.map((binding) => ({
-      actionType: binding.actionType,
-      sourcePath: binding.sourcePath,
-      code: binding.key.code,
-      modifiers: binding.key.modifiers,
-      target:
-        binding.actionType === 'session-action' ? binding.actionId : binding.command.join(' '),
-    })),
-    [
-      {
-        actionType: 'mpv-command',
-        sourcePath: 'keybindings[0].key',
-        code: 'KeyF',
-        modifiers: [],
-        target: 'cycle fullscreen',
-      },
-      {
-        actionType: 'session-action',
-        sourcePath: 'keybindings[1].key',
-        code: 'KeyY',
-        modifiers: ['ctrl', 'shift'],
-        target: 'openYoutubePicker',
-      },
-      {
-        actionType: 'session-action',
-        sourcePath: 'shortcuts.openControllerSelect',
-        code: 'KeyC',
-        modifiers: ['alt'],
-        target: 'openControllerSelect',
-      },
-      {
-        actionType: 'session-action',
-        sourcePath: 'shortcuts.openJimaku',
-        code: 'KeyJ',
-        modifiers: ['ctrl', 'shift'],
-        target: 'openJimaku',
-      },
-      {
-        actionType: 'session-action',
-        sourcePath: 'shortcuts.toggleVisibleOverlayGlobal',
-        code: 'KeyO',
-        modifiers: ['alt', 'shift'],
-        target: 'toggleVisibleOverlay',
-      },
-    ],
-  );
-});
-
-test('compileSessionBindings resolves CommandOrControl per platform', () => {
-  const input = {
-    shortcuts: createShortcuts({
-      toggleVisibleOverlayGlobal: 'CommandOrControl+Shift+O',
-    }),
-    keybindings: [],
-  };
-
-  const windows = compileSessionBindings({ ...input, platform: 'win32' });
-  const mac = compileSessionBindings({ ...input, platform: 'darwin' });
-
-  assert.deepEqual(windows.bindings[0]?.key.modifiers, ['ctrl', 'shift']);
-  assert.deepEqual(mac.bindings[0]?.key.modifiers, ['shift', 'meta']);
-});
-
-test('compileSessionBindings resolves CommandOrControl in DOM key strings per platform', () => {
-  const input = {
-    shortcuts: createShortcuts(),
-    keybindings: [createKeybinding('CommandOrControl+Shift+J', ['cycle', 'fullscreen'])],
-    statsToggleKey: 'CommandOrControl+Backquote',
-  };
-
-  const windows = compileSessionBindings({ ...input, platform: 'win32' });
-  const mac = compileSessionBindings({ ...input, platform: 'darwin' });
-
-  assert.deepEqual(
-    windows.bindings
-      .map((binding) => ({
-        sourcePath: binding.sourcePath,
-        modifiers: binding.key.modifiers,
-      }))
-      .sort((left, right) => left.sourcePath.localeCompare(right.sourcePath)),
-    [
-      {
-        sourcePath: 'keybindings[0].key',
-        modifiers: ['ctrl', 'shift'],
-      },
-      {
-        sourcePath: 'stats.toggleKey',
-        modifiers: ['ctrl'],
-      },
-    ],
-  );
-
-  assert.deepEqual(
-    mac.bindings
-      .map((binding) => ({
-        sourcePath: binding.sourcePath,
-        modifiers: binding.key.modifiers,
-      }))
-      .sort((left, right) => left.sourcePath.localeCompare(right.sourcePath)),
-    [
-      {
-        sourcePath: 'keybindings[0].key',
-        modifiers: ['shift', 'meta'],
-      },
-      {
-        sourcePath: 'stats.toggleKey',
-        modifiers: ['meta'],
-      },
-    ],
-  );
-});
-
-test('compileSessionBindings drops conflicting bindings that canonicalize to the same key', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts({
-      openJimaku: 'Ctrl+Shift+J',
-    }),
-    keybindings: [createKeybinding('Ctrl+Shift+J', [SPECIAL_COMMANDS.PLAYLIST_BROWSER_OPEN])],
-    platform: 'linux',
-  });
-
-  assert.deepEqual(result.bindings, []);
-  assert.equal(result.warnings.length, 1);
-  assert.equal(result.warnings[0]?.kind, 'conflict');
-  assert.deepEqual(result.warnings[0]?.conflictingPaths, [
-    'shortcuts.openJimaku',
-    'keybindings[0].key',
-  ]);
-});
-
-test('compileSessionBindings omits disabled bindings', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts({
-      openJimaku: null,
-      toggleVisibleOverlayGlobal: 'Alt+Shift+O',
-    }),
-    keybindings: [createKeybinding('Ctrl+Shift+J', null)],
-    platform: 'linux',
-  });
-
-  assert.equal(result.warnings.length, 0);
-  assert.deepEqual(
-    result.bindings.map((binding) => binding.sourcePath),
-    ['shortcuts.toggleVisibleOverlayGlobal'],
-  );
-});
-
-test('compileSessionBindings warns on unsupported shortcut and keybinding syntax', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts({
-      openJimaku: 'Hyper+J',
-    }),
-    keybindings: [createKeybinding('Ctrl+ß', ['cycle', 'fullscreen'])],
-    platform: 'linux',
-  });
-
-  assert.deepEqual(result.bindings, []);
-  assert.deepEqual(
-    result.warnings.map((warning) => `${warning.kind}:${warning.path}`),
-    ['unsupported:shortcuts.openJimaku', 'unsupported:keybindings[0].key'],
-  );
-});
-
-test('compileSessionBindings rejects malformed command arrays', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts(),
-    keybindings: [
-      createKeybinding('Ctrl+J', ['show-text', 3000]),
-      createKeybinding('Ctrl+K', ['show-text', { bad: true } as never] as never),
-    ],
-    platform: 'linux',
-  });
-
-  assert.deepEqual(
-    result.bindings.map((binding) => binding.sourcePath),
-    ['keybindings[0].key'],
-  );
-  assert.equal(result.bindings[0]?.actionType, 'mpv-command');
-  assert.deepEqual(result.bindings[0]?.command, ['show-text', 3000]);
-  assert.deepEqual(
-    result.warnings.map((warning) => `${warning.kind}:${warning.path}`),
-    ['unsupported:keybindings[1].command'],
-  );
-});
-
-test('compileSessionBindings rejects non-string command heads and extra args on special commands', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts(),
-    keybindings: [
-      createKeybinding('Ctrl+J', [42] as never),
-      createKeybinding('Ctrl+K', [SPECIAL_COMMANDS.JIMAKU_OPEN, 'extra'] as never),
-    ],
-    platform: 'linux',
-  });
-
-  assert.deepEqual(result.bindings, []);
-  assert.deepEqual(
-    result.warnings.map((warning) => `${warning.kind}:${warning.path}`),
-    ['unsupported:keybindings[0].command', 'unsupported:keybindings[1].command'],
-  );
-});
-
-test('compileSessionBindings points unsupported command warnings at the command field', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts(),
-    keybindings: [createKeybinding('Ctrl+K', [SPECIAL_COMMANDS.JIMAKU_OPEN, 'extra'] as never)],
-    platform: 'linux',
-  });
-
-  assert.deepEqual(result.bindings, []);
-  assert.deepEqual(
-    result.warnings.map((warning) => `${warning.kind}:${warning.path}`),
-    ['unsupported:keybindings[0].command'],
-  );
-});
-
-test('compileSessionBindings warns on deprecated toggleVisibleOverlayGlobal config', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts(),
-    keybindings: [],
-    platform: 'linux',
-    rawConfig: {
-      shortcuts: {
-        toggleVisibleOverlayGlobal: 'Alt+Shift+O',
-      },
-    } as never,
-  });
-
-  assert.equal(result.bindings.length, 0);
-  assert.deepEqual(result.warnings, [
-    {
-      kind: 'deprecated-config',
-      path: 'shortcuts.toggleVisibleOverlayGlobal',
-      value: 'Alt+Shift+O',
-      message: 'Rename shortcuts.toggleVisibleOverlayGlobal to shortcuts.toggleVisibleOverlay.',
-    },
-  ]);
-});
-
-test('compileSessionBindings includes stats toggle in the shared session binding artifact', () => {
-  const result = compileSessionBindings({
-    shortcuts: createShortcuts(),
-    keybindings: [],
-    statsToggleKey: 'Backquote',
-    platform: 'win32',
-  });
-
-  assert.equal(result.warnings.length, 0);
-  assert.deepEqual(result.bindings, [
-    {
-      sourcePath: 'stats.toggleKey',
-      originalKey: 'Backquote',
-      key: {
-        code: 'Backquote',
-        modifiers: [],
-      },
-      actionType: 'session-action',
-      actionId: 'toggleStatsOverlay',
-    },
-  ]);
-});

src/core/services/session-bindings.ts

@@ -1,491 +0,0 @@
-import type { Keybinding, ResolvedConfig } from '../../types';
-import type { ConfiguredShortcuts } from '../utils/shortcut-config';
-import type {
-  CompiledMpvCommandBinding,
-  CompiledSessionActionBinding,
-  CompiledSessionBinding,
-  PluginSessionBindingsArtifact,
-  SessionActionId,
-  SessionBindingWarning,
-  SessionKeyModifier,
-  SessionKeySpec,
-} from '../../types/session-bindings';
-import { SPECIAL_COMMANDS } from '../../config';
-
-type PlatformKeyModel = 'darwin' | 'win32' | 'linux';
-
-type CompileSessionBindingsInput = {
-  keybindings: Keybinding[];
-  shortcuts: ConfiguredShortcuts;
-  statsToggleKey?: string | null;
-  platform: PlatformKeyModel;
-  rawConfig?: ResolvedConfig | null;
-};
-
-type DraftBinding = {
-  binding: CompiledSessionBinding;
-  actionFingerprint: string;
-};
-
-const MODIFIER_ORDER: SessionKeyModifier[] = ['ctrl', 'alt', 'shift', 'meta'];
-
-const SESSION_SHORTCUT_ACTIONS: Array<{
-  key: keyof Omit<ConfiguredShortcuts, 'multiCopyTimeoutMs'>;
-  actionId: SessionActionId;
-}> = [
-  { key: 'toggleVisibleOverlayGlobal', actionId: 'toggleVisibleOverlay' },
-  { key: 'copySubtitle', actionId: 'copySubtitle' },
-  { key: 'copySubtitleMultiple', actionId: 'copySubtitleMultiple' },
-  { key: 'updateLastCardFromClipboard', actionId: 'updateLastCardFromClipboard' },
-  { key: 'triggerFieldGrouping', actionId: 'triggerFieldGrouping' },
-  { key: 'triggerSubsync', actionId: 'triggerSubsync' },
-  { key: 'mineSentence', actionId: 'mineSentence' },
-  { key: 'mineSentenceMultiple', actionId: 'mineSentenceMultiple' },
-  { key: 'toggleSecondarySub', actionId: 'toggleSecondarySub' },
-  { key: 'markAudioCard', actionId: 'markAudioCard' },
-  { key: 'openRuntimeOptions', actionId: 'openRuntimeOptions' },
-  { key: 'openJimaku', actionId: 'openJimaku' },
-  { key: 'openSessionHelp', actionId: 'openSessionHelp' },
-  { key: 'openControllerSelect', actionId: 'openControllerSelect' },
-  { key: 'openControllerDebug', actionId: 'openControllerDebug' },
-  { key: 'toggleSubtitleSidebar', actionId: 'toggleSubtitleSidebar' },
-];
-
-function normalizeModifiers(modifiers: SessionKeyModifier[]): SessionKeyModifier[] {
-  return [...new Set(modifiers)].sort(
-    (left, right) => MODIFIER_ORDER.indexOf(left) - MODIFIER_ORDER.indexOf(right),
-  );
-}
-
-function isValidCommandEntry(value: unknown): value is string | number {
-  return typeof value === 'string' || typeof value === 'number';
-}
-
-function normalizeCodeToken(token: string): string | null {
-  const normalized = token.trim();
-  if (!normalized) return null;
-  if (/^[a-z]$/i.test(normalized)) {
-    return `Key${normalized.toUpperCase()}`;
-  }
-  if (/^[0-9]$/.test(normalized)) {
-    return `Digit${normalized}`;
-  }
-
-  const exactMap: Record<string, string> = {
-    space: 'Space',
-    tab: 'Tab',
-    enter: 'Enter',
-    return: 'Enter',
-    esc: 'Escape',
-    escape: 'Escape',
-    up: 'ArrowUp',
-    down: 'ArrowDown',
-    left: 'ArrowLeft',
-    right: 'ArrowRight',
-    backspace: 'Backspace',
-    delete: 'Delete',
-    slash: 'Slash',
-    backslash: 'Backslash',
-    minus: 'Minus',
-    plus: 'Equal',
-    equal: 'Equal',
-    comma: 'Comma',
-    period: 'Period',
-    quote: 'Quote',
-    semicolon: 'Semicolon',
-    bracketleft: 'BracketLeft',
-    bracketright: 'BracketRight',
-    backquote: 'Backquote',
-  };
-  const lower = normalized.toLowerCase();
-  if (exactMap[lower]) return exactMap[lower];
-  if (
-    /^key[a-z]$/i.test(normalized) ||
-    /^digit[0-9]$/i.test(normalized) ||
-    /^arrow(?:up|down|left|right)$/i.test(normalized) ||
-    /^f\d{1,2}$/i.test(normalized)
-  ) {
-    const keyMatch = normalized.match(/^key([a-z])$/i);
-    if (keyMatch) {
-      return `Key${keyMatch[1]!.toUpperCase()}`;
-    }
-
-    const digitMatch = normalized.match(/^digit([0-9])$/i);
-    if (digitMatch) {
-      return `Digit${digitMatch[1]}`;
-    }
-
-    const arrowMatch = normalized.match(/^arrow(up|down|left|right)$/i);
-    if (arrowMatch) {
-      const direction = arrowMatch[1]!;
-      return `Arrow${direction[0]!.toUpperCase()}${direction.slice(1).toLowerCase()}`;
-    }
-
-    const functionKeyMatch = normalized.match(/^f(\d{1,2})$/i);
-    if (functionKeyMatch) {
-      return `F${functionKeyMatch[1]}`;
-    }
-  }
-  return null;
-}
-
-function parseAccelerator(
-  accelerator: string,
-  platform: PlatformKeyModel,
-): { key: SessionKeySpec | null; message?: string } {
-  const normalized = accelerator.replace(/\s+/g, '').replace(/cmdorctrl/gi, 'CommandOrControl');
-  if (!normalized) {
-    return { key: null, message: 'Empty accelerator is not supported.' };
-  }
-
-  const parts = normalized.split('+').filter(Boolean);
-  const keyToken = parts.pop();
-  if (!keyToken) {
-    return { key: null, message: 'Missing accelerator key token.' };
-  }
-
-  const modifiers: SessionKeyModifier[] = [];
-  for (const modifier of parts) {
-    const lower = modifier.toLowerCase();
-    if (lower === 'ctrl' || lower === 'control') {
-      modifiers.push('ctrl');
-      continue;
-    }
-    if (lower === 'alt' || lower === 'option') {
-      modifiers.push('alt');
-      continue;
-    }
-    if (lower === 'shift') {
-      modifiers.push('shift');
-      continue;
-    }
-    if (lower === 'meta' || lower === 'super' || lower === 'command' || lower === 'cmd') {
-      modifiers.push('meta');
-      continue;
-    }
-    if (lower === 'commandorcontrol') {
-      modifiers.push(platform === 'darwin' ? 'meta' : 'ctrl');
-      continue;
-    }
-    return {
-      key: null,
-      message: `Unsupported accelerator modifier: ${modifier}`,
-    };
-  }
-
-  const code = normalizeCodeToken(keyToken);
-  if (!code) {
-    return {
-      key: null,
-      message: `Unsupported accelerator key token: ${keyToken}`,
-    };
-  }
-
-  return {
-    key: {
-      code,
-      modifiers: normalizeModifiers(modifiers),
-    },
-  };
-}
-
-function parseDomKeyString(
-  key: string,
-  platform: PlatformKeyModel,
-): { key: SessionKeySpec | null; message?: string } {
-  const parts = key
-    .split('+')
-    .map((part) => part.trim())
-    .filter(Boolean);
-  const keyToken = parts.pop();
-  if (!keyToken) {
-    return { key: null, message: 'Missing keybinding key token.' };
-  }
-
-  const modifiers: SessionKeyModifier[] = [];
-  for (const modifier of parts) {
-    const lower = modifier.toLowerCase();
-    if (lower === 'ctrl' || lower === 'control') {
-      modifiers.push('ctrl');
-      continue;
-    }
-    if (lower === 'alt' || lower === 'option') {
-      modifiers.push('alt');
-      continue;
-    }
-    if (lower === 'shift') {
-      modifiers.push('shift');
-      continue;
-    }
-    if (
-      lower === 'meta' ||
-      lower === 'super' ||
-      lower === 'command' ||
-      lower === 'cmd' ||
-      lower === 'commandorcontrol'
-    ) {
-      modifiers.push(
-        lower === 'commandorcontrol' ? (platform === 'darwin' ? 'meta' : 'ctrl') : 'meta',
-      );
-      continue;
-    }
-    return {
-      key: null,
-      message: `Unsupported keybinding modifier: ${modifier}`,
-    };
-  }
-
-  const code = normalizeCodeToken(keyToken);
-  if (!code) {
-    return {
-      key: null,
-      message: `Unsupported keybinding token: ${keyToken}`,
-    };
-  }
-
-  return {
-    key: {
-      code,
-      modifiers: normalizeModifiers(modifiers),
-    },
-  };
-}
-
-export function getSessionKeySpecSignature(key: SessionKeySpec): string {
-  return [...key.modifiers, key.code].join('+');
-}
-
-function resolveCommandBinding(
-  binding: Keybinding,
-):
-  | Omit<CompiledMpvCommandBinding, 'key' | 'sourcePath' | 'originalKey'>
-  | Omit<CompiledSessionActionBinding, 'key' | 'sourcePath' | 'originalKey'>
-  | null {
-  const command = binding.command;
-  if (!Array.isArray(command) || command.length === 0 || !command.every(isValidCommandEntry)) {
-    return null;
-  }
-
-  const first = command[0];
-  if (typeof first !== 'string') {
-    return null;
-  }
-
-  if (first === SPECIAL_COMMANDS.SUBSYNC_TRIGGER) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'triggerSubsync' };
-  }
-  if (first === SPECIAL_COMMANDS.RUNTIME_OPTIONS_OPEN) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'openRuntimeOptions' };
-  }
-  if (first === SPECIAL_COMMANDS.JIMAKU_OPEN) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'openJimaku' };
-  }
-  if (first === SPECIAL_COMMANDS.YOUTUBE_PICKER_OPEN) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'openYoutubePicker' };
-  }
-  if (first === SPECIAL_COMMANDS.PLAYLIST_BROWSER_OPEN) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'openPlaylistBrowser' };
-  }
-  if (first === SPECIAL_COMMANDS.REPLAY_SUBTITLE) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'replayCurrentSubtitle' };
-  }
-  if (first === SPECIAL_COMMANDS.PLAY_NEXT_SUBTITLE) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'playNextSubtitle' };
-  }
-  if (first === SPECIAL_COMMANDS.SHIFT_SUB_DELAY_TO_PREVIOUS_SUBTITLE_START) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'shiftSubDelayPrevLine' };
-  }
-  if (first === SPECIAL_COMMANDS.SHIFT_SUB_DELAY_TO_NEXT_SUBTITLE_START) {
-    if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'shiftSubDelayNextLine' };
-  }
-  if (first.startsWith(SPECIAL_COMMANDS.RUNTIME_OPTION_CYCLE_PREFIX)) {
-    if (command.length !== 1) {
-      return null;
-    }
-    const parts = first.split(':');
-    if (parts.length !== 3) {
-      return null;
-    }
-    const [, runtimeOptionId, rawDirection] = parts;
-    if (!runtimeOptionId || (rawDirection !== 'prev' && rawDirection !== 'next')) {
-      return null;
-    }
-    return {
-      actionType: 'session-action',
-      actionId: 'cycleRuntimeOption',
-      payload: {
-        runtimeOptionId,
-        direction: rawDirection === 'prev' ? -1 : 1,
-      },
-    };
-  }
-
-  return {
-    actionType: 'mpv-command',
-    command,
-  };
-}
-
-function getBindingFingerprint(binding: CompiledSessionBinding): string {
-  if (binding.actionType === 'mpv-command') {
-    return `mpv:${JSON.stringify(binding.command)}`;
-  }
-  return `session:${binding.actionId}:${JSON.stringify(binding.payload ?? null)}`;
-}
-
-export function compileSessionBindings(input: CompileSessionBindingsInput): {
-  bindings: CompiledSessionBinding[];
-  warnings: SessionBindingWarning[];
-} {
-  const warnings: SessionBindingWarning[] = [];
-  const candidates = new Map<string, DraftBinding[]>();
-  const legacyToggleVisibleOverlayGlobal = (
-    input.rawConfig?.shortcuts as Record<string, unknown> | undefined
-  )?.toggleVisibleOverlayGlobal;
-  const statsToggleKey = input.statsToggleKey ?? input.rawConfig?.stats?.toggleKey ?? null;
-
-  if (legacyToggleVisibleOverlayGlobal !== undefined) {
-    warnings.push({
-      kind: 'deprecated-config',
-      path: 'shortcuts.toggleVisibleOverlayGlobal',
-      value: legacyToggleVisibleOverlayGlobal,
-      message: 'Rename shortcuts.toggleVisibleOverlayGlobal to shortcuts.toggleVisibleOverlay.',
-    });
-  }
-
-  for (const shortcut of SESSION_SHORTCUT_ACTIONS) {
-    const accelerator = input.shortcuts[shortcut.key];
-    if (!accelerator) continue;
-    const parsed = parseAccelerator(accelerator, input.platform);
-    if (!parsed.key) {
-      warnings.push({
-        kind: 'unsupported',
-        path: `shortcuts.${shortcut.key}`,
-        value: accelerator,
-        message: parsed.message ?? 'Unsupported accelerator syntax.',
-      });
-      continue;
-    }
-    const binding: CompiledSessionActionBinding = {
-      sourcePath: `shortcuts.${shortcut.key}`,
-      originalKey: accelerator,
-      key: parsed.key,
-      actionType: 'session-action',
-      actionId: shortcut.actionId,
-    };
-    const signature = getSessionKeySpecSignature(parsed.key);
-    const draft = candidates.get(signature) ?? [];
-    draft.push({
-      binding,
-      actionFingerprint: getBindingFingerprint(binding),
-    });
-    candidates.set(signature, draft);
-  }
-
-  if (statsToggleKey) {
-    const parsed = parseDomKeyString(statsToggleKey, input.platform);
-    if (!parsed.key) {
-      warnings.push({
-        kind: 'unsupported',
-        path: 'stats.toggleKey',
-        value: statsToggleKey,
-        message: parsed.message ?? 'Unsupported stats toggle key syntax.',
-      });
-    } else {
-      const binding: CompiledSessionActionBinding = {
-        sourcePath: 'stats.toggleKey',
-        originalKey: statsToggleKey,
-        key: parsed.key,
-        actionType: 'session-action',
-        actionId: 'toggleStatsOverlay',
-      };
-      const signature = getSessionKeySpecSignature(parsed.key);
-      const draft = candidates.get(signature) ?? [];
-      draft.push({
-        binding,
-        actionFingerprint: getBindingFingerprint(binding),
-      });
-      candidates.set(signature, draft);
-    }
-  }
-
-  input.keybindings.forEach((binding, index) => {
-    if (!binding.command) return;
-    const parsed = parseDomKeyString(binding.key, input.platform);
-    if (!parsed.key) {
-      warnings.push({
-        kind: 'unsupported',
-        path: `keybindings[${index}].key`,
-        value: binding.key,
-        message: parsed.message ?? 'Unsupported keybinding syntax.',
-      });
-      return;
-    }
-    const resolved = resolveCommandBinding(binding);
-    if (!resolved) {
-      warnings.push({
-        kind: 'unsupported',
-        path: `keybindings[${index}].command`,
-        value: binding.command,
-        message: 'Unsupported keybinding command syntax.',
-      });
-      return;
-    }
-    const compiled: CompiledSessionBinding = {
-      sourcePath: `keybindings[${index}].key`,
-      originalKey: binding.key,
-      key: parsed.key,
-      ...resolved,
-    };
-    const signature = getSessionKeySpecSignature(parsed.key);
-    const draft = candidates.get(signature) ?? [];
-    draft.push({
-      binding: compiled,
-      actionFingerprint: getBindingFingerprint(compiled),
-    });
-    candidates.set(signature, draft);
-  });
-
-  const bindings: CompiledSessionBinding[] = [];
-  for (const [signature, draftBindings] of candidates.entries()) {
-    const uniqueFingerprints = new Set(draftBindings.map((entry) => entry.actionFingerprint));
-    if (uniqueFingerprints.size > 1) {
-      warnings.push({
-        kind: 'conflict',
-        path: draftBindings[0]!.binding.sourcePath,
-        value: signature,
-        conflictingPaths: draftBindings.map((entry) => entry.binding.sourcePath),
-        message: `Conflicting session bindings compile to ${signature}; SubMiner will bind neither action.`,
-      });
-      continue;
-    }
-    bindings.push(draftBindings[0]!.binding);
-  }
-
-  bindings.sort((left, right) => left.sourcePath.localeCompare(right.sourcePath));
-  return { bindings, warnings };
-}
-
-export function buildPluginSessionBindingsArtifact(input: {
-  bindings: CompiledSessionBinding[];
-  warnings: SessionBindingWarning[];
-  numericSelectionTimeoutMs: number;
-  now?: Date;
-}): PluginSessionBindingsArtifact {
-  return {
-    version: 1,
-    generatedAt: (input.now ?? new Date()).toISOString(),
-    numericSelectionTimeoutMs: input.numericSelectionTimeoutMs,
-    bindings: input.bindings,
-    warnings: input.warnings,
-  };
-}

src/core/services/shortcut.ts

@@ -20,6 +20,42 @@ export interface RegisterGlobalShortcutsServiceOptions {
 }
 
 export function registerGlobalShortcuts(options: RegisterGlobalShortcutsServiceOptions): void {
+  const visibleShortcut = options.shortcuts.toggleVisibleOverlayGlobal;
+  const normalizedVisible = visibleShortcut?.replace(/\s+/g, '').toLowerCase();
+  const normalizedJimaku = options.shortcuts.openJimaku?.replace(/\s+/g, '').toLowerCase();
+  const normalizedSettings = 'alt+shift+y';
+
+  if (visibleShortcut) {
+    const toggleVisibleRegistered = globalShortcut.register(visibleShortcut, () => {
+      options.onToggleVisibleOverlay();
+    });
+    if (!toggleVisibleRegistered) {
+      logger.warn(
+        `Failed to register global shortcut toggleVisibleOverlayGlobal: ${visibleShortcut}`,
+      );
+    }
+  }
+
+  if (options.shortcuts.openJimaku && options.onOpenJimaku) {
+    if (
+      normalizedJimaku &&
+      (normalizedJimaku === normalizedVisible || normalizedJimaku === normalizedSettings)
+    ) {
+      logger.warn(
+        'Skipped registering openJimaku because it collides with another global shortcut',
+      );
+    } else {
+      const openJimakuRegistered = globalShortcut.register(options.shortcuts.openJimaku, () => {
+        options.onOpenJimaku?.();
+      });
+      if (!openJimakuRegistered) {
+        logger.warn(
+          `Failed to register global shortcut openJimaku: ${options.shortcuts.openJimaku}`,
+        );
+      }
+    }
+  }
+
   const settingsRegistered = globalShortcut.register('Alt+Shift+Y', () => {
     options.onOpenYomitanSettings();
   });

src/core/services/startup-bootstrap.test.ts

@@ -28,21 +28,7 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
     triggerFieldGrouping: false,
     triggerSubsync: false,
     markAudioCard: false,
-    toggleStatsOverlay: false,
-    toggleSubtitleSidebar: false,
     openRuntimeOptions: false,
-    openSessionHelp: false,
-    openControllerSelect: false,
-    openControllerDebug: false,
-    openJimaku: false,
-    openYoutubePicker: false,
-    openPlaylistBrowser: false,
-    replayCurrentSubtitle: false,
-    playNextSubtitle: false,
-    shiftSubDelayPrevLine: false,
-    shiftSubDelayNextLine: false,
-    cycleRuntimeOptionId: undefined,
-    cycleRuntimeOptionDirection: undefined,
     anilistStatus: false,
     anilistLogout: false,
     anilistSetup: false,

src/core/services/startup.ts

@@ -311,7 +311,7 @@ export async function runAppReadyRuntime(deps: AppReadyRuntimeDeps): Promise<voi
 
   deps.createSubtitleTimingTracker();
   if (deps.createImmersionTracker) {
-    deps.log('Runtime ready: immersion tracker startup requested.');
+    deps.log('Runtime ready: immersion tracker startup deferred until first media activity.');
   } else {
     deps.log('Runtime ready: immersion tracker dependency is missing.');
   }

src/core/services/stats-server.ts

@@ -30,10 +30,8 @@ function parseIntQuery(raw: string | undefined, fallback: number, maxLimit?: num
   return maxLimit === undefined ? parsed : Math.min(parsed, maxLimit);
 }
 
-function parseTrendRange(raw: string | undefined): '7d' | '30d' | '90d' | '365d' | 'all' {
-  return raw === '7d' || raw === '30d' || raw === '90d' || raw === '365d' || raw === 'all'
-    ? raw
-    : '30d';
+function parseTrendRange(raw: string | undefined): '7d' | '30d' | '90d' | 'all' {
+  return raw === '7d' || raw === '30d' || raw === '90d' || raw === 'all' ? raw : '30d';
 }
 
 function parseTrendGroupBy(raw: string | undefined): 'day' | 'month' {

src/core/utils/shortcut-config.ts

@@ -14,10 +14,6 @@ export interface ConfiguredShortcuts {
   markAudioCard: string | null | undefined;
   openRuntimeOptions: string | null | undefined;
   openJimaku: string | null | undefined;
-  openSessionHelp: string | null | undefined;
-  openControllerSelect: string | null | undefined;
-  openControllerDebug: string | null | undefined;
-  toggleSubtitleSidebar: string | null | undefined;
 }
 
 export function resolveConfiguredShortcuts(
@@ -82,17 +78,5 @@ export function resolveConfiguredShortcuts(
     openJimaku: normalizeShortcut(
       config.shortcuts?.openJimaku ?? defaultConfig.shortcuts?.openJimaku,
     ),
-    openSessionHelp: normalizeShortcut(
-      config.shortcuts?.openSessionHelp ?? defaultConfig.shortcuts?.openSessionHelp,
-    ),
-    openControllerSelect: normalizeShortcut(
-      config.shortcuts?.openControllerSelect ?? defaultConfig.shortcuts?.openControllerSelect,
-    ),
-    openControllerDebug: normalizeShortcut(
-      config.shortcuts?.openControllerDebug ?? defaultConfig.shortcuts?.openControllerDebug,
-    ),
-    toggleSubtitleSidebar: normalizeShortcut(
-      config.shortcuts?.toggleSubtitleSidebar ?? defaultConfig.shortcuts?.toggleSubtitleSidebar,
-    ),
   };
 }

src/main.ts

@@ -109,13 +109,11 @@ import * as os from 'os';
 import * as path from 'path';
 import { MecabTokenizer } from './mecab-tokenizer';
 import type {
-  CompiledSessionBinding,
   JimakuApiResponse,
   KikuFieldGroupingChoice,
   MpvSubtitleRenderMetrics,
   ResolvedConfig,
   RuntimeOptionState,
-  SessionActionDispatchRequest,
   SecondarySubMode,
   SubtitleData,
   SubtitlePosition,
@@ -132,14 +130,6 @@ import {
   type LogLevelSource,
 } from './logger';
 import { createWindowTracker as createWindowTrackerCore } from './window-trackers';
-import {
-  bindWindowsOverlayAboveMpv,
-  clearWindowsOverlayOwner,
-  ensureWindowsOverlayTransparency,
-  findWindowsMpvTargetWindowHandle,
-  getWindowsForegroundProcessName,
-  setWindowsOverlayOwner,
-} from './window-trackers/windows-helper';
 import {
   commandNeedsOverlayStartupPrereqs,
   commandNeedsOverlayRuntime,
@@ -352,7 +342,6 @@ import { resolveYoutubePlaybackUrl } from './core/services/youtube/playback-reso
 import { probeYoutubeTracks } from './core/services/youtube/track-probe';
 import { startStatsServer } from './core/services/stats-server';
 import { registerStatsOverlayToggle, destroyStatsWindow } from './core/services/stats-window.js';
-import { toggleStatsOverlay as toggleStatsOverlayWindow } from './core/services/stats-window.js';
 import {
   createFirstRunSetupService,
   getFirstRunSetupCompletionMessage,
@@ -415,11 +404,6 @@ import { createAnilistRateLimiter } from './core/services/anilist/rate-limiter';
 import { createJellyfinTokenStore } from './core/services/jellyfin-token-store';
 import { applyRuntimeOptionResultRuntime } from './core/services/runtime-options-ipc';
 import { createAnilistTokenStore } from './core/services/anilist/anilist-token-store';
-import {
-  buildPluginSessionBindingsArtifact,
-  compileSessionBindings,
-} from './core/services/session-bindings';
-import { dispatchSessionAction as dispatchSessionActionCore } from './core/services/session-actions';
 import { createBuildOverlayShortcutsRuntimeMainDepsHandler } from './main/runtime/domains/shortcuts';
 import { createMainRuntimeRegistry } from './main/runtime/registry';
 import {
@@ -455,14 +439,7 @@ import { handleCliCommandRuntimeServiceWithContext } from './main/cli-runtime';
 import { createOverlayModalRuntimeService } from './main/overlay-runtime';
 import { createOverlayModalInputState } from './main/runtime/overlay-modal-input-state';
 import { openYoutubeTrackPicker } from './main/runtime/youtube-picker-open';
-import { openRuntimeOptionsModal as openRuntimeOptionsModalRuntime } from './main/runtime/runtime-options-open';
-import { openJimakuModal as openJimakuModalRuntime } from './main/runtime/jimaku-open';
-import { openSessionHelpModal as openSessionHelpModalRuntime } from './main/runtime/session-help-open';
-import { openControllerSelectModal as openControllerSelectModalRuntime } from './main/runtime/controller-select-open';
-import { openControllerDebugModal as openControllerDebugModalRuntime } from './main/runtime/controller-debug-open';
 import { createPlaylistBrowserIpcRuntime } from './main/runtime/playlist-browser-ipc';
-import { writeSessionBindingsArtifact } from './main/runtime/session-bindings-artifact';
-import { openOverlayHostedModal } from './main/runtime/overlay-hosted-modal-open';
 import { createOverlayShortcutsRuntimeService } from './main/overlay-shortcuts-runtime';
 import {
   createFrequencyDictionaryRuntimeService,
@@ -1493,7 +1470,9 @@ const overlayShortcutsRuntime = createOverlayShortcutsRuntimeService(
       openRuntimeOptionsPalette();
     },
     openJimaku: () => {
-      openJimakuOverlay();
+      sendToActiveOverlayWindow('jimaku:open', undefined, {
+        restoreOnModalClose: 'jimaku',
+      });
     },
     markAudioCard: () => markLastCardAsAudioCard(),
     copySubtitleMultiple: (timeoutMs: number) => {
@@ -1547,9 +1526,6 @@ const buildConfigHotReloadAppliedMainDepsHandler = createBuildConfigHotReloadApp
     setKeybindings: (keybindings) => {
       appState.keybindings = keybindings;
     },
-    setSessionBindings: (sessionBindings, sessionBindingWarnings) => {
-      persistSessionBindings(sessionBindings, sessionBindingWarnings);
-    },
     refreshGlobalAndOverlayShortcuts: () => {
       refreshGlobalAndOverlayShortcuts();
     },
@@ -1859,9 +1835,6 @@ const overlayVisibilityRuntime = createOverlayVisibilityRuntimeService(
     getVisibleOverlayVisible: () => overlayManager.getVisibleOverlayVisible(),
     getForceMousePassthrough: () => appState.statsOverlayVisible,
     getWindowTracker: () => appState.windowTracker,
-    getLastKnownWindowsForegroundProcessName: () => lastWindowsVisibleOverlayForegroundProcessName,
-    getWindowsOverlayProcessName: () => path.parse(process.execPath).name.toLowerCase(),
-    getWindowsFocusHandoffGraceActive: () => hasWindowsVisibleOverlayFocusHandoffGrace(),
     getTrackerNotReadyWarningShown: () => appState.trackerNotReadyWarningShown,
     setTrackerNotReadyWarningShown: (shown: boolean) => {
       appState.trackerNotReadyWarningShown = shown;
@@ -1870,9 +1843,6 @@ const overlayVisibilityRuntime = createOverlayVisibilityRuntimeService(
     ensureOverlayWindowLevel: (window) => {
       ensureOverlayWindowLevel(window);
     },
-    syncWindowsOverlayToMpvZOrder: (_window) => {
-      requestWindowsVisibleOverlayZOrderSync();
-    },
     syncPrimaryOverlayWindowLayer: (layer) => {
       syncPrimaryOverlayWindowLayer(layer);
     },
@@ -1900,243 +1870,6 @@ const overlayVisibilityRuntime = createOverlayVisibilityRuntimeService(
     },
   })(),
 );
-
-const WINDOWS_VISIBLE_OVERLAY_BLUR_REFRESH_DELAYS_MS = [0, 25, 100, 250] as const;
-const WINDOWS_VISIBLE_OVERLAY_Z_ORDER_RETRY_DELAYS_MS = [0, 48, 120, 240, 480] as const;
-const WINDOWS_VISIBLE_OVERLAY_FOREGROUND_POLL_INTERVAL_MS = 75;
-const WINDOWS_VISIBLE_OVERLAY_FOCUS_HANDOFF_GRACE_MS = 200;
-let windowsVisibleOverlayBlurRefreshTimeouts: Array<ReturnType<typeof setTimeout>> = [];
-let windowsVisibleOverlayZOrderRetryTimeouts: Array<ReturnType<typeof setTimeout>> = [];
-let windowsVisibleOverlayZOrderSyncInFlight = false;
-let windowsVisibleOverlayZOrderSyncQueued = false;
-let windowsVisibleOverlayForegroundPollInterval: ReturnType<typeof setInterval> | null = null;
-let lastWindowsVisibleOverlayForegroundProcessName: string | null = null;
-let lastWindowsVisibleOverlayBlurredAtMs = 0;
-
-function clearWindowsVisibleOverlayBlurRefreshTimeouts(): void {
-  for (const timeout of windowsVisibleOverlayBlurRefreshTimeouts) {
-    clearTimeout(timeout);
-  }
-  windowsVisibleOverlayBlurRefreshTimeouts = [];
-}
-
-function clearWindowsVisibleOverlayZOrderRetryTimeouts(): void {
-  for (const timeout of windowsVisibleOverlayZOrderRetryTimeouts) {
-    clearTimeout(timeout);
-  }
-  windowsVisibleOverlayZOrderRetryTimeouts = [];
-}
-
-function getWindowsNativeWindowHandle(window: BrowserWindow): string {
-  const handle = window.getNativeWindowHandle();
-  return handle.length >= 8
-    ? handle.readBigUInt64LE(0).toString()
-    : BigInt(handle.readUInt32LE(0)).toString();
-}
-
-function getWindowsNativeWindowHandleNumber(window: BrowserWindow): number {
-  const handle = window.getNativeWindowHandle();
-  return handle.length >= 8 ? Number(handle.readBigUInt64LE(0)) : handle.readUInt32LE(0);
-}
-
-function resolveWindowsOverlayBindTargetHandle(targetMpvSocketPath?: string | null): number | null {
-  if (process.platform !== 'win32') {
-    return null;
-  }
-
-  try {
-    if (targetMpvSocketPath) {
-      const windowTracker = appState.windowTracker as {
-        getTargetWindowHandle?: () => number | null;
-      } | null;
-      const trackedHandle = windowTracker?.getTargetWindowHandle?.();
-      if (typeof trackedHandle === 'number' && Number.isFinite(trackedHandle)) {
-        return trackedHandle;
-      }
-    }
-    return findWindowsMpvTargetWindowHandle();
-  } catch {
-    return null;
-  }
-}
-
-async function syncWindowsVisibleOverlayToMpvZOrder(): Promise<boolean> {
-  if (process.platform !== 'win32') {
-    return false;
-  }
-
-  const mainWindow = overlayManager.getMainWindow();
-  if (
-    !mainWindow ||
-    mainWindow.isDestroyed() ||
-    !mainWindow.isVisible() ||
-    !overlayManager.getVisibleOverlayVisible()
-  ) {
-    return false;
-  }
-
-  const windowTracker = appState.windowTracker;
-  if (!windowTracker) {
-    return false;
-  }
-
-  if (
-    typeof windowTracker.isTargetWindowMinimized === 'function' &&
-    windowTracker.isTargetWindowMinimized()
-  ) {
-    return false;
-  }
-
-  if (!windowTracker.isTracking() && windowTracker.getGeometry() === null) {
-    return false;
-  }
-
-  const overlayHwnd = getWindowsNativeWindowHandleNumber(mainWindow);
-  const targetWindowHwnd = resolveWindowsOverlayBindTargetHandle(appState.mpvSocketPath);
-  if (targetWindowHwnd !== null && bindWindowsOverlayAboveMpv(overlayHwnd, targetWindowHwnd)) {
-    (mainWindow as BrowserWindow & { setOpacity?: (opacity: number) => void }).setOpacity?.(1);
-    return true;
-  }
-  return false;
-}
-
-function requestWindowsVisibleOverlayZOrderSync(): void {
-  if (process.platform !== 'win32') {
-    return;
-  }
-
-  if (windowsVisibleOverlayZOrderSyncInFlight) {
-    windowsVisibleOverlayZOrderSyncQueued = true;
-    return;
-  }
-
-  windowsVisibleOverlayZOrderSyncInFlight = true;
-  void syncWindowsVisibleOverlayToMpvZOrder()
-    .catch((error) => {
-      logger.warn('Failed to bind Windows overlay z-order to mpv', error);
-    })
-    .finally(() => {
-      windowsVisibleOverlayZOrderSyncInFlight = false;
-      if (!windowsVisibleOverlayZOrderSyncQueued) {
-        return;
-      }
-
-      windowsVisibleOverlayZOrderSyncQueued = false;
-      requestWindowsVisibleOverlayZOrderSync();
-    });
-}
-
-function scheduleWindowsVisibleOverlayZOrderSyncBurst(): void {
-  if (process.platform !== 'win32') {
-    return;
-  }
-
-  clearWindowsVisibleOverlayZOrderRetryTimeouts();
-  for (const delayMs of WINDOWS_VISIBLE_OVERLAY_Z_ORDER_RETRY_DELAYS_MS) {
-    const retryTimeout = setTimeout(() => {
-      windowsVisibleOverlayZOrderRetryTimeouts = windowsVisibleOverlayZOrderRetryTimeouts.filter(
-        (timeout) => timeout !== retryTimeout,
-      );
-      requestWindowsVisibleOverlayZOrderSync();
-    }, delayMs);
-    windowsVisibleOverlayZOrderRetryTimeouts.push(retryTimeout);
-  }
-}
-
-function hasWindowsVisibleOverlayFocusHandoffGrace(): boolean {
-  return (
-    process.platform === 'win32' &&
-    lastWindowsVisibleOverlayBlurredAtMs > 0 &&
-    Date.now() - lastWindowsVisibleOverlayBlurredAtMs <=
-      WINDOWS_VISIBLE_OVERLAY_FOCUS_HANDOFF_GRACE_MS
-  );
-}
-
-function shouldPollWindowsVisibleOverlayForegroundProcess(): boolean {
-  if (process.platform !== 'win32' || !overlayManager.getVisibleOverlayVisible()) {
-    return false;
-  }
-
-  const mainWindow = overlayManager.getMainWindow();
-  if (!mainWindow || mainWindow.isDestroyed()) {
-    return false;
-  }
-
-  const windowTracker = appState.windowTracker;
-  if (!windowTracker) {
-    return false;
-  }
-
-  if (
-    typeof windowTracker.isTargetWindowMinimized === 'function' &&
-    windowTracker.isTargetWindowMinimized()
-  ) {
-    return false;
-  }
-
-  const overlayFocused = mainWindow.isFocused();
-  const trackerFocused = windowTracker.isTargetWindowFocused?.() ?? false;
-  return !overlayFocused && !trackerFocused;
-}
-
-function maybePollWindowsVisibleOverlayForegroundProcess(): void {
-  if (!shouldPollWindowsVisibleOverlayForegroundProcess()) {
-    lastWindowsVisibleOverlayForegroundProcessName = null;
-    return;
-  }
-
-  const processName = getWindowsForegroundProcessName();
-  const normalizedProcessName = processName?.trim().toLowerCase() ?? null;
-  const previousProcessName = lastWindowsVisibleOverlayForegroundProcessName;
-  lastWindowsVisibleOverlayForegroundProcessName = normalizedProcessName;
-
-  if (normalizedProcessName !== previousProcessName) {
-    overlayVisibilityRuntime.updateVisibleOverlayVisibility();
-  }
-  if (normalizedProcessName === 'mpv' && previousProcessName !== 'mpv') {
-    requestWindowsVisibleOverlayZOrderSync();
-  }
-}
-
-function ensureWindowsVisibleOverlayForegroundPollLoop(): void {
-  if (process.platform !== 'win32' || windowsVisibleOverlayForegroundPollInterval !== null) {
-    return;
-  }
-
-  windowsVisibleOverlayForegroundPollInterval = setInterval(() => {
-    maybePollWindowsVisibleOverlayForegroundProcess();
-  }, WINDOWS_VISIBLE_OVERLAY_FOREGROUND_POLL_INTERVAL_MS);
-}
-
-function clearWindowsVisibleOverlayForegroundPollLoop(): void {
-  if (windowsVisibleOverlayForegroundPollInterval === null) {
-    return;
-  }
-
-  clearInterval(windowsVisibleOverlayForegroundPollInterval);
-  windowsVisibleOverlayForegroundPollInterval = null;
-}
-
-function scheduleVisibleOverlayBlurRefresh(): void {
-  if (process.platform !== 'win32') {
-    return;
-  }
-
-  lastWindowsVisibleOverlayBlurredAtMs = Date.now();
-  clearWindowsVisibleOverlayBlurRefreshTimeouts();
-  for (const delayMs of WINDOWS_VISIBLE_OVERLAY_BLUR_REFRESH_DELAYS_MS) {
-    const refreshTimeout = setTimeout(() => {
-      windowsVisibleOverlayBlurRefreshTimeouts = windowsVisibleOverlayBlurRefreshTimeouts.filter(
-        (timeout) => timeout !== refreshTimeout,
-      );
-      overlayVisibilityRuntime.updateVisibleOverlayVisibility();
-    }, delayMs);
-    windowsVisibleOverlayBlurRefreshTimeouts.push(refreshTimeout);
-  }
-}
-
-ensureWindowsVisibleOverlayForegroundPollLoop();
-
 const buildGetRuntimeOptionsStateMainDepsHandler = createBuildGetRuntimeOptionsStateMainDepsHandler(
   {
     getRuntimeOptionsManager: () => appState.runtimeOptionsManager,
@@ -2224,86 +1957,8 @@ function setOverlayDebugVisualizationEnabled(enabled: boolean): void {
   overlayVisibilityComposer.setOverlayDebugVisualizationEnabled(enabled);
 }
 
-function createOverlayHostedModalOpenDeps(): {
-  ensureOverlayStartupPrereqs: () => void;
-  ensureOverlayWindowsReadyForVisibilityActions: () => void;
-  sendToActiveOverlayWindow: (
-    channel: string,
-    payload?: unknown,
-    runtimeOptions?: {
-      restoreOnModalClose?: OverlayHostedModal;
-      preferModalWindow?: boolean;
-    },
-  ) => boolean;
-  waitForModalOpen: (modal: OverlayHostedModal, timeoutMs: number) => Promise<boolean>;
-  logWarn: (message: string) => void;
-} {
-  return {
-    ensureOverlayStartupPrereqs: () => ensureOverlayStartupPrereqs(),
-    ensureOverlayWindowsReadyForVisibilityActions: () =>
-      ensureOverlayWindowsReadyForVisibilityActions(),
-    sendToActiveOverlayWindow: (channel, payload, runtimeOptions) =>
-      sendToActiveOverlayWindow(channel, payload, runtimeOptions),
-    waitForModalOpen: (modal, timeoutMs) => overlayModalRuntime.waitForModalOpen(modal, timeoutMs),
-    logWarn: (message) => logger.warn(message),
-  };
-}
-
-function openOverlayHostedModalWithOsd(
-  openModal: (deps: ReturnType<typeof createOverlayHostedModalOpenDeps>) => Promise<boolean>,
-  unavailableMessage: string,
-  failureLogMessage: string,
-): void {
-  void openModal(createOverlayHostedModalOpenDeps())
-    .then((opened) => {
-      if (!opened) {
-        showMpvOsd(unavailableMessage);
-      }
-    })
-    .catch((error) => {
-      logger.error(failureLogMessage, error);
-      showMpvOsd(unavailableMessage);
-    });
-}
-
 function openRuntimeOptionsPalette(): void {
-  openOverlayHostedModalWithOsd(
-    openRuntimeOptionsModalRuntime,
-    'Runtime options overlay unavailable.',
-    'Failed to open runtime options overlay.',
-  );
-}
-
-function openJimakuOverlay(): void {
-  openOverlayHostedModalWithOsd(
-    openJimakuModalRuntime,
-    'Jimaku overlay unavailable.',
-    'Failed to open Jimaku overlay.',
-  );
-}
-
-function openSessionHelpOverlay(): void {
-  openOverlayHostedModalWithOsd(
-    openSessionHelpModalRuntime,
-    'Session help overlay unavailable.',
-    'Failed to open session help overlay.',
-  );
-}
-
-function openControllerSelectOverlay(): void {
-  openOverlayHostedModalWithOsd(
-    openControllerSelectModalRuntime,
-    'Controller select overlay unavailable.',
-    'Failed to open controller select overlay.',
-  );
-}
-
-function openControllerDebugOverlay(): void {
-  openOverlayHostedModalWithOsd(
-    openControllerDebugModalRuntime,
-    'Controller debug overlay unavailable.',
-    'Failed to open controller debug overlay.',
-  );
+  overlayVisibilityComposer.openRuntimeOptionsPalette();
 }
 
 function openPlaylistBrowser(): void {
@@ -2311,11 +1966,16 @@ function openPlaylistBrowser(): void {
     showMpvOsd('Playlist browser requires active playback.');
     return;
   }
-  openOverlayHostedModalWithOsd(
-    openPlaylistBrowserRuntime,
-    'Playlist browser overlay unavailable.',
-    'Failed to open playlist browser overlay.',
-  );
+  const opened = openPlaylistBrowserRuntime({
+    ensureOverlayStartupPrereqs: () => ensureOverlayStartupPrereqs(),
+    ensureOverlayWindowsReadyForVisibilityActions: () =>
+      ensureOverlayWindowsReadyForVisibilityActions(),
+    sendToActiveOverlayWindow: (channel, payload, runtimeOptions) =>
+      sendToActiveOverlayWindow(channel, payload, runtimeOptions),
+  });
+  if (!opened) {
+    showMpvOsd('Playlist browser overlay unavailable.');
+  }
 }
 
 function getResolvedConfig() {
@@ -3086,8 +2746,6 @@ const {
       annotationSubtitleWsService.stop();
     },
     stopTexthookerService: () => texthookerService.stop(),
-    clearWindowsVisibleOverlayForegroundPollLoop: () =>
-      clearWindowsVisibleOverlayForegroundPollLoop(),
     getMainOverlayWindow: () => overlayManager.getMainWindow(),
     clearMainOverlayWindow: () => overlayManager.setMainWindow(null),
     getModalOverlayWindow: () => overlayManager.getModalWindow(),
@@ -3488,7 +3146,6 @@ const { appReadyRuntimeRunner } = composeAppReadyRuntime({
     loadSubtitlePosition: () => loadSubtitlePosition(),
     resolveKeybindings: () => {
       appState.keybindings = resolveKeybindings(getResolvedConfig(), DEFAULT_KEYBINDINGS);
-      refreshCurrentSessionBindings();
     },
     createMpvClient: () => {
       appState.mpvClient = createMpvClientRuntimeService();
@@ -3631,9 +3288,6 @@ function ensureOverlayStartupPrereqs(): void {
   }
   if (appState.keybindings.length === 0) {
     appState.keybindings = resolveKeybindings(getResolvedConfig(), DEFAULT_KEYBINDINGS);
-    refreshCurrentSessionBindings();
-  } else if (!appState.sessionBindingsInitialized) {
-    refreshCurrentSessionBindings();
   }
   if (!appState.mpvClient) {
     appState.mpvClient = createMpvClientRuntimeService();
@@ -4020,12 +3674,6 @@ function applyOverlayRegions(geometry: WindowGeometry): void {
 const buildUpdateVisibleOverlayBoundsMainDepsHandler =
   createBuildUpdateVisibleOverlayBoundsMainDepsHandler({
     setOverlayWindowBounds: (geometry) => applyOverlayRegions(geometry),
-    afterSetOverlayWindowBounds: () => {
-      if (process.platform !== 'win32' || !overlayManager.getVisibleOverlayVisible()) {
-        return;
-      }
-      scheduleWindowsVisibleOverlayZOrderSyncBurst();
-    },
   });
 const updateVisibleOverlayBoundsMainDeps = buildUpdateVisibleOverlayBoundsMainDepsHandler();
 const updateVisibleOverlayBounds = createUpdateVisibleOverlayBoundsHandler(
@@ -4148,14 +3796,7 @@ function createModalWindow(): BrowserWindow {
 }
 
 function createMainWindow(): BrowserWindow {
-  const window = createMainWindowHandler();
-  if (process.platform === 'win32') {
-    const overlayHwnd = getWindowsNativeWindowHandleNumber(window);
-    if (!ensureWindowsOverlayTransparency(overlayHwnd)) {
-      logger.warn('Failed to eagerly extend Windows overlay transparency via koffi');
-    }
-  }
-  return window;
+  return createMainWindowHandler();
 }
 
 function ensureTray(): void {
@@ -4232,53 +3873,6 @@ const {
   },
 });
 
-function resolveSessionBindingPlatform(): 'darwin' | 'win32' | 'linux' {
-  if (process.platform === 'darwin') return 'darwin';
-  if (process.platform === 'win32') return 'win32';
-  return 'linux';
-}
-
-function compileCurrentSessionBindings(): {
-  bindings: CompiledSessionBinding[];
-  warnings: ReturnType<typeof compileSessionBindings>['warnings'];
-} {
-  return compileSessionBindings({
-    keybindings: appState.keybindings,
-    shortcuts: getConfiguredShortcuts(),
-    statsToggleKey: getResolvedConfig().stats.toggleKey,
-    platform: resolveSessionBindingPlatform(),
-    rawConfig: getResolvedConfig(),
-  });
-}
-
-function persistSessionBindings(
-  bindings: CompiledSessionBinding[],
-  warnings: ReturnType<typeof compileSessionBindings>['warnings'] = [],
-): void {
-  const artifact = buildPluginSessionBindingsArtifact({
-    bindings,
-    warnings,
-    numericSelectionTimeoutMs: getConfiguredShortcuts().multiCopyTimeoutMs,
-  });
-  writeSessionBindingsArtifact(CONFIG_DIR, artifact);
-  appState.sessionBindings = bindings;
-  appState.sessionBindingsInitialized = true;
-  if (appState.mpvClient?.connected) {
-    sendMpvCommandRuntime(appState.mpvClient, [
-      'script-message',
-      'subminer-reload-session-bindings',
-    ]);
-  }
-}
-
-function refreshCurrentSessionBindings(): void {
-  const compiled = compileCurrentSessionBindings();
-  for (const warning of compiled.warnings) {
-    logger.warn(`[session-bindings] ${warning.message}`);
-  }
-  persistSessionBindings(compiled.bindings, compiled.warnings);
-}
-
 const { flushMpvLog, showMpvOsd } = createMpvOsdRuntimeHandlers({
   appendToMpvLogMainDeps: {
     logPath: DEFAULT_MPV_LOG_PATH,
@@ -4329,10 +3923,6 @@ function handleCycleSecondarySubMode(): void {
   cycleSecondarySubMode();
 }
 
-function toggleSubtitleSidebar(): void {
-  broadcastToOverlayWindows(IPC_CHANNELS.event.subtitleSidebarToggle);
-}
-
 async function triggerSubsyncFromConfig(): Promise<void> {
   await subsyncRuntime.triggerFromConfig();
 }
@@ -4594,55 +4184,6 @@ const shiftSubtitleDelayToAdjacentCueHandler = createShiftSubtitleDelayToAdjacen
   showMpvOsd: (text) => showMpvOsd(text),
 });
 
-async function dispatchSessionAction(request: SessionActionDispatchRequest): Promise<void> {
-  await dispatchSessionActionCore(request, {
-    toggleStatsOverlay: () =>
-      toggleStatsOverlayWindow({
-        staticDir: statsDistPath,
-        preloadPath: statsPreloadPath,
-        getApiBaseUrl: () => ensureStatsServerStarted(),
-        getToggleKey: () => getResolvedConfig().stats.toggleKey,
-        resolveBounds: () => getCurrentOverlayGeometry(),
-        onVisibilityChanged: (visible) => {
-          appState.statsOverlayVisible = visible;
-          overlayVisibilityRuntime.updateVisibleOverlayVisibility();
-        },
-      }),
-    toggleVisibleOverlay: () => toggleVisibleOverlay(),
-    copyCurrentSubtitle: () => copyCurrentSubtitle(),
-    copySubtitleCount: (count) => handleMultiCopyDigit(count),
-    updateLastCardFromClipboard: () => updateLastCardFromClipboard(),
-    triggerFieldGrouping: () => triggerFieldGrouping(),
-    triggerSubsyncFromConfig: () => triggerSubsyncFromConfig(),
-    mineSentenceCard: () => mineSentenceCard(),
-    mineSentenceCount: (count) => handleMineSentenceDigit(count),
-    toggleSecondarySub: () => handleCycleSecondarySubMode(),
-    toggleSubtitleSidebar: () => toggleSubtitleSidebar(),
-    markLastCardAsAudioCard: () => markLastCardAsAudioCard(),
-    openRuntimeOptionsPalette: () => openRuntimeOptionsPalette(),
-    openJimaku: () => openJimakuOverlay(),
-    openSessionHelp: () => openSessionHelpOverlay(),
-    openControllerSelect: () => openControllerSelectOverlay(),
-    openControllerDebug: () => openControllerDebugOverlay(),
-    openYoutubeTrackPicker: () => openYoutubeTrackPickerFromPlayback(),
-    openPlaylistBrowser: () => openPlaylistBrowser(),
-    replayCurrentSubtitle: () => replayCurrentSubtitleRuntime(appState.mpvClient),
-    playNextSubtitle: () => playNextSubtitleRuntime(appState.mpvClient),
-    shiftSubDelayToAdjacentSubtitle: (direction) =>
-      shiftSubtitleDelayToAdjacentCueHandler(direction),
-    cycleRuntimeOption: (id, direction) => {
-      if (!appState.runtimeOptionsManager) {
-        return { ok: false, error: 'Runtime options manager unavailable' };
-      }
-      return applyRuntimeOptionResultRuntime(
-        appState.runtimeOptionsManager.cycleOption(id, direction),
-        (text) => showMpvOsd(text),
-      );
-    },
-    showMpvOsd: (text) => showMpvOsd(text),
-  });
-}
-
 const { playlistBrowserMainDeps } = createPlaylistBrowserIpcRuntime(() => appState.mpvClient, {
   getPrimarySubtitleLanguages: () => getResolvedConfig().youtube.primarySubLanguages,
   getSecondarySubtitleLanguages: () => getResolvedConfig().secondarySub.secondarySubLanguages,
@@ -4652,7 +4193,7 @@ const { registerIpcRuntimeHandlers } = composeIpcRuntimeHandlers({
   mpvCommandMainDeps: {
     triggerSubsyncFromConfig: () => triggerSubsyncFromConfig(),
     openRuntimeOptionsPalette: () => openRuntimeOptionsPalette(),
-    openJimaku: () => openJimakuOverlay(),
+    openJimaku: () => overlayModalRuntime.openJimaku(),
     openYoutubeTrackPicker: () => openYoutubeTrackPickerFromPlayback(),
     openPlaylistBrowser: () => openPlaylistBrowser(),
     cycleRuntimeOption: (id, direction) => {
@@ -4692,17 +4233,7 @@ const { registerIpcRuntimeHandlers } = composeIpcRuntimeHandlers({
           mainWindow.focus();
         }
       },
-      onOverlayModalClosed: (modal, senderWindow) => {
-        const modalWindow = overlayManager.getModalWindow();
-        if (
-          senderWindow &&
-          modalWindow &&
-          senderWindow === modalWindow &&
-          !senderWindow.isDestroyed()
-        ) {
-          senderWindow.setIgnoreMouseEvents(true, { forward: true });
-          senderWindow.hide();
-        }
+      onOverlayModalClosed: (modal) => {
         handleOverlayModalClosed(modal);
       },
       onOverlayModalOpened: (modal) => {
@@ -4810,9 +4341,7 @@ const { registerIpcRuntimeHandlers } = composeIpcRuntimeHandlers({
       saveSubtitlePosition: (position) => saveSubtitlePosition(position),
       getMecabTokenizer: () => appState.mecabTokenizer,
       getKeybindings: () => appState.keybindings,
-      getSessionBindings: () => appState.sessionBindings,
       getConfiguredShortcuts: () => getConfiguredShortcuts(),
-      dispatchSessionAction: (request) => dispatchSessionAction(request),
       getStatsToggleKey: () => getResolvedConfig().stats.toggleKey,
       getMarkWatchedKey: () => getResolvedConfig().stats.markWatchedKey,
       getControllerConfig: () => getResolvedConfig().controller,
@@ -4933,8 +4462,6 @@ const { handleCliCommand, handleInitialArgs } = composeCliStartupHandlers({
     printHelp: () => printHelp(DEFAULT_TEXTHOOKER_PORT),
     stopApp: () => requestAppQuit(),
     hasMainWindow: () => Boolean(overlayManager.getMainWindow()),
-    dispatchSessionAction: (request: SessionActionDispatchRequest) =>
-      dispatchSessionAction(request),
     getMultiCopyTimeoutMs: () => getConfiguredShortcuts().multiCopyTimeoutMs,
     schedule: (fn: () => void, delayMs: number) => setTimeout(fn, delayMs),
     logInfo: (message: string) => logger.info(message),
@@ -5068,8 +4595,6 @@ const { createMainWindow: createMainWindowHandler, createModalWindow: createModa
       tryHandleOverlayShortcutLocalFallback: (input) =>
         overlayShortcutsRuntime.tryHandleOverlayShortcutLocalFallback(input),
       forwardTabToMpv: () => sendMpvCommandRuntime(appState.mpvClient, ['keypress', 'TAB']),
-      onVisibleWindowBlurred: () => scheduleVisibleOverlayBlurRefresh(),
-      onWindowContentReady: () => overlayVisibilityRuntime.updateVisibleOverlayVisibility(),
       onWindowClosed: (windowKind) => {
         if (windowKind === 'visible') {
           overlayManager.setMainWindow(null);
@@ -5171,9 +4696,6 @@ const { initializeOverlayRuntime: initializeOverlayRuntimeHandler } =
         updateVisibleOverlayVisibility: () =>
           overlayVisibilityRuntime.updateVisibleOverlayVisibility(),
       },
-      refreshCurrentSubtitle: () => {
-        subtitleProcessingController.refreshCurrentSubtitle(appState.currentSubText);
-      },
       overlayShortcutsRuntime: {
         syncOverlayShortcuts: () => overlayShortcutsRuntime.syncOverlayShortcuts(),
       },
@@ -5197,44 +4719,6 @@ const { initializeOverlayRuntime: initializeOverlayRuntimeHandler } =
       },
       updateVisibleOverlayBounds: (geometry: WindowGeometry) =>
         updateVisibleOverlayBounds(geometry),
-      bindOverlayOwner: () => {
-        const mainWindow = overlayManager.getMainWindow();
-        if (process.platform !== 'win32' || !mainWindow || mainWindow.isDestroyed()) return;
-        const overlayHwnd = getWindowsNativeWindowHandleNumber(mainWindow);
-        const targetWindowHwnd = resolveWindowsOverlayBindTargetHandle(appState.mpvSocketPath);
-        if (
-          targetWindowHwnd !== null &&
-          bindWindowsOverlayAboveMpv(overlayHwnd, targetWindowHwnd)
-        ) {
-          return;
-        }
-        const tracker = appState.windowTracker;
-        const mpvResult = tracker
-          ? (() => {
-              try {
-                const win32 =
-                  require('./window-trackers/win32') as typeof import('./window-trackers/win32');
-                const poll = win32.findMpvWindows();
-                const focused = poll.matches.find((m) => m.isForeground);
-                return focused ?? [...poll.matches].sort((a, b) => b.area - a.area)[0] ?? null;
-              } catch {
-                return null;
-              }
-            })()
-          : null;
-        if (!mpvResult) return;
-        if (!setWindowsOverlayOwner(overlayHwnd, mpvResult.hwnd)) {
-          logger.warn('Failed to set overlay owner via koffi');
-        }
-      },
-      releaseOverlayOwner: () => {
-        const mainWindow = overlayManager.getMainWindow();
-        if (process.platform !== 'win32' || !mainWindow || mainWindow.isDestroyed()) return;
-        const overlayHwnd = getWindowsNativeWindowHandleNumber(mainWindow);
-        if (!clearWindowsOverlayOwner(overlayHwnd)) {
-          logger.warn('Failed to clear overlay owner via koffi');
-        }
-      },
       getOverlayWindows: () => getOverlayWindows(),
       getResolvedConfig: () => getResolvedConfig(),
       showDesktopNotification,

src/main/boot/services.test.ts

@@ -23,7 +23,7 @@ test('createMainBootServices builds boot-phase service bundle', () => {
     { kind: string },
     { scope: string; warn: () => void; info: () => void; error: () => void },
     { registry: boolean },
-    { getMainWindow: () => null; getModalWindow: () => null },
+    { getModalWindow: () => null },
     {
       inputState: boolean;
       getModalInputExclusive: () => boolean;
@@ -82,7 +82,6 @@ test('createMainBootServices builds boot-phase service bundle', () => {
       }) as const,
     createMainRuntimeRegistry: () => ({ registry: true }),
     createOverlayManager: () => ({
-      getMainWindow: () => null,
       getModalWindow: () => null,
     }),
     createOverlayModalInputState: () => ({

src/main/boot/services.ts

@@ -74,7 +74,6 @@ export interface MainBootServicesParams<
     getModalWindow: () => BrowserWindow | null;
     syncOverlayShortcutsForModal: (isActive: boolean) => void;
     syncOverlayVisibilityForModal: () => void;
-    restoreMainWindowFocus?: () => void;
   }) => TOverlayModalInputState;
   createOverlayContentMeasurementStore: (params: {
     logger: TLogger;
@@ -132,10 +131,7 @@ export function createMainBootServices<
   TSubtitleWebSocket,
   TLogger,
   TRuntimeRegistry,
-  TOverlayManager extends {
-    getMainWindow: () => BrowserWindow | null;
-    getModalWindow: () => BrowserWindow | null;
-  },
+  TOverlayManager extends { getModalWindow: () => BrowserWindow | null },
   TOverlayModalInputState extends OverlayModalInputStateShape,
   TOverlayContentMeasurementStore,
   TOverlayModalRuntime,
@@ -216,26 +212,6 @@ export function createMainBootServices<
     syncOverlayVisibilityForModal: () => {
       params.getSyncOverlayVisibilityForModal()();
     },
-    restoreMainWindowFocus: () => {
-      const mainWindow = overlayManager.getMainWindow();
-      if (!mainWindow || mainWindow.isDestroyed() || !mainWindow.isVisible()) return;
-      try {
-        const electron = require('electron') as {
-          app?: { focus?: (options?: { steal?: boolean }) => void };
-        };
-        electron.app?.focus?.({ steal: true });
-      } catch {
-        // Ignore in non-Electron environments.
-      }
-      const maybeFocusable = mainWindow as typeof mainWindow & {
-        setFocusable?: (focusable: boolean) => void;
-      };
-      maybeFocusable.setFocusable?.(true);
-      mainWindow.focus();
-      if (!mainWindow.webContents.isFocused()) {
-        mainWindow.webContents.focus();
-      }
-    },
   });
   const overlayContentMeasurementStore = params.createOverlayContentMeasurementStore({
     logger,

src/main/cli-runtime.ts

@@ -30,7 +30,6 @@ export interface CliCommandRuntimeServiceContext {
   triggerFieldGrouping: () => Promise<void>;
   triggerSubsyncFromConfig: () => Promise<void>;
   markLastCardAsAudioCard: () => Promise<void>;
-  dispatchSessionAction: CliCommandRuntimeServiceDepsParams['dispatchSessionAction'];
   getAnilistStatus: CliCommandRuntimeServiceDepsParams['anilist']['getStatus'];
   clearAnilistToken: CliCommandRuntimeServiceDepsParams['anilist']['clearToken'];
   openAnilistSetup: CliCommandRuntimeServiceDepsParams['anilist']['openSetup'];
@@ -114,7 +113,6 @@ function createCliCommandDepsFromContext(
       hasMainWindow: context.hasMainWindow,
       runYoutubePlaybackFlow: context.runYoutubePlaybackFlow,
     },
-    dispatchSessionAction: context.dispatchSessionAction,
     ui: {
       openFirstRunSetup: context.openFirstRunSetup,
       openYomitanSettings: context.openYomitanSettings,

src/main/dependencies.ts

@@ -73,9 +73,7 @@ export interface MainIpcRuntimeServiceDepsParams {
   getMecabTokenizer: IpcDepsRuntimeOptions['getMecabTokenizer'];
   handleMpvCommand: IpcDepsRuntimeOptions['handleMpvCommand'];
   getKeybindings: IpcDepsRuntimeOptions['getKeybindings'];
-  getSessionBindings: IpcDepsRuntimeOptions['getSessionBindings'];
   getConfiguredShortcuts: IpcDepsRuntimeOptions['getConfiguredShortcuts'];
-  dispatchSessionAction: IpcDepsRuntimeOptions['dispatchSessionAction'];
   getStatsToggleKey: IpcDepsRuntimeOptions['getStatsToggleKey'];
   getMarkWatchedKey: IpcDepsRuntimeOptions['getMarkWatchedKey'];
   getControllerConfig: IpcDepsRuntimeOptions['getControllerConfig'];
@@ -180,7 +178,6 @@ export interface CliCommandRuntimeServiceDepsParams {
     hasMainWindow: CliCommandDepsRuntimeOptions['app']['hasMainWindow'];
     runYoutubePlaybackFlow: CliCommandDepsRuntimeOptions['app']['runYoutubePlaybackFlow'];
   };
-  dispatchSessionAction: CliCommandDepsRuntimeOptions['dispatchSessionAction'];
   ui: {
     openFirstRunSetup: CliCommandDepsRuntimeOptions['ui']['openFirstRunSetup'];
     openYomitanSettings: CliCommandDepsRuntimeOptions['ui']['openYomitanSettings'];
@@ -236,9 +233,7 @@ export function createMainIpcRuntimeServiceDeps(
     getMecabTokenizer: params.getMecabTokenizer,
     handleMpvCommand: params.handleMpvCommand,
     getKeybindings: params.getKeybindings,
-    getSessionBindings: params.getSessionBindings,
     getConfiguredShortcuts: params.getConfiguredShortcuts,
-    dispatchSessionAction: params.dispatchSessionAction,
     getStatsToggleKey: params.getStatsToggleKey,
     getMarkWatchedKey: params.getMarkWatchedKey,
     getControllerConfig: params.getControllerConfig,
@@ -352,7 +347,6 @@ export function createCliCommandRuntimeServiceDeps(
       hasMainWindow: params.app.hasMainWindow,
       runYoutubePlaybackFlow: params.app.runYoutubePlaybackFlow,
     },
-    dispatchSessionAction: params.dispatchSessionAction,
     ui: {
       openFirstRunSetup: params.ui.openFirstRunSetup,
       openYomitanSettings: params.ui.openYomitanSettings,

src/main/overlay-runtime.test.ts

@@ -7,16 +7,13 @@ type MockWindow = {
   visible: boolean;
   focused: boolean;
   ignoreMouseEvents: boolean;
-  forwardedIgnoreMouseEvents: boolean;
   webContentsFocused: boolean;
   showCount: number;
   hideCount: number;
   sent: unknown[][];
   loading: boolean;
   url: string;
-  contentReady: boolean;
   loadCallbacks: Array<() => void>;
-  readyToShowCallbacks: Array<() => void>;
 };
 
 function createMockWindow(): MockWindow & {
@@ -31,11 +28,7 @@ function createMockWindow(): MockWindow & {
   getHideCount: () => number;
   show: () => void;
   hide: () => void;
-  destroy: () => void;
   focus: () => void;
-  emitDidFinishLoad: () => void;
-  emitReadyToShow: () => void;
-  once: (event: 'ready-to-show', cb: () => void) => void;
   webContents: {
     focused: boolean;
     isLoading: () => boolean;
@@ -51,16 +44,13 @@ function createMockWindow(): MockWindow & {
     visible: false,
     focused: false,
     ignoreMouseEvents: false,
-    forwardedIgnoreMouseEvents: false,
     webContentsFocused: false,
     showCount: 0,
     hideCount: 0,
     sent: [],
     loading: false,
     url: 'file:///overlay/index.html?layer=modal',
-    contentReady: true,
     loadCallbacks: [],
-    readyToShowCallbacks: [],
   };
   const window = {
     ...state,
@@ -68,9 +58,8 @@ function createMockWindow(): MockWindow & {
     isVisible: () => state.visible,
     isFocused: () => state.focused,
     getURL: () => state.url,
-    setIgnoreMouseEvents: (ignore: boolean, options?: { forward?: boolean }) => {
+    setIgnoreMouseEvents: (ignore: boolean, _options?: { forward?: boolean }) => {
       state.ignoreMouseEvents = ignore;
-      state.forwardedIgnoreMouseEvents = options?.forward === true;
     },
     setAlwaysOnTop: (_flag: boolean, _level?: string, _relativeLevel?: number) => {},
     moveTop: () => {},
@@ -84,28 +73,9 @@ function createMockWindow(): MockWindow & {
       state.visible = false;
       state.hideCount += 1;
     },
-    destroy: () => {
-      state.destroyed = true;
-      state.visible = false;
-    },
     focus: () => {
       state.focused = true;
     },
-    emitDidFinishLoad: () => {
-      const callbacks = state.loadCallbacks.splice(0);
-      for (const callback of callbacks) {
-        callback();
-      }
-    },
-    emitReadyToShow: () => {
-      const callbacks = state.readyToShowCallbacks.splice(0);
-      for (const callback of callbacks) {
-        callback();
-      }
-    },
-    once: (_event: 'ready-to-show', cb: () => void) => {
-      state.readyToShowCallbacks.push(cb);
-    },
     webContents: {
       isLoading: () => state.loading,
       getURL: () => state.url,
@@ -169,27 +139,6 @@ function createMockWindow(): MockWindow & {
     },
   });
 
-  Object.defineProperty(window, 'forwardedIgnoreMouseEvents', {
-    get: () => state.forwardedIgnoreMouseEvents,
-    set: (value: boolean) => {
-      state.forwardedIgnoreMouseEvents = value;
-    },
-  });
-
-  Object.defineProperty(window, 'contentReady', {
-    get: () => state.contentReady,
-    set: (value: boolean) => {
-      state.contentReady = value;
-      (
-        window as typeof window & { __subminerOverlayContentReady?: boolean }
-      ).__subminerOverlayContentReady = value;
-    },
-  });
-
-  (
-    window as typeof window & { __subminerOverlayContentReady?: boolean }
-  ).__subminerOverlayContentReady = state.contentReady;
-
   return window;
 }
 
@@ -246,29 +195,10 @@ test('sendToActiveOverlayWindow creates modal window lazily when absent', () =>
   assert.deepEqual(window.sent, [['jimaku:open']]);
 });
 
-test('sendToActiveOverlayWindow does not retain restore state when modal creation fails', () => {
-  const runtime = createOverlayModalRuntimeService({
-    getMainWindow: () => null,
-    getModalWindow: () => null,
-    createModalWindow: () => null,
-    getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-    setModalWindowBounds: () => {},
-  });
-
-  assert.equal(
-    runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-      restoreOnModalClose: 'runtime-options',
-    }),
-    false,
-  );
-  assert.equal(runtime.getRestoreVisibleOverlayOnModalClose().has('runtime-options'), false);
-});
-
 test('sendToActiveOverlayWindow waits for blank modal URL before sending open command', () => {
   const window = createMockWindow();
   window.url = '';
   window.loading = true;
-  window.contentReady = false;
   const runtime = createOverlayModalRuntimeService({
     getMainWindow: () => null,
     getModalWindow: () => window as never,
@@ -285,13 +215,11 @@ test('sendToActiveOverlayWindow waits for blank modal URL before sending open co
 
   assert.equal(sent, true);
   assert.deepEqual(window.sent, []);
+
+  assert.equal(window.loadCallbacks.length, 1);
   window.loading = false;
   window.url = 'file:///overlay/index.html?layer=modal';
-  window.emitDidFinishLoad();
-  assert.deepEqual(window.sent, []);
-
-  window.contentReady = true;
-  window.emitReadyToShow();
+  window.loadCallbacks[0]!();
 
   runtime.notifyOverlayModalOpened('runtime-options');
   assert.deepEqual(window.sent, [['runtime-options:open']]);
@@ -320,10 +248,10 @@ test('handleOverlayModalClosed hides modal window only after all pending modals
   );
 
   runtime.handleOverlayModalClosed('runtime-options');
-  assert.equal(window.isDestroyed(), false);
+  assert.equal(window.getHideCount(), 0);
 
   runtime.handleOverlayModalClosed('subsync');
-  assert.equal(window.isDestroyed(), true);
+  assert.equal(window.getHideCount(), 1);
 });
 
 test('sendToActiveOverlayWindow prefers visible main overlay window for modal open', () => {
@@ -397,12 +325,11 @@ test('modal window path makes visible main overlay click-through until modal clo
 
   assert.equal(sent, true);
   assert.equal(mainWindow.ignoreMouseEvents, true);
-  assert.equal(mainWindow.forwardedIgnoreMouseEvents, true);
   assert.equal(modalWindow.ignoreMouseEvents, false);
 
   runtime.handleOverlayModalClosed('youtube-track-picker');
 
-  assert.equal(mainWindow.ignoreMouseEvents, true);
+  assert.equal(mainWindow.ignoreMouseEvents, false);
 });
 
 test('modal window path hides visible main overlay until modal closes', () => {
@@ -432,8 +359,8 @@ test('modal window path hides visible main overlay until modal closes', () => {
 
   runtime.handleOverlayModalClosed('youtube-track-picker');
 
-  assert.equal(mainWindow.getShowCount(), 0);
-  assert.equal(mainWindow.isVisible(), false);
+  assert.equal(mainWindow.getShowCount(), 1);
+  assert.equal(mainWindow.isVisible(), true);
 });
 
 test('modal runtime notifies callers when modal input state becomes active/inactive', () => {
@@ -510,7 +437,7 @@ test('notifyOverlayModalOpened enables input on visible main overlay window when
   assert.equal(mainWindow.webContentsFocused, true);
 });
 
-test('handleOverlayModalClosed is a no-op when no modal window can be targeted', () => {
+test('handleOverlayModalClosed resets modal state even when modal window does not exist', () => {
   const state: boolean[] = [];
   const runtime = createOverlayModalRuntimeService(
     {
@@ -527,17 +454,16 @@ test('handleOverlayModalClosed is a no-op when no modal window can be targeted',
     },
   );
 
-  const sent = runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
+  runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
     restoreOnModalClose: 'runtime-options',
   });
-  assert.equal(sent, false);
   runtime.notifyOverlayModalOpened('runtime-options');
   runtime.handleOverlayModalClosed('runtime-options');
 
-  assert.deepEqual(state, []);
+  assert.deepEqual(state, [true, false]);
 });
 
-test('handleOverlayModalClosed destroys modal window for single kiku modal', () => {
+test('handleOverlayModalClosed hides modal window for single kiku modal', () => {
   const window = createMockWindow();
   const runtime = createOverlayModalRuntimeService({
     getMainWindow: () => null,
@@ -556,225 +482,48 @@ test('handleOverlayModalClosed destroys modal window for single kiku modal', ()
   );
   runtime.handleOverlayModalClosed('kiku');
 
-  assert.equal(window.isDestroyed(), true);
+  assert.equal(window.getHideCount(), 1);
   assert.equal(runtime.getRestoreVisibleOverlayOnModalClose().size, 0);
 });
 
-test('modal fallback reveal skips showing window when content is not ready', async () => {
+test('modal fallback reveal keeps mouse events ignored until modal confirms open', async () => {
   const window = createMockWindow();
-  let scheduledReveal: (() => void) | null = null;
-  const runtime = createOverlayModalRuntimeService(
-    {
-      getMainWindow: () => null,
-      getModalWindow: () => window as never,
-      createModalWindow: () => {
-        throw new Error('modal window should not be created when already present');
-      },
-      getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-      setModalWindowBounds: () => {},
+  const runtime = createOverlayModalRuntimeService({
+    getMainWindow: () => null,
+    getModalWindow: () => window as never,
+    createModalWindow: () => {
+      throw new Error('modal window should not be created when already present');
     },
-    {
-      scheduleRevealFallback: (callback) => {
-        scheduledReveal = callback;
-        return { scheduled: true } as never;
-      },
-      clearRevealFallback: () => {
-        scheduledReveal = null;
-      },
-    },
-  );
+    getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
+    setModalWindowBounds: () => {},
+  });
 
   window.loading = true;
   window.url = '';
-  window.contentReady = false;
 
   const sent = runtime.sendToActiveOverlayWindow('jimaku:open', undefined, {
     restoreOnModalClose: 'jimaku',
   });
 
   assert.equal(sent, true);
-  if (scheduledReveal === null) {
-    throw new Error('expected reveal callback');
-  }
-  const runScheduledReveal: () => void = scheduledReveal;
-  runScheduledReveal();
+  assert.equal(window.ignoreMouseEvents, false);
 
-  assert.equal(window.getShowCount(), 0);
+  await new Promise<void>((resolve) => {
+    setTimeout(resolve, 260);
+  });
 
-  runtime.notifyOverlayModalOpened('jimaku');
   assert.equal(window.getShowCount(), 1);
   assert.equal(window.ignoreMouseEvents, false);
-});
 
-test('sendToActiveOverlayWindow waits for modal ready-to-show before delivering open event', () => {
-  const window = createMockWindow();
-  window.contentReady = false;
-  const runtime = createOverlayModalRuntimeService({
-    getMainWindow: () => null,
-    getModalWindow: () => window as never,
-    createModalWindow: () => {
-      throw new Error('modal window should not be created when already present');
-    },
-    getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-    setModalWindowBounds: () => {},
-  });
-
-  const sent = runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-    restoreOnModalClose: 'runtime-options',
-  });
-
-  assert.equal(sent, true);
-  assert.deepEqual(window.sent, []);
-  window.emitDidFinishLoad();
-  assert.deepEqual(window.sent, []);
-
-  window.contentReady = true;
-  window.emitReadyToShow();
-  assert.deepEqual(window.sent, [['runtime-options:open']]);
-});
-
-test('sendToActiveOverlayWindow flushes every queued load and ready listener before sending', () => {
-  const window = createMockWindow();
-  window.contentReady = false;
-  const runtime = createOverlayModalRuntimeService({
-    getMainWindow: () => null,
-    getModalWindow: () => window as never,
-    createModalWindow: () => {
-      throw new Error('modal window should not be created when already present');
-    },
-    getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-    setModalWindowBounds: () => {},
-  });
-
-  assert.equal(
-    runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-      restoreOnModalClose: 'runtime-options',
-    }),
-    true,
-  );
-  assert.equal(
-    runtime.sendToActiveOverlayWindow('session-help:open', undefined, {
-      restoreOnModalClose: 'session-help',
-    }),
-    true,
-  );
-  assert.deepEqual(window.sent, []);
-
-  window.emitDidFinishLoad();
-  assert.deepEqual(window.sent, []);
-
-  window.contentReady = true;
-  window.emitReadyToShow();
-  assert.deepEqual(window.sent, [['runtime-options:open'], ['session-help:open']]);
-});
-
-test('modal reopen creates a fresh window after close destroys the previous one', () => {
-  const firstWindow = createMockWindow();
-  const secondWindow = createMockWindow();
-  let currentModal: ReturnType<typeof createMockWindow> | null = firstWindow;
-
-  const runtime = createOverlayModalRuntimeService({
-    getMainWindow: () => null,
-    getModalWindow: () => currentModal as never,
-    createModalWindow: () => {
-      currentModal = secondWindow;
-      return secondWindow as never;
-    },
-    getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-    setModalWindowBounds: () => {},
-  });
-
-  runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-    restoreOnModalClose: 'runtime-options',
-  });
-  runtime.notifyOverlayModalOpened('runtime-options');
-  runtime.handleOverlayModalClosed('runtime-options');
-
-  assert.equal(firstWindow.isDestroyed(), true);
-
-  const sent = runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-    restoreOnModalClose: 'runtime-options',
-  });
-
-  assert.equal(sent, true);
-  assert.equal(currentModal, secondWindow);
-  assert.equal(secondWindow.getShowCount(), 0);
-});
-
-test('modal reopen after close-destroy notifies state change on fresh window lifecycle', () => {
-  const firstWindow = createMockWindow();
-  const secondWindow = createMockWindow();
-  let currentModal: ReturnType<typeof createMockWindow> | null = firstWindow;
-  const state: boolean[] = [];
-
-  const runtime = createOverlayModalRuntimeService(
-    {
-      getMainWindow: () => null,
-      getModalWindow: () => currentModal as never,
-      createModalWindow: () => {
-        currentModal = secondWindow;
-        return secondWindow as never;
-      },
-      getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-      setModalWindowBounds: () => {},
-    },
-    {
-      onModalStateChange: (active: boolean): void => {
-        state.push(active);
-      },
-    },
-  );
-
-  runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-    restoreOnModalClose: 'runtime-options',
-  });
-  runtime.notifyOverlayModalOpened('runtime-options');
-  runtime.handleOverlayModalClosed('runtime-options');
-
-  assert.deepEqual(state, [true, false]);
-  assert.equal(firstWindow.isDestroyed(), true);
-
-  runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-    restoreOnModalClose: 'runtime-options',
-  });
-  runtime.notifyOverlayModalOpened('runtime-options');
-
-  assert.deepEqual(state, [true, false, true]);
-  assert.equal(currentModal, secondWindow);
-});
-
-test('visible stale modal window is made interactive again before reopening', () => {
-  const window = createMockWindow();
-  window.visible = true;
-  window.focused = true;
-  window.webContentsFocused = false;
-  window.ignoreMouseEvents = true;
-
-  const runtime = createOverlayModalRuntimeService({
-    getMainWindow: () => null,
-    getModalWindow: () => window as never,
-    createModalWindow: () => window as never,
-    getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
-    setModalWindowBounds: () => {},
-  });
-
-  const sent = runtime.sendToActiveOverlayWindow('runtime-options:open', undefined, {
-    restoreOnModalClose: 'runtime-options',
-  });
-
-  assert.equal(sent, true);
+  runtime.notifyOverlayModalOpened('jimaku');
   assert.equal(window.ignoreMouseEvents, false);
-  assert.equal(window.isFocused(), true);
-  assert.equal(window.webContentsFocused, true);
-  assert.deepEqual(window.sent, [['runtime-options:open']]);
 });
 
 test('waitForModalOpen resolves true after modal acknowledgement', async () => {
-  const modalWindow = createMockWindow();
   const runtime = createOverlayModalRuntimeService({
     getMainWindow: () => null,
-    getModalWindow: () => modalWindow as never,
-    createModalWindow: () => modalWindow as never,
+    getModalWindow: () => null,
+    createModalWindow: () => null,
     getModalGeometry: () => ({ x: 0, y: 0, width: 400, height: 300 }),
     setModalWindowBounds: () => {},
   });

src/main/overlay-runtime.ts

@@ -1,30 +1,9 @@
 import type { BrowserWindow } from 'electron';
 import type { OverlayHostedModal } from '../shared/ipc/contracts';
 import type { WindowGeometry } from '../types';
-import { OVERLAY_WINDOW_CONTENT_READY_FLAG } from '../core/services/overlay-window-flags';
 
 const MODAL_REVEAL_FALLBACK_DELAY_MS = 250;
 
-function requestOverlayApplicationFocus(): void {
-  try {
-    const electron = require('electron') as {
-      app?: {
-        focus?: (options?: { steal?: boolean }) => void;
-      };
-    };
-    electron.app?.focus?.({ steal: true });
-  } catch {
-    // Ignore focus-steal failures in non-Electron test environments.
-  }
-}
-
-function setWindowFocusable(window: BrowserWindow): void {
-  const maybeFocusableWindow = window as BrowserWindow & {
-    setFocusable?: (focusable: boolean) => void;
-  };
-  maybeFocusableWindow.setFocusable?.(true);
-}
-
 export interface OverlayWindowResolver {
   getMainWindow: () => BrowserWindow | null;
   getModalWindow: () => BrowserWindow | null;
@@ -50,12 +29,8 @@ export interface OverlayModalRuntime {
   getRestoreVisibleOverlayOnModalClose: () => Set<OverlayHostedModal>;
 }
 
-type RevealFallbackHandle = NonNullable<Parameters<typeof globalThis.clearTimeout>[0]>;
-
 export interface OverlayModalRuntimeOptions {
   onModalStateChange?: (isActive: boolean) => void;
-  scheduleRevealFallback?: (callback: () => void, delayMs: number) => RevealFallbackHandle;
-  clearRevealFallback?: (timeout: RevealFallbackHandle) => void;
 }
 
 export function createOverlayModalRuntimeService(
@@ -67,13 +42,8 @@ export function createOverlayModalRuntimeService(
   let modalActive = false;
   let mainWindowMousePassthroughForcedByModal = false;
   let mainWindowHiddenByModal = false;
-  let modalWindowPrimedForImmediateShow = false;
   let pendingModalWindowReveal: BrowserWindow | null = null;
-  let pendingModalWindowRevealTimeout: RevealFallbackHandle | null = null;
-  const scheduleRevealFallback = (callback: () => void, delayMs: number): RevealFallbackHandle =>
-    (options.scheduleRevealFallback ?? globalThis.setTimeout)(callback, delayMs);
-  const clearRevealFallback = (timeout: RevealFallbackHandle): void =>
-    (options.clearRevealFallback ?? globalThis.clearTimeout)(timeout);
+  let pendingModalWindowRevealTimeout: ReturnType<typeof setTimeout> | null = null;
 
   const notifyModalStateChange = (nextState: boolean): void => {
     if (modalActive === nextState) return;
@@ -117,21 +87,9 @@ export function createOverlayModalRuntimeService(
   };
 
   const isWindowReadyForIpc = (window: BrowserWindow): boolean => {
-    if (window.isDestroyed()) {
-      return false;
-    }
     if (window.webContents.isLoading()) {
       return false;
     }
-    const overlayWindow = window as BrowserWindow & {
-      [OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean;
-    };
-    if (
-      typeof overlayWindow[OVERLAY_WINDOW_CONTENT_READY_FLAG] === 'boolean' &&
-      overlayWindow[OVERLAY_WINDOW_CONTENT_READY_FLAG] !== true
-    ) {
-      return false;
-    }
     const currentURL = window.webContents.getURL();
     return currentURL !== '' && currentURL !== 'about:blank';
   };
@@ -151,17 +109,11 @@ export function createOverlayModalRuntimeService(
       return;
     }
 
-    let delivered = false;
-    const deliverWhenReady = (): void => {
-      if (delivered || window.isDestroyed() || !isWindowReadyForIpc(window)) {
-        return;
+    window.webContents.once('did-finish-load', () => {
+      if (!window.isDestroyed() && !window.webContents.isLoading()) {
+        sendNow(window);
       }
-      delivered = true;
-      sendNow(window);
-    };
-
-    window.webContents.once('did-finish-load', deliverWhenReady);
-    window.once('ready-to-show', deliverWhenReady);
+    });
   };
 
   const showModalWindow = (
@@ -170,8 +122,6 @@ export function createOverlayModalRuntimeService(
       passThroughMouseEvents: boolean;
     } = { passThroughMouseEvents: false },
   ): void => {
-    setWindowFocusable(window);
-    requestOverlayApplicationFocus();
     if (!window.isVisible()) {
       window.show();
     }
@@ -188,14 +138,15 @@ export function createOverlayModalRuntimeService(
   };
 
   const ensureModalWindowInteractive = (window: BrowserWindow): void => {
-    setWindowFocusable(window);
-    requestOverlayApplicationFocus();
-    window.setIgnoreMouseEvents(false);
-    elevateModalWindow(window);
-
     if (window.isVisible()) {
-      window.focus();
-      window.webContents.focus();
+      window.setIgnoreMouseEvents(false);
+      if (!window.isFocused()) {
+        window.focus();
+      }
+      if (!window.webContents.isFocused()) {
+        window.webContents.focus();
+      }
+      elevateModalWindow(window);
       return;
     }
 
@@ -215,7 +166,7 @@ export function createOverlayModalRuntimeService(
       return;
     }
 
-    clearRevealFallback(pendingModalWindowRevealTimeout);
+    clearTimeout(pendingModalWindowRevealTimeout);
     pendingModalWindowRevealTimeout = null;
     pendingModalWindowReveal = null;
   };
@@ -274,15 +225,12 @@ export function createOverlayModalRuntimeService(
       return;
     }
 
-    pendingModalWindowRevealTimeout = scheduleRevealFallback(() => {
+    pendingModalWindowRevealTimeout = setTimeout(() => {
       const targetWindow = pendingModalWindowReveal;
       clearPendingModalWindowReveal();
       if (!targetWindow || targetWindow.isDestroyed() || targetWindow.isVisible()) {
         return;
       }
-      if (!isWindowReadyForIpc(targetWindow)) {
-        return;
-      }
       showModalWindow(targetWindow, { passThroughMouseEvents: false });
     }, MODAL_REVEAL_FALLBACK_DELAY_MS);
   };
@@ -308,9 +256,9 @@ export function createOverlayModalRuntimeService(
     };
 
     if (restoreOnModalClose) {
+      restoreVisibleOverlayOnModalClose.add(restoreOnModalClose);
       const mainWindow = getTargetOverlayWindow();
       if (!preferModalWindow && mainWindow && !mainWindow.isDestroyed() && mainWindow.isVisible()) {
-        restoreVisibleOverlayOnModalClose.add(restoreOnModalClose);
         sendOrQueueForWindow(mainWindow, (window) => {
           if (payload === undefined) {
             window.webContents.send(channel);
@@ -324,23 +272,15 @@ export function createOverlayModalRuntimeService(
       const modalWindow = resolveModalWindow();
       if (!modalWindow) return false;
 
-      restoreVisibleOverlayOnModalClose.add(restoreOnModalClose);
       deps.setModalWindowBounds(deps.getModalGeometry());
       const wasVisible = modalWindow.isVisible();
       if (!wasVisible) {
-        if (modalWindowPrimedForImmediateShow && isWindowReadyForIpc(modalWindow)) {
-          showModalWindow(modalWindow);
-        } else {
-          scheduleModalWindowReveal(modalWindow);
-        }
+        scheduleModalWindowReveal(modalWindow);
       } else if (!modalWindow.isFocused()) {
         showModalWindow(modalWindow);
       }
 
       sendOrQueueForWindow(modalWindow, (window) => {
-        if (window.isVisible()) {
-          ensureModalWindowInteractive(window);
-        }
         if (payload === undefined) {
           window.webContents.send(channel);
         } else {
@@ -380,13 +320,12 @@ export function createOverlayModalRuntimeService(
     const modalWindow = deps.getModalWindow();
     if (restoreVisibleOverlayOnModalClose.size === 0) {
       clearPendingModalWindowReveal();
-      if (modalWindow && !modalWindow.isDestroyed()) {
-        modalWindow.destroy();
-      }
-      modalWindowPrimedForImmediateShow = false;
-      mainWindowMousePassthroughForcedByModal = false;
-      mainWindowHiddenByModal = false;
       notifyModalStateChange(false);
+      setMainWindowMousePassthroughForModal(false);
+      setMainWindowVisibilityForModal(false);
+      if (modalWindow && !modalWindow.isDestroyed()) {
+        modalWindow.hide();
+      }
     }
   };
 
@@ -411,7 +350,14 @@ export function createOverlayModalRuntimeService(
     }
 
     if (targetWindow.isVisible()) {
-      ensureModalWindowInteractive(targetWindow);
+      targetWindow.setIgnoreMouseEvents(false);
+      elevateModalWindow(targetWindow);
+      if (!targetWindow.isFocused()) {
+        targetWindow.focus();
+      }
+      if (!targetWindow.webContents.isFocused()) {
+        targetWindow.webContents.focus();
+      }
       return;
     }
 

src/main/overlay-visibility-runtime.ts

@@ -12,14 +12,10 @@ export interface OverlayVisibilityRuntimeDeps {
   getVisibleOverlayVisible: () => boolean;
   getForceMousePassthrough: () => boolean;
   getWindowTracker: () => BaseWindowTracker | null;
-  getLastKnownWindowsForegroundProcessName?: () => string | null;
-  getWindowsOverlayProcessName?: () => string | null;
-  getWindowsFocusHandoffGraceActive?: () => boolean;
   getTrackerNotReadyWarningShown: () => boolean;
   setTrackerNotReadyWarningShown: (shown: boolean) => void;
   updateVisibleOverlayBounds: (geometry: WindowGeometry) => void;
   ensureOverlayWindowLevel: (window: BrowserWindow) => void;
-  syncWindowsOverlayToMpvZOrder?: (window: BrowserWindow) => void;
   syncPrimaryOverlayWindowLayer: (layer: 'visible') => void;
   enforceOverlayLayerOrder: () => void;
   syncOverlayShortcuts: () => void;
@@ -40,20 +36,12 @@ export function createOverlayVisibilityRuntimeService(
 
   return {
     updateVisibleOverlayVisibility(): void {
-      const visibleOverlayVisible = deps.getVisibleOverlayVisible();
-      const forceMousePassthrough = deps.getForceMousePassthrough();
-      const windowTracker = deps.getWindowTracker();
-      const mainWindow = deps.getMainWindow();
-
       updateVisibleOverlayVisibility({
-        visibleOverlayVisible,
+        visibleOverlayVisible: deps.getVisibleOverlayVisible(),
         modalActive: deps.getModalActive(),
-        forceMousePassthrough,
-        mainWindow,
-        windowTracker,
-        lastKnownWindowsForegroundProcessName: deps.getLastKnownWindowsForegroundProcessName?.(),
-        windowsOverlayProcessName: deps.getWindowsOverlayProcessName?.() ?? null,
-        windowsFocusHandoffGraceActive: deps.getWindowsFocusHandoffGraceActive?.() ?? false,
+        forceMousePassthrough: deps.getForceMousePassthrough(),
+        mainWindow: deps.getMainWindow(),
+        windowTracker: deps.getWindowTracker(),
         trackerNotReadyWarningShown: deps.getTrackerNotReadyWarningShown(),
         setTrackerNotReadyWarningShown: (shown: boolean) => {
           deps.setTrackerNotReadyWarningShown(shown);
@@ -61,8 +49,6 @@ export function createOverlayVisibilityRuntimeService(
         updateVisibleOverlayBounds: (geometry: WindowGeometry) =>
           deps.updateVisibleOverlayBounds(geometry),
         ensureOverlayWindowLevel: (window: BrowserWindow) => deps.ensureOverlayWindowLevel(window),
-        syncWindowsOverlayToMpvZOrder: (window: BrowserWindow) =>
-          deps.syncWindowsOverlayToMpvZOrder?.(window),
         syncPrimaryOverlayWindowLayer: (layer: 'visible') =>
           deps.syncPrimaryOverlayWindowLayer(layer),
         enforceOverlayLayerOrder: () => deps.enforceOverlayLayerOrder(),

src/main/runtime/app-lifecycle-actions.test.ts

@@ -16,8 +16,6 @@ test('on will quit cleanup handler runs all cleanup steps', () => {
     unregisterAllGlobalShortcuts: () => calls.push('unregister-shortcuts'),
     stopSubtitleWebsocket: () => calls.push('stop-ws'),
     stopTexthookerService: () => calls.push('stop-texthooker'),
-    clearWindowsVisibleOverlayForegroundPollLoop: () =>
-      calls.push('clear-windows-visible-overlay-poll'),
     destroyMainOverlayWindow: () => calls.push('destroy-main-overlay-window'),
     destroyModalOverlayWindow: () => calls.push('destroy-modal-overlay-window'),
     destroyYomitanParserWindow: () => calls.push('destroy-yomitan-window'),
@@ -42,10 +40,9 @@ test('on will quit cleanup handler runs all cleanup steps', () => {
   });
 
   cleanup();
-  assert.equal(calls.length, 29);
+  assert.equal(calls.length, 28);
   assert.equal(calls[0], 'destroy-tray');
   assert.equal(calls[calls.length - 1], 'stop-discord-presence');
-  assert.ok(calls.includes('clear-windows-visible-overlay-poll'));
   assert.ok(calls.indexOf('flush-mpv-log') < calls.indexOf('destroy-socket'));
 });
 

src/main/runtime/app-lifecycle-actions.ts

@@ -6,7 +6,6 @@ export function createOnWillQuitCleanupHandler(deps: {
   unregisterAllGlobalShortcuts: () => void;
   stopSubtitleWebsocket: () => void;
   stopTexthookerService: () => void;
-  clearWindowsVisibleOverlayForegroundPollLoop: () => void;
   destroyMainOverlayWindow: () => void;
   destroyModalOverlayWindow: () => void;
   destroyYomitanParserWindow: () => void;
@@ -37,7 +36,6 @@ export function createOnWillQuitCleanupHandler(deps: {
     deps.unregisterAllGlobalShortcuts();
     deps.stopSubtitleWebsocket();
     deps.stopTexthookerService();
-    deps.clearWindowsVisibleOverlayForegroundPollLoop();
     deps.destroyMainOverlayWindow();
     deps.destroyModalOverlayWindow();
     deps.destroyYomitanParserWindow();