fix(mpv): move a pending replay pause when sub-delay changes

test(e2e): mirror AnkiConnect notesInfo and updateNoteFields in fake
notesInfo now returns one entry per requested id ({} for unknown notes), and updateNoteFields writes through so later reads see current fields.
2026-10-25 23:35:21 -07:00 · 2026-10-25 22:21:59 -07:00 · 2026-10-25 21:53:52 -07:00 · 2026-10-25 21:40:02 -07:00 · 2026-10-25 21:32:59 -07:00 · 2026-10-25 19:32:25 -07:00
76 changed files with 640 additions and 217 deletions
@@ -67,26 +67,26 @@ jobs:
      - name: Build unversioned AppImage
        run: |
          shopt -s nullglob
-          appimages=(release/SubMiner-*.AppImage)
+          appimages=(dist/release/SubMiner-*.AppImage)
          if [ "${#appimages[@]}" -eq 0 ]; then
            echo "No versioned AppImage found to create unversioned artifact."
-            ls -la release
+            ls -la dist/release
            exit 1
          fi
-          cp "${appimages[0]}" release/SubMiner.AppImage
+          cp "${appimages[0]}" dist/release/SubMiner.AppImage

      - name: Smoke packaged runtime assets
        shell: bash
-        run: xvfb-run -a bun run test:package "release/linux-unpacked/resources"
+        run: xvfb-run -a bun run test:package "dist/release/linux-unpacked/resources"

      - name: Upload AppImage artifact
        uses: actions/upload-artifact@v4
        with:
          name: appimage
          path: |
-            release/*.AppImage
-            release/latest*.yml
-            release/*.blockmap
+            dist/release/*.AppImage
+            dist/release/latest*.yml
+            dist/release/*.blockmap
          if-no-files-found: error

  build-macos:
@@ -159,17 +159,17 @@ jobs:

      - name: Smoke packaged runtime assets
        shell: bash
-        run: bun run test:package "release/mac-arm64/SubMiner.app/Contents/Resources"
+        run: bun run test:package "dist/release/mac-arm64/SubMiner.app/Contents/Resources"

      - name: Upload macOS artifacts
        uses: actions/upload-artifact@v4
        with:
          name: macos
          path: |
-            release/*.dmg
-            release/*.zip
-            release/latest*.yml
-            release/*.blockmap
+            dist/release/*.dmg
+            dist/release/*.zip
+            dist/release/latest*.yml
+            dist/release/*.blockmap
          if-no-files-found: error

  build-windows:
@@ -224,15 +224,15 @@ jobs:

      - name: Smoke packaged runtime assets
        shell: bash
-        run: bun run test:package "release/win-unpacked/resources"
+        run: bun run test:package "dist/release/win-unpacked/resources"

      - name: Upload Windows artifacts
        uses: actions/upload-artifact@v4
        with:
          name: windows
          path: |
-            release/*.exe
-            release/*.zip
-            release/latest*.yml
-            release/*.blockmap
+            dist/release/*.exe
+            dist/release/*.zip
+            dist/release/latest*.yml
+            dist/release/*.blockmap
          if-no-files-found: error
@@ -44,19 +44,19 @@ jobs:
        uses: actions/download-artifact@v4
        with:
          name: appimage
-          path: release
+          path: dist/release

      - name: Download macOS artifacts
        uses: actions/download-artifact@v4
        with:
          name: macos
-          path: release
+          path: dist/release

      - name: Download Windows artifacts
        uses: actions/download-artifact@v4
        with:
          name: windows
-          path: release
+          path: dist/release

      - name: Setup Bun
        uses: oven-sh/setup-bun@v2
@@ -90,13 +90,15 @@ jobs:

      - name: Package optional assets bundle
        run: |
-          tar -czf "release/subminer-assets.tar.gz" \
+          # Keep the archive layout stable for the AUR PKGBUILD.
+          tar -czf "dist/release/subminer-assets.tar.gz" \
+            --transform 's,^packaging/bun/licenses,resources/bun/licenses,' \
            config.example.jsonc \
            plugin/subminer \
            plugin/subminer.conf \
            assets/themes/subminer.rasi \
            assets/thumbnailers/subminer-ffmpegthumbnailer.thumbnailer \
-            resources/bun/licenses
+            packaging/bun/licenses

      - name: Package Bun corresponding source
        run: bun scripts/package-bun-source.mjs
@@ -104,16 +106,16 @@ jobs:
      - name: Generate checksums
        run: |
          shopt -s nullglob
-          files=(release/*.AppImage release/*.dmg release/*.exe release/*.zip release/*.tar.gz release/latest*.yml release/*.blockmap dist/launcher/subminer dist/launcher/subminer.cmd)
+          files=(dist/release/*.AppImage dist/release/*.dmg dist/release/*.exe dist/release/*.zip dist/release/*.tar.gz dist/release/latest*.yml dist/release/*.blockmap dist/launcher/subminer dist/launcher/subminer.cmd)
          if [ "${#files[@]}" -eq 0 ]; then
            echo "No release artifacts found for checksum generation."
            exit 1
          fi
-          : > release/SHA256SUMS.txt
+          : > dist/release/SHA256SUMS.txt
          for file in "${files[@]}"; do
            printf '%s  %s\n' \
              "$(sha256sum "$file" | awk '{print $1}')" \
-              "${file##*/}" >> release/SHA256SUMS.txt
+              "${file##*/}" >> dist/release/SHA256SUMS.txt
          done

      - name: Get version from tag
@@ -124,12 +126,12 @@ jobs:
        env:
          RELEASE_VERSION: ${{ steps.version.outputs.VERSION }}
        run: |
-          if [ ! -s release/prerelease-notes.md ]; then
-            echo "::error::release/prerelease-notes.md is missing or empty. Run 'bun run changelog:prerelease-notes --version <version>' locally and commit the file before tagging."
+          if [ ! -s packaging/release-notes/prerelease-notes.md ]; then
+            echo "::error::packaging/release-notes/prerelease-notes.md is missing or empty. Run 'bun run changelog:prerelease-notes --version <version>' locally and commit the file before tagging."
            exit 1
          fi
          if ! bun run changelog:check-prerelease-notes --version "$RELEASE_VERSION"; then
-            echo "::error::release/prerelease-notes.md was not generated for $RELEASE_VERSION. Rerun 'bun run changelog:prerelease-notes --version $RELEASE_VERSION' locally, commit, and retag."
+            echo "::error::packaging/release-notes/prerelease-notes.md was not generated for $RELEASE_VERSION. Rerun 'bun run changelog:prerelease-notes --version $RELEASE_VERSION' locally, commit, and retag."
            exit 1
          fi

@@ -142,15 +144,15 @@ jobs:

          shopt -s nullglob
          artifacts=(
-            release/*.AppImage
-            release/*.dmg
-            release/*.exe
-            release/*.zip
-            release/*.tar.gz
-            release/*.tar.gz.sha256
-            release/latest*.yml
-            release/*.blockmap
-            release/SHA256SUMS.txt
+            dist/release/*.AppImage
+            dist/release/*.dmg
+            dist/release/*.exe
+            dist/release/*.zip
+            dist/release/*.tar.gz
+            dist/release/*.tar.gz.sha256
+            dist/release/latest*.yml
+            dist/release/*.blockmap
+            dist/release/SHA256SUMS.txt
            dist/launcher/subminer
            dist/launcher/subminer.cmd
          )
@@ -165,14 +167,14 @@ jobs:
              --draft \
              --prerelease \
              --title "$RELEASE_VERSION" \
-              --notes-file release/prerelease-notes.md
+              --notes-file packaging/release-notes/prerelease-notes.md
          else
            gh release create "$RELEASE_VERSION" \
              --draft \
              --latest=false \
              --prerelease \
              --title "$RELEASE_VERSION" \
-              --notes-file release/prerelease-notes.md
+              --notes-file packaging/release-notes/prerelease-notes.md
          fi

          for asset in "${artifacts[@]}"; do
@@ -183,4 +185,4 @@ jobs:
            --draft=false \
            --prerelease \
            --title "$RELEASE_VERSION" \
-            --notes-file release/prerelease-notes.md
+            --notes-file packaging/release-notes/prerelease-notes.md
@@ -45,19 +45,19 @@ jobs:
        uses: actions/download-artifact@v4
        with:
          name: appimage
-          path: release
+          path: dist/release

      - name: Download macOS artifacts
        uses: actions/download-artifact@v4
        with:
          name: macos
-          path: release
+          path: dist/release

      - name: Download Windows artifacts
        uses: actions/download-artifact@v4
        with:
          name: windows
-          path: release
+          path: dist/release

      - name: Setup Bun
        uses: oven-sh/setup-bun@v2
@@ -91,13 +91,15 @@ jobs:

      - name: Package optional assets bundle
        run: |
-          tar -czf "release/subminer-assets.tar.gz" \
+          # Keep the archive layout stable for the AUR PKGBUILD.
+          tar -czf "dist/release/subminer-assets.tar.gz" \
+            --transform 's,^packaging/bun/licenses,resources/bun/licenses,' \
            config.example.jsonc \
            plugin/subminer \
            plugin/subminer.conf \
            assets/themes/subminer.rasi \
            assets/thumbnailers/subminer-ffmpegthumbnailer.thumbnailer \
-            resources/bun/licenses
+            packaging/bun/licenses

      - name: Package Bun corresponding source
        run: bun scripts/package-bun-source.mjs
@@ -105,16 +107,16 @@ jobs:
      - name: Generate checksums
        run: |
          shopt -s nullglob
-          files=(release/*.AppImage release/*.dmg release/*.exe release/*.zip release/*.tar.gz release/latest*.yml release/*.blockmap dist/launcher/subminer dist/launcher/subminer.cmd)
+          files=(dist/release/*.AppImage dist/release/*.dmg dist/release/*.exe dist/release/*.zip dist/release/*.tar.gz dist/release/latest*.yml dist/release/*.blockmap dist/launcher/subminer dist/launcher/subminer.cmd)
          if [ "${#files[@]}" -eq 0 ]; then
            echo "No release artifacts found for checksum generation."
            exit 1
          fi
-          : > release/SHA256SUMS.txt
+          : > dist/release/SHA256SUMS.txt
          for file in "${files[@]}"; do
            printf '%s  %s\n' \
              "$(sha256sum "$file" | awk '{print $1}')" \
-              "${file##*/}" >> release/SHA256SUMS.txt
+              "${file##*/}" >> dist/release/SHA256SUMS.txt
          done

      - name: Get version from tag
@@ -152,24 +154,24 @@ jobs:
            gh release edit "$RELEASE_VERSION" \
              --draft=false \
              --title "$RELEASE_VERSION" \
-              --notes-file release/release-notes.md
+              --notes-file packaging/release-notes/release-notes.md
          else
            gh release create "$RELEASE_VERSION" \
              --title "$RELEASE_VERSION" \
-              --notes-file release/release-notes.md
+              --notes-file packaging/release-notes/release-notes.md
          fi

          shopt -s nullglob
          artifacts=(
-            release/*.AppImage
-            release/*.dmg
-            release/*.exe
-            release/*.zip
-            release/*.tar.gz
-            release/*.tar.gz.sha256
-            release/latest*.yml
-            release/*.blockmap
-            release/SHA256SUMS.txt
+            dist/release/*.AppImage
+            dist/release/*.dmg
+            dist/release/*.exe
+            dist/release/*.zip
+            dist/release/*.tar.gz
+            dist/release/*.tar.gz.sha256
+            dist/release/latest*.yml
+            dist/release/*.blockmap
+            dist/release/SHA256SUMS.txt
            dist/launcher/subminer
            dist/launcher/subminer.cmd
          )
@@ -8,11 +8,6 @@ node_modules/
 # Electron build output
 out/
 dist/
-release/*
-!release/
-!release/release-notes.md
-!release/prerelease-notes.md
-build/yomitan/
 coverage/

 # Launcher build artifact (produced by make build-launcher)
@@ -20,8 +15,6 @@ coverage/
 /main-entry.js
 /main-entry.js.map

-/build/hachidori/
-
 # Logs
 *.log
 npm-debug.log*
@@ -43,6 +36,7 @@ environment.toml
 .vitepress/dist/
 docs/.vitepress/cache/
 docs/.vitepress/dist/
+# Local test media and scripts
 tests/*
 .worktrees/
 .tmp/
@@ -1,7 +1,9 @@
 node_modules
 dist
-release
 coverage
 vendor
 *.log
 src/core/services/tokenizer/__fixtures__/golden/*.json
+# Reviewed release text and vendored license texts; never reformat
+packaging/release-notes
+packaging/bun/licenses
@@ -1,5 +0,0 @@
-{
-  "printWidth": 100,
-  "singleQuote": true,
-  "trailingComma": "all"
-}
@@ -21,11 +21,10 @@ MACOS_DATA_DIR ?= $(HOME)/Library/Application Support/SubMiner
 MACOS_APP_DIR ?= $(HOME)/Applications
 MACOS_APP_DEST ?= $(MACOS_APP_DIR)/SubMiner.app

-# If building from source, the AppImage will typically land in release/.
-APPIMAGE_SRC = $(firstword $(wildcard release/SubMiner-*.AppImage))
-MACOS_APP_SRC = $(firstword $(wildcard release/*.app release/*/*.app))
-MACOS_ZIP_SRC = $(firstword $(wildcard release/SubMiner-*.zip))
-PRERELEASE_NOTES := release/prerelease-notes.md
+# If building from source, the AppImage will typically land in dist/release/.
+APPIMAGE_SRC = $(firstword $(wildcard dist/release/SubMiner-*.AppImage))
+MACOS_APP_SRC = $(firstword $(wildcard dist/release/*.app dist/release/*/*.app))
+MACOS_ZIP_SRC = $(firstword $(wildcard dist/release/SubMiner-*.zip))

 UNAME_S := $(shell uname -s 2>/dev/null || echo Unknown)
 ifeq ($(OS),Windows_NT)
@@ -57,7 +56,7 @@ help:
 		"  build-linux      Build Linux AppImage" \
 		"  build-macos      Build macOS DMG/ZIP (signed if configured)" \
 		"  build-macos-unsigned Build macOS DMG/ZIP without signing/notarization" \
-		"  clean            Remove build artifacts (dist/, release/, AppImage, binary)" \
+		"  clean            Remove build artifacts (dist/, AppImage, binary)" \
 		"  dev-start        Build and launch local Electron app" \
 		"  dev-start-macos  Build and launch local Electron app with macOS tracker backend" \
 		"  dev-watch        Start fast watch loop (tsc + renderer + Electron dev app)" \
@@ -165,15 +164,7 @@ build-launcher:

 clean:
 	@printf '%s\n' "[INFO] Removing build artifacts"
-	@if [ -f "$(PRERELEASE_NOTES)" ]; then \
-		PRERELEASE_NOTES_BACKUP="$$(mktemp -t subminer-prerelease-notes.XXXXXX)" && \
-		cp "$(PRERELEASE_NOTES)" "$$PRERELEASE_NOTES_BACKUP" && \
-		rm -rf dist release && \
-		install -d release && \
-		mv "$$PRERELEASE_NOTES_BACKUP" "$(PRERELEASE_NOTES)"; \
-	else \
-		rm -rf dist release; \
-	fi
+	@rm -rf dist
 	@rm -f "$(BINDIR)/subminer" "$(BINDIR)/SubMiner.AppImage"

 generate-config: ensure-bun
@@ -229,7 +220,7 @@ install-linux: build-launcher
 	@if [ -n "$(APPIMAGE_SRC)" ]; then \
 		install -m 0755 "$(APPIMAGE_SRC)" "$(BINDIR)/SubMiner.AppImage"; \
 	else \
-		printf '%s\n' "[WARN] No release/SubMiner-*.AppImage found; skipping AppImage install"; \
+		printf '%s\n' "[WARN] No dist/release/SubMiner-*.AppImage found; skipping AppImage install"; \
 		printf '%s\n' "       Build one with: make build"; \
 	fi
 	@printf '%s\n' "Installed to:" "  $(BINDIR)/subminer" "  $(LINUX_DATA_DIR)/themes/$(THEME_FILE)" "  $(LINUX_DATA_DIR)/thumbnailers/$(THUMBNAILER_FILE)"
@@ -252,7 +243,7 @@ install-macos: build-launcher
 		ditto -x -k "$(MACOS_ZIP_SRC)" "$(MACOS_APP_DIR)"; \
 		printf '%s\n' "[INFO] Installed app bundle from $(MACOS_ZIP_SRC)"; \
 	else \
-		printf '%s\n' "[WARN] No macOS app bundle or zip found in release/; skipping app install"; \
+		printf '%s\n' "[WARN] No macOS app bundle or zip found in dist/release/; skipping app install"; \
 		printf '%s\n' "       Build one with: make build"; \
 	fi
 	@printf '%s\n' "Installed to:" "  $(BINDIR)/subminer" "  $(MACOS_DATA_DIR)/themes/$(THEME_FILE)" "  $(MACOS_APP_DEST)"
@@ -38,7 +38,7 @@ Yomitan remains the default. Select the bundled Hachidori backend with `dictiona
 Create an Anki card from the exact playback moment with one key press, click, or controller input. SubMiner fills in the sentence, an audio clip, and a screenshot or animated image.

 <div align="center">
-  <img src="docs-site/public/screenshots/one-key-mining.png" width="800" alt="Anki card created from SubMiner with sentence, audio, and screenshot">
+  <img src="docs-site/public/screenshots/one-key-mining.png" width="800" alt="Yomitan lookup over an anime scene with Anki mining controls">
 </div>

 <br>
@@ -48,7 +48,7 @@ Create an Anki card from the exact playback moment with one key press, click, or
 Subtitles are annotated as they play with frequency highlighting, JLPT tags, N+1 targeting, and character names from a generated dictionary. Particles and grammar-only tokens stay plain so the words worth learning stand out.

 <div align="center">
-  <img src="docs-site/public/screenshots/annotations.png" width="800" alt="Annotated subtitles with frequency coloring, JLPT underlines, and N+1 targets">
+  <img src="docs-site/public/screenshots/annotations.png" width="800" alt="Annotated subtitles with frequency colors, character portraits, and JLPT underlines">
 </div>

 <br>
@@ -44,11 +44,11 @@ How fragments turn into a release:
 - The polish step treats pending fragments as the final release outcome, not prerelease history. If a feature is added and then renamed or fixed before the stable cut, ship the final feature bullet instead of separate prerelease-only breaking/fix entries.
 - `CHANGELOG.md`, GitHub release notes, and prerelease notes all use one item per feature or area, inline by default: `- **Name**: one or two short sentences.` Items with several separate changes may use a few short nested bullets instead of a run-on sentence. Items say what changed and how to reach it; implementation details, edge cases, and step-by-step usage belong in the docs, not the release body.
 - `internal` fragments stay in `CHANGELOG.md` (inside a collapsed `<details>` block) but are dropped from the GitHub release notes entirely.
- The polished `CHANGELOG.md` and `release/release-notes.md` are committed and reviewed before tagging — edit the Markdown by hand if Claude misses something.
+- The polished `CHANGELOG.md` and `packaging/release-notes/release-notes.md` are committed and reviewed before tagging — edit the Markdown by hand if Claude misses something.

 Prerelease notes:

- prerelease tags like `v0.11.3-beta.1` and `v0.11.3-rc.1` reuse the current pending fragments to generate `release/prerelease-notes.md`
+- prerelease tags like `v0.11.3-beta.1` and `v0.11.3-rc.1` reuse the current pending fragments to generate `packaging/release-notes/prerelease-notes.md`
 - from the second prerelease of a base version onward, the notes also open with a `## Changes since <previous tag>` section generated from the fragment diff against the previous beta/RC tag; keep fragment edits meaningful. Editorial-only rewording is filtered out of that section, while genuinely changed behavior and deleted fragments (reverted changes) are reported
 - existing prerelease notes are a reviewed baseline; later prerelease runs should replace stale beta/RC wording with the current outcome instead of appending fix churn
 - prerelease note generation does not consume fragments and does not update `CHANGELOG.md` or `docs-site/changelog.md`
@@ -0,0 +1,4 @@
+type: fixed
+area: subtitles
+
+- mpv's manual subtitle retiming (`sub-delay`, z/x and sub-step) now carries through SubMiner: mined card audio, images, and timestamps clip the retimed line, and the subtitle sidebar highlight, click-to-seek, subtitle navigation, overlay line matching, and replay pause point all follow the retimed timing.
@@ -0,0 +1,4 @@
+type: docs
+area: readme
+
+- Refreshed the README's anime screenshots using the current SubMiner build.
@@ -0,0 +1,5 @@
+type: internal
+area: build
+
+- Moved packaging inputs (electron-builder resources, Bun runtime manifests and licenses, committed release notes) under `packaging/`.
+- Build output now lands in `dist/`: packaged apps in `dist/release/`, staged Yomitan and Hachidori in `dist/yomitan/` and `dist/hachidori/`.
@@ -0,0 +1,4 @@
+type: fixed
+area: overlay
+
+- mpv keys and mouse buttons (such as `9`/`0` volume and double-click fullscreen) pass through the overlay again while the subtitle sidebar is open; only input inside the sidebar stays with it.
@@ -226,7 +226,7 @@ make deps
 make build-macos
 ```

-The `.dmg` and `.zip` land in `release/`. For an unsigned local build, run `bun run build:mac:unsigned`.
+The `.dmg` and `.zip` land in `dist/release/`. For an unsigned local build, run `bun run build:mac:unsigned`.

 </details>

@@ -86,7 +86,7 @@ SubMiner detected that a previously non-empty Yomitan profile suddenly appears e

 ## "Yomitan extension not found in any search path"

-The bundled Yomitan is missing. Re-download the AppImage, or place an unpacked Yomitan extension in `~/.config/SubMiner/yomitan`. Source builds must run `bun run build` first to produce `build/yomitan`.
+The bundled Yomitan is missing. Re-download the AppImage, or place an unpacked Yomitan extension in `~/.config/SubMiner/yomitan`. Source builds must run `bun run build` first to produce `dist/yomitan`.

 ## "MeCab not found on system"

@@ -54,10 +54,10 @@ files before signing and generating updater hashes, never from a signed app.
 4. Bump `package.json` to the release version.
 5. Build release metadata before tagging (this calls `claude -p` locally):
   `bun run changelog:build --version <version> --date <yyyy-mm-dd>`
-   - The polished `CHANGELOG.md` and `release/release-notes.md` are committed
+   - The polished `CHANGELOG.md` and `packaging/release-notes/release-notes.md` are committed
     before tagging. Release CI no longer auto-builds the changelog; it fails
     fast if `changes/*.md` fragments are still present on a tag-based run.
-6. Review `CHANGELOG.md` and `release/release-notes.md`. Edit by hand if Claude
+6. Review `CHANGELOG.md` and `packaging/release-notes/release-notes.md`. Edit by hand if Claude
   missed something — the committed Markdown is what ships.
 7. Run release gate locally:
   `bun run changelog:check --version <version>`
@@ -73,9 +73,9 @@ files before signing and generating updater hashes, never from a signed app.
   `bun-v<version>-source.tar.gz` plus its `.sha256` file. The script
   fails if Bun's CMake dependency pins, WebKit pin, source checksums, patch
   inputs, or collected license files differ from
-   `build/bun-source-manifest.json`.
+   `packaging/bun/bun-source-manifest.json`.
   When validating auto-update metadata, also run the relevant platform package
-   build and confirm `release/` contains the generated updater metadata
+   build and confirm `dist/release/` contains the generated updater metadata
   (`latest*.yml`) and blockmaps (`*.blockmap`).
 8. If `docs-site/` changed, also run:
   `bun run docs:test`
@@ -103,9 +103,9 @@ files before signing and generating updater hashes, never from a signed app.
   source archive. A missing source repository or license file fails the
   release instead of publishing only the executable.
   When validating packaged updater output, confirm the platform build writes
-   `latest*.yml` and `*.blockmap` files under `release/`.
+   `latest*.yml` and `*.blockmap` files under `dist/release/`.
 5. Commit the prerelease prep (package.json version bump + the generated
-   `release/prerelease-notes.md`). CI does not regenerate notes — it uses the
+   `packaging/release-notes/prerelease-notes.md`). CI does not regenerate notes — it uses the
   committed file — so review it before committing. Rerun
   `bun run changelog:prerelease-notes --version <version>` for every later
   beta/RC, even if no fragments changed: the notes carry a hidden
@@ -128,14 +128,14 @@ Notes:
 - Supported prerelease channels are `beta` and `rc`, with versions like `0.11.3-beta.1` and `0.11.3-rc.1`.
 - Pass `--date` explicitly when you want the release stamped with the local cut date; otherwise the generator uses the current ISO date, which can roll over to the next UTC day late at night.
 - `changelog:check` now rejects tag/package version mismatches.
- `changelog:prerelease-notes` also rejects tag/package version mismatches and writes `release/prerelease-notes.md` without mutating tracked changelog files. When that file already exists, the generator includes it in the Claude prompt so later beta/RC notes reuse the reviewed text instead of starting over.
+- `changelog:prerelease-notes` also rejects tag/package version mismatches and writes `packaging/release-notes/prerelease-notes.md` without mutating tracked changelog files. When that file already exists, the generator includes it in the Claude prompt so later beta/RC notes reuse the reviewed text instead of starting over.
 - From the second prerelease of a base version onward, the notes open with a `## Changes since <previous tag>` section above the cumulative `## Highlights`. The generator locates the newest preceding beta/RC tag for the same base version (semver order: all betas before all RCs), diffs `changes/*.md` between that tag and the working tree, and asks Claude to describe only the behavioral beta-to-beta differences — added fragments as new changes, modified fragments by their before/after difference (editorial-only edits are dropped), deleted fragments as removed/reverted changes. If no fragments changed (for example a packaging-only rebuild), the section states that explicitly without a Claude call. The delta section carries no separate contributor attribution; `## What's Changed` stays cumulative like `## Highlights`.
 - `changelog:check-prerelease-notes --version <version>` verifies the committed notes' `prerelease-version` marker matches the version being tagged; the prerelease workflow runs it and fails the release on stale notes.
- `changelog:build` generates `CHANGELOG.md` + `release/release-notes.md` (both polished by `claude -p`) and removes the released `changes/*.md` fragments. The CHANGELOG keeps internal notes inside a `<details><summary>Internal changes</summary>` collapse; the release notes drop them entirely.
- `release/release-notes.md` (and `release/prerelease-notes.md`) include GitHub-style attribution after `## Highlights`: a `## What's Changed` list crediting each released fragment as `by @<author> in #<pr>`, plus a `## New Contributors` section for first-time authors. Attribution is resolved per fragment via `git log` (the commit that added the fragment) + `gh api .../commits/<sha>/pulls`, with one `gh` search per author for the first-contribution check. It needs `gh` installed and authenticated; if `gh` is unavailable or a lookup fails, the generator warns and emits notes without the attribution sections rather than failing. The CHANGELOG itself stays attribution-free.
+- `changelog:build` generates `CHANGELOG.md` + `packaging/release-notes/release-notes.md` (both polished by `claude -p`) and removes the released `changes/*.md` fragments. The CHANGELOG keeps internal notes inside a `<details><summary>Internal changes</summary>` collapse; the release notes drop them entirely.
+- `packaging/release-notes/release-notes.md` (and `packaging/release-notes/prerelease-notes.md`) include GitHub-style attribution after `## Highlights`: a `## What's Changed` list crediting each released fragment as `by @<author> in #<pr>`, plus a `## New Contributors` section for first-time authors. Attribution is resolved per fragment via `git log` (the commit that added the fragment) + `gh api .../commits/<sha>/pulls`, with one `gh` search per author for the first-contribution check. It needs `gh` installed and authenticated; if `gh` is unavailable or a lookup fails, the generator warns and emits notes without the attribution sections rather than failing. The CHANGELOG itself stays attribution-free.
 - The release workflow no longer auto-runs `changelog:build`. If pending `changes/*.md` fragments are present on a tag-based run, CI exits with a clear `::error::` pointing at the local fix. Run `bun run changelog:build --version <version>` locally, commit the polished output, then tag.
 - Do not tag while `changes/*.md` fragments still exist.
- Prerelease tags intentionally keep `changes/*.md` fragments in place so multiple prereleases can reuse the same cumulative pending notes until the final stable cut. `make clean` preserves `release/prerelease-notes.md` while deleting generated build artifacts.
+- Prerelease tags intentionally keep `changes/*.md` fragments in place so multiple prereleases can reuse the same cumulative pending notes until the final stable cut.
 - If you need to repair a published release body (for example, a prior version’s section was omitted), regenerate notes from `CHANGELOG.md` and re-edit the release with `gh release edit --notes-file`.
 - Prerelease tags are handled by `.github/workflows/prerelease.yml`, which always publishes a GitHub prerelease with all current release platforms and never runs the AUR sync job.
 - CI, stable release, and prerelease workflows call the shared `.github/workflows/quality-gate.yml`; update that reusable workflow when changing common test coverage. Its environment suite includes the Lua mpv plugin tests.
@@ -62,7 +62,7 @@ bun run docs:build
  then `bun run test:e2e` (see [Headless End-to-End Harness](#headless-end-to-end-harness))
 - Build/release scripts (`scripts/**`): `bun run test:scripts`
 - Packaging: build the platform package, then run `bun run test:package <resources-directory>`.
-  On headless Linux: `xvfb-run -a bun run test:package release/linux-unpacked/resources`.
+  On headless Linux: `xvfb-run -a bun run test:package dist/release/linux-unpacked/resources`.
  Content checks run inside the electron-builder afterPack hook. See the
  [release guide](../RELEASING.md#package-contents-checks) for the
  installed-app verification checklist.
@@ -37,10 +37,12 @@ function isRecord(value: unknown): value is Record<string, unknown> {
  return typeof value === 'object' && value !== null && !Array.isArray(value);
 }

-// A recording AnkiConnect stand-in: an empty collection with one deck and one
-// Lapis-shaped note type. Scenarios assert on `requests`, not on stored notes.
+// A recording AnkiConnect stand-in: one deck and one Lapis-shaped note type.
+// Added notes (with later `updateNoteFields` writes) are echoed back by `notesInfo`
+// so the app can resolve their fields; scenarios still assert on `requests`.
 export async function startFakeAnki(): Promise<FakeAnki> {
  const requests: AnkiRequest[] = [];
+  const addedNotes = new Map<number, Record<string, unknown>>();
  let nextNoteId = 1000;

  const handle = (body: unknown): unknown => {
@@ -59,10 +61,38 @@ export async function startFakeAnki(): Promise<FakeAnki> {
        return [FAKE_ANKI_MODEL];
      case 'modelFieldNames':
        return MODEL_FIELDS;
-      case 'addNote':
-        return nextNoteId++;
+      case 'addNote': {
+        const noteId = nextNoteId++;
+        const note = isRecord(params.note) ? params.note : {};
+        addedNotes.set(noteId, isRecord(note.fields) ? { ...note.fields } : {});
+        return noteId;
+      }
+      case 'updateNoteFields': {
+        const note = isRecord(params.note) ? params.note : {};
+        const fields = typeof note.id === 'number' ? addedNotes.get(note.id) : undefined;
+        if (fields && isRecord(note.fields)) Object.assign(fields, note.fields);
+        return null;
+      }
+      case 'notesInfo': {
+        // Like AnkiConnect: one entry per requested id, `{}` for unknown notes.
+        const ids = Array.isArray(params.notes) ? params.notes : [];
+        return ids.map((id) => {
+          const fields = typeof id === 'number' ? addedNotes.get(id) : undefined;
+          if (!fields) return {};
+          return {
+            noteId: id,
+            modelName: FAKE_ANKI_MODEL,
+            tags: [],
+            fields: Object.fromEntries(
+              MODEL_FIELDS.map((name, order) => [
+                name,
+                { value: String(fields[name] ?? ''), order },
+              ]),
+            ),
+          };
+        });
+      }
      case 'findNotes':
-      case 'notesInfo':
        return [];
      case 'storeMediaFile':
        return params.filename ?? null;
@@ -91,6 +91,14 @@ async function showCue(cue: (typeof FIXTURE_CUES)[number]): Promise<RenderedToke
    });
 }

+// Card-kind flags are written before media, so wait for the update carrying audio.
+function findMediaUpdate(session: E2eSession) {
+  return session.anki.requests.find(
+    (request) =>
+      request.action === 'updateNoteFields' && JSON.stringify(request.params).includes('[sound:'),
+  );
+}
+
 function hasToken(tokens: RenderedToken[], surface: string, headword: string): boolean {
  return tokens.some((token) => token.surface === surface && token.headword === headword);
 }
@@ -126,10 +134,10 @@ test(
    session.anki.requests.length = 0;

    await session.runAppCommand('--mine-sentence');
-    const update = await waitUntil(
-      () => session.anki.requests.find((request) => request.action === 'updateNoteFields'),
-      { description: 'media fields to be written to the mined note', timeoutMs: 30_000 },
-    );
+    const update = await waitUntil(() => findMediaUpdate(session), {
+      description: 'media fields to be written to the mined note',
+      timeoutMs: 30_000,
+    });

    const added = session.anki.requests.filter((request) => request.action === 'addNote');
    assert.equal(added.length, 1);
@@ -156,6 +164,38 @@ test(
  },
 );

+test(
+  'mining a line retimed with sub-delay clips it where mpv plays it',
+  { timeout: TEST_TIMEOUT_MS },
+  async () => {
+    const { session, overlay } = await useSession();
+    const cue = FIXTURE_CUES[1];
+    const delay = 2;
+    await session.mpv.command('set_property', 'sub-delay', delay);
+    try {
+      // Past the cue's own end, so the line is only on screen because of the delay.
+      await session.mpv.command('seek', cue.end + delay / 2, 'absolute+exact');
+      await overlay.waitFor(
+        `document.getElementById('subtitleRoot').textContent === ${JSON.stringify(cue.text)}`,
+        { description: 'overlay to show the delayed line' },
+      );
+      session.anki.requests.length = 0;
+
+      await session.runAppCommand('--mine-sentence');
+      await waitUntil(() => findMediaUpdate(session), {
+        description: 'media fields to be written to the mined note',
+        timeoutMs: 30_000,
+      });
+
+      // MiscInfo stamps the clip start: the cue's start on the video clock.
+      const written = JSON.stringify(session.anki.requests);
+      assert.ok(written.includes(`(00:00:0${cue.start + delay})`), written);
+    } finally {
+      await session.mpv.command('set_property', 'sub-delay', 0);
+    }
+  },
+);
+
 test(
  'open subtitle sidebar lists the parsed cues and follows playback',
  { timeout: TEST_TIMEOUT_MS },
@@ -184,6 +224,49 @@ test(
  },
 );

+test(
+  'subtitle sidebar follows and seeks a sub-delay retimed track',
+  { timeout: TEST_TIMEOUT_MS },
+  async () => {
+    const { session, overlay } = await useSession();
+    const delay = 2;
+    await session.mpv.command('set_property', 'sub-delay', delay);
+    try {
+      // At 9s cue 2 starts on the file's clock, but mpv is still showing cue 1.
+      await session.mpv.command('seek', FIXTURE_CUES[2].start, 'absolute+exact');
+      await overlay.waitFor(
+        `document.getElementById('subtitleRoot').textContent === ${JSON.stringify(FIXTURE_CUES[1].text)}`,
+        { description: 'overlay to show the delayed line' },
+      );
+      await session.runAppCommand('--toggle-subtitle-sidebar');
+      await overlay.waitFor(
+        `document.querySelector('#subtitleSidebarList .subtitle-sidebar-item.active')?.dataset.index === '1'`,
+        { description: 'sidebar to highlight the delayed line' },
+      );
+
+      await overlay.evaluate(
+        `document.querySelector('#subtitleSidebarList .subtitle-sidebar-item[data-index="2"]').click()`,
+      );
+      const target = FIXTURE_CUES[2].start + delay;
+      await waitUntil(
+        async () => {
+          const time = Number(await session.mpv.command('get_property', 'time-pos'));
+          return time >= target && time < target + 0.5;
+        },
+        { description: `click to seek to cue 2 at ${target}s on the video clock` },
+      );
+
+      await session.runAppCommand('--toggle-subtitle-sidebar');
+      await overlay.waitFor(
+        `document.getElementById('subtitleSidebarModal').classList.contains('hidden')`,
+        { description: 'sidebar to close' },
+      );
+    } finally {
+      await session.mpv.command('set_property', 'sub-delay', 0);
+    }
+  },
+);
+
 // Runs last: it leaves the lookup popup open over the overlay.
 test(
  'holding Shift over a word opens the Yomitan popup with its dictionary entry',
@@ -146,7 +146,8 @@
    "afterPack": "scripts/electron-builder-after-pack.cjs",
    "icon": "assets/SubMiner-square.png",
    "directories": {
-      "output": "release"
+      "buildResources": "packaging/electron-builder",
+      "output": "dist/release"
    },
    "publish": [
      {
@@ -178,8 +179,8 @@
      "category": "public.app-category.video",
      "icon": "assets/SubMiner-square.png",
      "hardenedRuntime": true,
-      "entitlements": "build/entitlements.mac.plist",
-      "entitlementsInherit": "build/entitlements.mac.plist",
+      "entitlements": "packaging/electron-builder/entitlements.mac.plist",
+      "entitlementsInherit": "packaging/electron-builder/entitlements.mac.plist",
      "extraResources": [
        {
          "from": "dist/scripts/get-mpv-window-macos",
@@ -211,7 +212,7 @@
      "oneClick": false,
      "perMachine": false,
      "allowToChangeInstallationDirectory": true,
-      "include": "build/installer.nsh"
+      "include": "packaging/electron-builder/installer.nsh"
    },
    "files": [
      "dist/**/*",
@@ -225,17 +226,18 @@
      "!**/{test,tests,__tests__,fixture,fixtures,__fixtures__}{,/**/*}",
      "!dist/launcher{,/**/*}",
      "!dist/scripts{,/**/*}",
+      "!dist/{yomitan,hachidori,release}{,/**/*}",
      "!dist/{renderer,settings,syncui}/fonts{,/**/*}",
      "!node_modules/koffi/{src,vendor,doc}{,/**/*}",
      "!node_modules/@libsql/linux-x64-musl{,/**/*}"
    ],
    "extraResources": [
      {
-        "from": "build/yomitan",
+        "from": "dist/yomitan",
        "to": "yomitan"
      },
      {
-        "from": "build/hachidori",
+        "from": "dist/hachidori",
        "to": "hachidori"
      },
      {
@@ -277,6 +279,11 @@
      }
    ]
  },
+  "prettier": {
+    "printWidth": 100,
+    "singleQuote": true,
+    "trailingComma": "all"
+  },
  "patchedDependencies": {
    "@discordjs/rest@2.6.1": "patches/@discordjs%2Frest@2.6.1.patch"
  }
@@ -26,6 +26,6 @@
    }
  },
  "licenseInventoryStatus": "source-and-notices-pinned-to-binary-revision",
-  "sourceManifest": "build/bun-source-manifest.json",
+  "sourceManifest": "packaging/bun/bun-source-manifest.json",
  "correspondingSourceAsset": "bun-v1.3.5-source.tar.gz"
 }
@@ -10,7 +10,7 @@ The SubMiner GitHub release containing this application also contains `bun-v1.3.
 - every external source repository registered by that Bun revision's CMake build, at its exact commit
 - Bun's dependency patches, build scripts, lockfiles, collected third-party license files, and instructions for rebuilding Bun against a modified JavaScriptCore

-The machine-readable inventory lives at `SOURCE-INVENTORY.json` inside the source archive and at `build/bun-source-manifest.json` in SubMiner's source repository.
+The machine-readable inventory lives at `SOURCE-INVENTORY.json` inside the source archive and at `packaging/bun/bun-source-manifest.json` in SubMiner's source repository.

 The archive vendors the source repositories linked through Bun's CMake build. It preserves Bun's package-manager lockfiles and lol-html's `Cargo.lock`, but it does not vendor npm packages, crates.io packages, compilers, SDKs, or other build tools. Rebuilding needs network access for those package-manager and toolchain inputs. The archive's rebuild README records the known tool versions and the remaining unpinned Rust nightly input.

@@ -1,6 +1,6 @@
 # Bun 1.3.5 third-party notices

-This file collects the license texts shipped by the external source repositories used by Bun 1.3.5 at the revisions in build/bun-source-manifest.json. The corresponding-source release asset also preserves license notices embedded in individual Bun and WebKit source files. Bun’s own LICENSE.md lists additional embedded libraries and JavaScript polyfills whose source and per-file notices are included in that asset.
+This file collects the license texts shipped by the external source repositories used by Bun 1.3.5 at the revisions in packaging/bun/bun-source-manifest.json. The corresponding-source release asset also preserves license notices embedded in individual Bun and WebKit source files. Bun’s own LICENSE.md lists additional embedded libraries and JavaScript polyfills whose source and per-file notices are included in that asset.

 ## BoringSSL

@@ -203,7 +203,7 @@ test('writeChangelogArtifacts ignores README, groups fragments by type, writes r
      assert.match(changelog, /### Fixed\n- Polished: fixed entry\./);
      assert.match(changelog, /## v0\.4\.0 \(2026-03-01\)\n- Existing fix\n$/);

-      const releaseNotes = project.read('release/release-notes.md');
+      const releaseNotes = project.read('packaging/release-notes/release-notes.md');
      assert.match(releaseNotes, /## Highlights\n### Added\n- Polished: added entry\./);
      assert.match(releaseNotes, /### Fixed\n- Polished: fixed entry\./);
      assert.match(releaseNotes, /## Installation\n\nSee the README and docs\/installation guide/);
@@ -240,7 +240,7 @@ test('writeChangelogArtifacts skips changelog prepend when release section alrea
      assert.equal(project.exists('changes/001.md'), false);
      assert.equal(project.read('CHANGELOG.md'), existingChangelog);
      assert.match(
-        project.read('release/release-notes.md'),
+        project.read('packaging/release-notes/release-notes.md'),
        /## Highlights\n### Added\n- Existing release bullet\./,
      );
    },
@@ -268,7 +268,7 @@ test('writeStableReleaseArtifacts reuses the requested version and date for chan
      });

      assert.deepEqual(result.outputPaths, [project.at('CHANGELOG.md')]);
-      assert.equal(result.releaseNotesPath, project.at('release/release-notes.md'));
+      assert.equal(result.releaseNotesPath, project.at('packaging/release-notes/release-notes.md'));
      assert.equal(result.docsChangelogPath, project.at('docs-site/changelog.md'));

      assert.match(project.read('CHANGELOG.md'), /## v0\.4\.1 \(2026-03-07\)/);
@@ -471,7 +471,7 @@ test('writePrereleaseNotesForVersion writes cumulative beta notes without mutati
        deps: { runClaude: stub.runClaude, listPrereleaseTags: () => [] },
      });

-      assert.equal(outputPath, project.at('release/prerelease-notes.md'));
+      assert.equal(outputPath, project.at('packaging/release-notes/prerelease-notes.md'));
      assert.equal(
        project.read('CHANGELOG.md'),
        existingChangelog,
@@ -527,7 +527,7 @@ test('writePrereleaseNotesForVersion reuses existing prerelease notes when addin
    'prerelease-reuse-existing-notes',
    {
      'package.json': packageJson('0.11.3-beta.2'),
-      'release/prerelease-notes.md': existingNotes,
+      'packaging/release-notes/prerelease-notes.md': existingNotes,
      'changes/001.md': fragment('fixed', 'launcher', '- Fixed launcher prerelease packaging.'),
    },
    (project) => {
@@ -574,7 +574,7 @@ test('writePrereleaseNotesForVersion ignores unmarked prerelease notes from an o
    'prerelease-ignore-unmarked-old-notes',
    {
      'package.json': packageJson('0.17.0-beta.1'),
-      'release/prerelease-notes.md': existingNotes,
+      'packaging/release-notes/prerelease-notes.md': existingNotes,
      'changes/001.md': fragment(
        'changed',
        'overlay',
@@ -785,7 +785,7 @@ test('writeChangelogArtifacts filters internal fragments from the release-notes
        'release-notes mode drops internal fragments',
      );

-      const releaseNotes = project.read('release/release-notes.md');
+      const releaseNotes = project.read('packaging/release-notes/release-notes.md');
      assert.doesNotMatch(releaseNotes, /<details>/);
      assert.doesNotMatch(releaseNotes, /### Internal/);
      assert.match(
@@ -841,7 +841,7 @@ test('writeChangelogArtifacts appends contributor attribution and a new-contribu
        project.at('changes/002.md'),
      ]);

-      const releaseNotes = project.read('release/release-notes.md');
+      const releaseNotes = project.read('packaging/release-notes/release-notes.md');
      assert.match(releaseNotes, /## What's Changed\n\n/);
      assert.match(releaseNotes, /- feat\(overlay\): add a feature by @ksyasuda in #110\n/);
      assert.match(releaseNotes, /- fix\(jellyfin\): restart remote session by @bee-san in #112\n/);
@@ -904,7 +904,10 @@ test('writeChangelogArtifacts skips contributor attribution in GitHub Actions wi
        });

        assert.deepEqual(warnings, []);
-        assert.doesNotMatch(project.read('release/release-notes.md'), /## What's Changed/);
+        assert.doesNotMatch(
+          project.read('packaging/release-notes/release-notes.md'),
+          /## What's Changed/,
+        );
      } finally {
        console.warn = originalWarn;
        for (const key of envKeys) {
@@ -990,7 +993,10 @@ test('writeReleaseNotesForVersion preserves committed contributor attribution be

  await withProject(
    'release-notes-preserve-attribution',
-    { 'CHANGELOG.md': existingChangelog, 'release/release-notes.md': committedReleaseNotes },
+    {
+      'CHANGELOG.md': existingChangelog,
+      'packaging/release-notes/release-notes.md': committedReleaseNotes,
+    },
    (project) => {
      const outputPath = writeReleaseNotesForVersion({
        cwd: project.projectRoot,
@@ -1055,7 +1061,7 @@ test('writeChangelogArtifacts strips <details> blocks from release notes when re
        'no Claude calls should fire when the section already exists',
      );

-      const releaseNotes = project.read('release/release-notes.md');
+      const releaseNotes = project.read('packaging/release-notes/release-notes.md');
      assert.match(releaseNotes, /## Highlights\n### Added\n- Polished: previously committed\./);
      assert.doesNotMatch(releaseNotes, /<details>/);
      assert.doesNotMatch(releaseNotes, /### Internal/);
@@ -1237,7 +1243,7 @@ test('writePrereleaseNotesForVersion strips the stale delta section from the reu
    'prerelease-reuse-strips-delta',
    {
      'package.json': packageJson('0.12.0-beta.3'),
-      'release/prerelease-notes.md': existingNotes,
+      'packaging/release-notes/prerelease-notes.md': existingNotes,
      'changes/001.md': fragment('added', 'overlay', '- Added overlay coverage.'),
    },
    (project) => {
@@ -1271,7 +1277,7 @@ test('verifyPrereleaseNotesMatchVersion accepts matching notes and rejects stale
    (project) => {
      const verify = (version = '0.12.0-beta.2') =>
        verifyPrereleaseNotesMatchVersion({ cwd: project.projectRoot, version });
-      const notesPath = 'release/prerelease-notes.md';
+      const notesPath = 'packaging/release-notes/prerelease-notes.md';

      assert.throws(() => verify(), /Missing .*prerelease-notes\.md/);

@@ -68,8 +68,8 @@ type PullRequestChangelogOptions = {
  changedLabels?: string[];
 };

-const RELEASE_NOTES_PATH = path.join('release', 'release-notes.md');
-const PRERELEASE_NOTES_PATH = path.join('release', 'prerelease-notes.md');
+const RELEASE_NOTES_PATH = path.join('packaging', 'release-notes', 'release-notes.md');
+const PRERELEASE_NOTES_PATH = path.join('packaging', 'release-notes', 'prerelease-notes.md');
 const CHANGELOG_HEADER = '# Changelog';
 const CHANGE_TYPES: FragmentType[] = ['added', 'changed', 'fixed', 'docs', 'internal'];
 const SKIP_CHANGELOG_LABEL = 'skip-changelog';
@@ -1144,7 +1144,7 @@ function isFragmentPath(candidate: string): boolean {
 function isIgnoredPullRequestPath(candidate: string): boolean {
  return (
    candidate === 'CHANGELOG.md' ||
-    candidate === 'release/release-notes.md' ||
+    candidate === 'packaging/release-notes/release-notes.md' ||
    candidate === 'AGENTS.md' ||
    candidate === 'README.md' ||
    candidate.startsWith('changes/') ||
@@ -1405,7 +1405,7 @@ export function verifyPrereleaseNotesMatchVersion(options?: ChangelogOptions): v
  const markerVersion = extractPrereleaseVersionMarker(readFileSync(prereleaseNotesPath, 'utf8'));
  if (markerVersion !== version) {
    throw new Error(
-      `release/prerelease-notes.md was generated for ${markerVersion ?? 'an unknown version (missing or legacy prerelease-version marker)'} but this release is ${version}. Rerun 'bun run changelog:prerelease-notes --version ${version}' and commit the result.`,
+      `packaging/release-notes/prerelease-notes.md was generated for ${markerVersion ?? 'an unknown version (missing or legacy prerelease-version marker)'} but this release is ${version}. Rerun 'bun run changelog:prerelease-notes --version ${version}' and commit the result.`,
    );
  }
 }
@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';

 const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const source = path.join(repoRoot, 'vendor', 'hachidori');
-const output = path.join(repoRoot, 'build', 'hachidori');
+const output = path.join(repoRoot, 'dist', 'hachidori');
 const provenance = JSON.parse(fs.readFileSync(path.join(source, 'SOURCE.json'), 'utf8'));

 // Upstream commits the engine binaries. Verify the pinned bytes before staging
@@ -19,7 +19,7 @@ test('Hachidori staging configures Electron without changing the fork source', a
    files.map((file) => readFileSync(source(file), 'utf8')),
    before,
  );
-  const staged = await import(new URL('../build/hachidori/overlay-mode.js', import.meta.url).href);
+  const staged = await import(new URL('../dist/hachidori/overlay-mode.js', import.meta.url).href);
  assert.equal(staged.OVERLAY_MODE, true);
  assert.equal(staged.HOST_CAPABILITIES.customJavaScript, false);
  const original = await import(source('overlay-mode.js').href);
@@ -28,13 +28,13 @@ test('Hachidori staging configures Electron without changing the fork source', a
  // SubMiner mines media from mpv, not the overlay viewport, so the lookup
  // highlight stays on for a first install.
  const stagedSetup = await import(
-    new URL('../build/hachidori/setup-state.js', import.meta.url).href
+    new URL('../dist/hachidori/setup-state.js', import.meta.url).href
  );
  assert.equal(stagedSetup.OVERLAY_MODE_OPTIONS.sourceHighlightEnabled, true);
  const originalSetup = await import(source('setup-state.js').href);
  assert.equal(originalSetup.OVERLAY_MODE_OPTIONS.sourceHighlightEnabled, false);
  const manifest = JSON.parse(
-    readFileSync(new URL('../build/hachidori/manifest.json', import.meta.url), 'utf8'),
+    readFileSync(new URL('../dist/hachidori/manifest.json', import.meta.url), 'utf8'),
  );
  const originalManifest = JSON.parse(readFileSync(source('manifest.json'), 'utf8'));
  assert.deepEqual(manifest, {
@@ -10,7 +10,7 @@ const repoRoot = path.resolve(dirname, '..');
 const submoduleDir = path.join(repoRoot, 'vendor', 'subminer-yomitan');
 const submodulePackagePath = path.join(submoduleDir, 'package.json');
 const submodulePackageLockPath = path.join(submoduleDir, 'package-lock.json');
-const buildOutputDir = path.join(repoRoot, 'build', 'yomitan');
+const buildOutputDir = path.join(repoRoot, 'dist', 'yomitan');
 const stampPath = path.join(buildOutputDir, '.subminer-build.json');
 const zipPath = path.join(submoduleDir, 'builds', 'yomitan-chrome.zip');
 const bunCommand = process.versions.bun ? process.execPath : 'bun';
@@ -48,7 +48,7 @@ app
  .then(async () => {
    const targetSession = session.fromPartition('persist:hachidori-check');
    const extension = await targetSession.extensions.loadExtension(
-      path.join(root, 'build/hachidori'),
+      path.join(root, 'dist/hachidori'),
      { allowFileAccess: true },
    );
    // Keep a host window alive while the dictionary importer opens/closes its
@@ -18,7 +18,7 @@ test('platform packaging preserves the runtime allowlist after builder normalize
      '/tmp/subminer-filter-output',
      {
        defaultSrc: root,
-        globalOutDir: path.join(root, 'release'),
+        globalOutDir: path.join(root, 'dist', 'release'),
        customBuildOptions: { files: config.build[platform].files },
        macroExpander: (value) => value.replaceAll('${arch}', 'x64'),
      },
@@ -51,6 +51,9 @@ test('platform packaging preserves the runtime allowlist after builder normalize
      'stats/dist/nested/fixtures/data.json',
      'vendor/texthooker-ui/docs/nested/component.tsx',
      'dist/launcher/subminer',
+      'dist/yomitan/manifest.json',
+      'dist/hachidori/manifest.json',
+      'dist/release/SubMiner-1.0.0.AppImage',
      'dist/settings/fonts/MPLUS1[wght].ttf',
      'vendor/subminer-yomitan/ext/manifest.json',
    ]) {
@@ -10,14 +10,20 @@ import { Readable } from 'node:stream';
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');

-export const DEFAULT_MANIFEST_PATH = path.join(repoRoot, 'build', 'bun-source-manifest.json');
+export const DEFAULT_MANIFEST_PATH = path.join(
+  repoRoot,
+  'packaging',
+  'bun',
+  'bun-source-manifest.json',
+);
 export const DEFAULT_RUNTIME_MANIFEST_PATH = path.join(
  repoRoot,
-  'build',
+  'packaging',
+  'bun',
  'bun-runtime-manifest.json',
 );
 export const DEFAULT_PACKAGE_JSON_PATH = path.join(repoRoot, 'package.json');
-export const DEFAULT_OUTPUT_DIR = path.join(repoRoot, 'release');
+export const DEFAULT_OUTPUT_DIR = path.join(repoRoot, 'dist', 'release');
 export const DEFAULT_CACHE_DIR = path.join(repoRoot, '.tmp', 'bun-corresponding-source');

 function isRecord(value) {
@@ -4,6 +4,9 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import {
+  DEFAULT_MANIFEST_PATH,
+  DEFAULT_PACKAGE_JSON_PATH,
+  DEFAULT_RUNTIME_MANIFEST_PATH,
  downloadArchive,
  parseRegisteredRepositories,
  parseSourceManifest,
@@ -67,10 +70,26 @@ describe('Bun corresponding-source manifest', () => {
    });
  });

+  test('default manifest paths resolve to aligned checked-in manifests', async () => {
+    const [manifestText, runtimeManifestText, packageJsonText] = await Promise.all([
+      fs.readFile(DEFAULT_MANIFEST_PATH, 'utf8'),
+      fs.readFile(DEFAULT_RUNTIME_MANIFEST_PATH, 'utf8'),
+      fs.readFile(DEFAULT_PACKAGE_JSON_PATH, 'utf8'),
+    ]);
+
+    expect(() =>
+      validateRuntimeAlignment(
+        parseSourceManifest(JSON.parse(manifestText)),
+        JSON.parse(packageJsonText),
+        JSON.parse(runtimeManifestText),
+      ),
+    ).not.toThrow();
+  });
+
  test('rejects stale runtime or package-manager pins', async () => {
    const manifest = parseSourceManifest(
      JSON.parse(
-        await fs.readFile(path.join(projectRoot, 'build/bun-source-manifest.json'), 'utf8'),
+        await fs.readFile(path.join(projectRoot, 'packaging/bun/bun-source-manifest.json'), 'utf8'),
      ),
    );
    const runtimeManifest = {
@@ -100,7 +119,7 @@ describe('Bun corresponding-source manifest', () => {
  test('rejects drift in CMake dependency and WebKit pins', async () => {
    const manifest = parseSourceManifest(
      JSON.parse(
-        await fs.readFile(path.join(projectRoot, 'build/bun-source-manifest.json'), 'utf8'),
+        await fs.readFile(path.join(projectRoot, 'packaging/bun/bun-source-manifest.json'), 'utf8'),
      ),
    );
    const registrations = manifest.sources
@@ -6,7 +6,7 @@ cat <<'EOF'
 patch-yomitan.sh is retired.

 SubMiner now uses the forked source submodule at vendor/subminer-yomitan and builds the
-Chromium extension artifact into build/yomitan.
+Chromium extension artifact into dist/yomitan.

 Use:
  git submodule update --init --recursive
@@ -9,9 +9,9 @@ paths=(
  "tsconfig.json"
  "tsconfig.renderer.json"
  "tsconfig.typecheck.json"
-  ".prettierrc.json"
  ".github"
-  "build"
+  "packaging/bun/bun-runtime-manifest.json"
+  "packaging/bun/bun-source-manifest.json"
  "e2e"
  "launcher"
  "scripts"
@@ -14,9 +14,14 @@ const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');

 export const DEFAULT_PACKAGE_JSON_PATH = path.join(repoRoot, 'package.json');
-export const DEFAULT_MANIFEST_PATH = path.join(repoRoot, 'build', 'bun-runtime-manifest.json');
+export const DEFAULT_MANIFEST_PATH = path.join(
+  repoRoot,
+  'packaging',
+  'bun',
+  'bun-runtime-manifest.json',
+);
 export const DEFAULT_CACHE_DIR = path.join(repoRoot, '.tmp', 'bun-runtime');
-export const DEFAULT_LICENSES_SOURCE_DIR = path.join(repoRoot, 'resources', 'bun', 'licenses');
+export const DEFAULT_LICENSES_SOURCE_DIR = path.join(repoRoot, 'packaging', 'bun', 'licenses');
 export const STAGED_METADATA_FILE = 'metadata.json';
 export const REQUIRED_LICENSE_FILES = [
  'Bun-LICENSE.md',
@@ -35,7 +35,7 @@ function runtimeConfig() {
      'win32-x64': { file: 'bun-windows-x64-baseline.zip', sha256: '5'.repeat(64) },
    },
    licenseInventoryStatus: 'complete-for-bun-1.3.5-declared-linked-libraries',
-    sourceManifest: 'build/bun-source-manifest.json',
+    sourceManifest: 'packaging/bun/bun-source-manifest.json',
    correspondingSourceAsset: 'bun-v1.3.5-source.tar.gz',
  };
 }
@@ -96,7 +96,7 @@ test('manifest version must match the exact packageManager Bun pin', () => {
          releaseTagCommit: 'fa5a5bbe556a4bda5bde77b4013aa6c3bb4ec9ab',
          artifacts: {},
          licenseInventoryStatus: 'partial',
-          sourceManifest: 'build/bun-source-manifest.json',
+          sourceManifest: 'packaging/bun/bun-source-manifest.json',
          correspondingSourceAsset: 'bun-v1.3.5-source.tar.gz',
        },
        '1.3.5',
@@ -45,6 +45,7 @@ import {
 } from './anki-field-config';
 import { createLogger } from './logger';
 import { captureLiveSubtitleMiningContext } from './core/services/mining';
+import { shiftSubtitleRangeToVideoClock } from './core/services/subtitle-clock';
 import {
  createUiFeedbackState,
  beginUpdateProgress,
@@ -1029,10 +1030,10 @@ export class AnkiIntegration {
      Number.isFinite(this.mpvClient.currentSubEnd) &&
      this.mpvClient.currentSubEnd > this.mpvClient.currentSubStart
    ) {
-      return {
-        startTime: this.mpvClient.currentSubStart,
-        endTime: this.mpvClient.currentSubEnd,
-      };
+      return shiftSubtitleRangeToVideoClock(
+        { startTime: this.mpvClient.currentSubStart, endTime: this.mpvClient.currentSubEnd },
+        this.mpvClient.currentSubDelay,
+      );
    }

    const currentTime = this.mpvClient.currentTimePos || 0;
@@ -1672,7 +1673,7 @@ export class AnkiIntegration {
          if (this.config.fields?.miscInfo) {
            result.miscInfoValue = this.formatMiscInfoPattern(
              audioFilename,
-              this.mpvClient.currentSubStart,
+              this.mpvClient.currentSubStart + this.mpvClient.currentSubDelay,
            );
          }
        }
@@ -1695,7 +1696,7 @@ export class AnkiIntegration {
          if (this.config.fields?.miscInfo && !result.miscInfoValue) {
            result.miscInfoValue = this.formatMiscInfoPattern(
              imageFilename,
-              this.mpvClient.currentSubStart,
+              this.mpvClient.currentSubStart + this.mpvClient.currentSubDelay,
            );
          }
        }
@@ -10,6 +10,7 @@ import {
  type MediaTimingReviewRequest,
  type WordCardKind,
 } from '../types/anki';
+import { shiftSubtitleRangeToVideoClock } from '../core/services/subtitle-clock';
 import { createLogger } from '../logger';
 import type { MediaInput } from '../media-input';
 import { SubtitleTimingTracker } from '../subtitle-timing-tracker';
@@ -428,10 +429,12 @@ export class CardCreationService {
        return;
      }

-      let startTime = mpvClient.currentSubStart;
-      let endTime = mpvClient.currentSubEnd;
+      let { startTime, endTime } = shiftSubtitleRangeToVideoClock(
+        { startTime: mpvClient.currentSubStart, endTime: mpvClient.currentSubEnd },
+        mpvClient.currentSubDelay,
+      );

-      if (startTime === undefined || endTime === undefined) {
+      if (mpvClient.currentSubStart === undefined || mpvClient.currentSubEnd === undefined) {
        const currentTime = mpvClient.currentTimePos || 0;
        const fallback = this.deps.getFallbackDurationSeconds() / 2;
        startTime = currentTime - fallback;
@@ -11,9 +11,9 @@ test('Hachidori resolves development and packaged artifacts without falling back
  assert.equal(
    resolveHachidoriExtensionPath({
      ...options,
-      exists: (p) => p === '/app/build/hachidori/manifest.json',
+      exists: (p) => p === '/app/dist/hachidori/manifest.json',
    }),
-    '/app/build/hachidori',
+    '/app/dist/hachidori',
  );
  assert.equal(
    resolveHachidoriExtensionPath({
@@ -15,7 +15,7 @@ export function resolveHachidoriExtensionPath(options: {
  exists?: (candidate: string) => boolean;
 }): string {
  const candidates = [
-    path.resolve(options.moduleDir, '../../../build/hachidori'),
+    path.resolve(options.moduleDir, '../../../dist/hachidori'),
    path.join(options.resourcesPath, 'hachidori'),
  ];
  const found = candidates.find((candidate) =>
@@ -55,6 +55,7 @@ export {
  subtitleCueListSeekTime,
  subtitleCueSeekTime,
 } from './subtitle-cue-navigation';
+export { shiftSubtitleRangeToVideoClock, toSubtitleClock, toVideoClock } from './subtitle-clock';
 export { createFrequencyDictionaryLookup } from './frequency-dictionary';
 export { createJlptVocabularyLookup } from './jlpt-vocab';
 export {
@@ -89,6 +89,7 @@ function createSubtitleSidebarSnapshotFixture(): SubtitleSidebarSnapshot {
    cuesRevision: 1,
    cues: [],
    currentTimeSec: null,
+    subDelay: 0,
    currentSubtitle: { text: '', startTime: null, endTime: null },
    config: {
      enabled: false,
@@ -77,6 +77,7 @@ test('mineSentenceCard handles missing integration and disconnected mpv', async
        currentSubText: 'line',
        currentSubStart: 1,
        currentSubEnd: 2,
+        currentSubDelay: 0,
      },
      showMpvOsd: (text) => osd.push(text),
    }),
@@ -109,6 +110,7 @@ test('mineSentenceCard creates sentence card from mpv subtitle state', async ()
      currentSubText: 'subtitle line',
      currentSubStart: 10,
      currentSubEnd: 12,
+      currentSubDelay: 0,
      currentSecondarySubText: 'secondary line',
    },
    showMpvOsd: () => {},
@@ -148,6 +150,7 @@ test('mineSentenceCard prefers a canonical primary subtitle snapshot', async ()
      currentSubText: '今今今手手手',
      currentSubStart: 11.4,
      currentSubEnd: 11.8,
+      currentSubDelay: 0,
      currentSecondarySubText: 'English subtitle',
    },
    primarySubtitle: {
@@ -187,6 +190,7 @@ test('mineSentenceCard uses normalized secondary subtitle state instead of raw m
      currentSubText: '日本語字幕',
      currentSubStart: 10,
      currentSubEnd: 12,
+      currentSubDelay: 0,
      currentSecondarySubText: 'Your\nmosaic',
      requestProperty: async () => {
        requestedRawSecondaryText = true;
@@ -218,6 +222,7 @@ test('mineSentenceCard omits normalized secondary text that matches the primary
      currentSubText: '日本語字幕',
      currentSubStart: 10,
      currentSubEnd: 12,
+      currentSubDelay: 0,
      currentSecondarySubText: '日本語字幕',
    },
    showMpvOsd: () => {},
@@ -396,7 +401,7 @@ test('handleMineSentenceDigit joins per-entry secondary subtitles when available

 test('captureLiveSubtitleMiningContext snapshots the current line and timings', () => {
  const context = captureLiveSubtitleMiningContext(
-    { currentSubText: ' 食べる ', currentSubStart: 12.5, currentSubEnd: 15.25 },
+    { currentSubText: ' 食べる ', currentSubStart: 12.5, currentSubEnd: 15.25, currentSubDelay: 0 },
    () => 1234,
  );

@@ -409,6 +414,16 @@ test('captureLiveSubtitleMiningContext snapshots the current line and timings',
  });
 });

+test('captureLiveSubtitleMiningContext moves sub-delay retimed lines onto the video clock', () => {
+  const context = captureLiveSubtitleMiningContext(
+    { currentSubText: '食べる', currentSubStart: 5, currentSubEnd: 8, currentSubDelay: -1.5 },
+    () => 1234,
+  );
+
+  assert.equal(context?.startTime, 3.5);
+  assert.equal(context?.endTime, 6.5);
+});
+
 test('captureLiveSubtitleMiningContext rejects missing client, empty text and bad timings', () => {
  assert.equal(captureLiveSubtitleMiningContext(null), null);
  assert.equal(
@@ -416,6 +431,7 @@ test('captureLiveSubtitleMiningContext rejects missing client, empty text and ba
      currentSubText: '  ',
      currentSubStart: 1,
      currentSubEnd: 2,
+      currentSubDelay: 0,
    }),
    null,
  );
@@ -424,6 +440,7 @@ test('captureLiveSubtitleMiningContext rejects missing client, empty text and ba
      currentSubText: 'line',
      currentSubStart: 5,
      currentSubEnd: 5,
+      currentSubDelay: 0,
    }),
    null,
  );
@@ -432,6 +449,7 @@ test('captureLiveSubtitleMiningContext rejects missing client, empty text and ba
      currentSubText: 'line',
      currentSubStart: NaN,
      currentSubEnd: 2,
+      currentSubDelay: 0,
    }),
    null,
  );
@@ -1,5 +1,6 @@
 import type { SubtitleTimingBlock } from '../../subtitle-timing-tracker';
 import type { SubtitleMiningContext } from '../../types/subtitle';
+import { shiftSubtitleRangeToVideoClock } from './subtitle-clock';

 interface SubtitleTimingTrackerLike {
  getRecentBlocks: (count: number) => string[];
@@ -25,6 +26,7 @@ interface MpvClientLike {
  currentSubText: string;
  currentSubStart: number;
  currentSubEnd: number;
+  currentSubDelay: number;
  currentSecondarySubText?: string;
  requestProperty?: (name: string) => Promise<unknown>;
 }
@@ -62,7 +64,10 @@ export function handleMultiCopyDigit(
 * line is on screen by then; callers capture here at mining time instead.
 */
 export function captureLiveSubtitleMiningContext(
-  client: Pick<MpvClientLike, 'currentSubText' | 'currentSubStart' | 'currentSubEnd'> | null,
+  client: Pick<
+    MpvClientLike,
+    'currentSubText' | 'currentSubStart' | 'currentSubEnd' | 'currentSubDelay'
+  > | null,
  now: () => number = Date.now,
 ): SubtitleMiningContext | null {
  if (!client) {
@@ -73,7 +78,10 @@ export function captureLiveSubtitleMiningContext(
  if (!text || !Number.isFinite(startTime) || !Number.isFinite(endTime) || endTime <= startTime) {
    return null;
  }
-  return { source: 'overlay', text, startTime, endTime, capturedAtMs: now() };
+  return shiftSubtitleRangeToVideoClock<SubtitleMiningContext>(
+    { source: 'overlay', text, startTime, endTime, capturedAtMs: now() },
+    client.currentSubDelay,
+  );
 }

 export function copyCurrentSubtitle(deps: {
@@ -167,6 +175,7 @@ export async function markLastCardAsAudioCard(deps: {
 export async function mineSentenceCard(deps: {
  ankiIntegration: AnkiIntegrationLike | null;
  mpvClient: MpvClientLike | null;
+  /** Already on the video clock, like every `SubtitleMiningContext`. */
  primarySubtitle?: Pick<SubtitleMiningContext, 'text' | 'startTime' | 'endTime'>;
  showMpvOsd: (text: string) => void;
 }): Promise<boolean> {
@@ -185,10 +194,16 @@ export async function mineSentenceCard(deps: {
  }

  const secondarySubText = getCurrentSecondarySubTextForSentenceCard(mpvClient, primaryText);
+  const range =
+    deps.primarySubtitle ??
+    shiftSubtitleRangeToVideoClock(
+      { startTime: mpvClient.currentSubStart, endTime: mpvClient.currentSubEnd },
+      mpvClient.currentSubDelay,
+    );
  return await anki.createSentenceCard(
    primaryText,
-    deps.primarySubtitle?.startTime ?? mpvClient.currentSubStart,
-    deps.primarySubtitle?.endTime ?? mpvClient.currentSubEnd,
+    range.startTime,
+    range.endTime,
    secondarySubText,
  );
 }
@@ -38,6 +38,7 @@ const MPV_SUBTITLE_PROPERTY_OBSERVATIONS: string[] = [
  'path',
  'sub-start',
  'sub-end',
+  'sub-delay',
  'time-pos',
  'secondary-sub-text',
  'aid',
@@ -73,6 +73,8 @@ function createDeps(overrides: Partial<MpvProtocolHandleMessageDeps> = {}): {
      getCurrentSubStart: () => 0,
      setCurrentSubEnd: () => {},
      getCurrentSubEnd: () => 0,
+      setCurrentSubDelay: () => {},
+      getCurrentSubDelay: () => 0,
      emitMediaPathChange: (payload) => {
        state.mediaPath = payload.path;
      },
@@ -131,6 +133,22 @@ test('dispatchMpvProtocolMessage emits subtitle text on property change', async
  assert.deepEqual(state.events, [{ text: '字幕', isOverlayVisible: false }]);
 });

+test('dispatchMpvProtocolMessage tracks sub-delay retiming', async () => {
+  const delays: number[] = [];
+  const { deps } = createDeps({ setCurrentSubDelay: (value) => delays.push(value) });
+
+  await dispatchMpvProtocolMessage(
+    { event: 'property-change', name: 'sub-delay', data: 1.5 },
+    deps,
+  );
+  await dispatchMpvProtocolMessage(
+    { event: 'property-change', name: 'sub-delay', data: null },
+    deps,
+  );
+
+  assert.deepEqual(delays, [1.5, 0]);
+});
+
 test('dispatchMpvProtocolMessage widens halfwidth katakana in subtitle text', async () => {
  const { deps, state } = createDeps();

@@ -379,6 +397,29 @@ test('dispatchMpvProtocolMessage pauses on sub-end when pendingPauseAtSubEnd is
  });
 });

+test('dispatchMpvProtocolMessage pauses at the sub-delay retimed sub-end', async () => {
+  let pauseAtTime: number | null = null;
+  let subDelay = 1.5;
+  const { deps } = createDeps({
+    getPendingPauseAtSubEnd: () => true,
+    getCurrentSubDelay: () => subDelay,
+    setCurrentSubDelay: (next) => {
+      subDelay = next;
+    },
+    getPauseAtTime: () => pauseAtTime,
+    setPauseAtTime: (next) => {
+      pauseAtTime = next;
+    },
+  });
+
+  await dispatchMpvProtocolMessage({ event: 'property-change', name: 'sub-end', data: 42 }, deps);
+  assert.equal(pauseAtTime, 43.5);
+
+  // Retiming before the replay reaches its end moves the pause with the line.
+  await dispatchMpvProtocolMessage({ event: 'property-change', name: 'sub-delay', data: 2 }, deps);
+  assert.equal(pauseAtTime, 44);
+});
+
 test('dispatchMpvProtocolMessage updates current time before emitting time-pos change', async () => {
  const calls: string[] = [];
  let currentTimePos = 0;
@@ -1,6 +1,7 @@
 import { MpvSubtitleRenderMetrics } from '../../types';
 import { sanitizeMediaTitle } from '../../shared/media-identity';
 import { widenHalfwidthKana } from '../utils/halfwidth-kana';
+import { toVideoClock } from './subtitle-clock';

 export type MpvMessage = {
  event?: string;
@@ -64,6 +65,8 @@ export interface MpvProtocolHandleMessageDeps {
  getCurrentSubStart: () => number;
  setCurrentSubEnd: (value: number) => void;
  getCurrentSubEnd: () => number;
+  setCurrentSubDelay: (value: number) => void;
+  getCurrentSubDelay: () => number;
  emitMediaPathChange: (payload: { path: string }) => void;
  emitMediaTitleChange: (payload: { title: string | null }) => void;
  emitTimePosChange: (payload: { time: number }) => void;
@@ -263,7 +266,8 @@ export async function dispatchMpvProtocolMessage(
      const subEnd = (msg.data as number) || 0;
      deps.setCurrentSubEnd(subEnd);
      if (deps.getPendingPauseAtSubEnd() && subEnd > 0) {
-        deps.setPauseAtTime(subEnd);
+        // `sub-end` is on the subtitle clock; the pause check compares it with `time-pos`.
+        deps.setPauseAtTime(toVideoClock(subEnd, deps.getCurrentSubDelay()));
        deps.setPendingPauseAtSubEnd(false);
        deps.sendCommand({ command: ['set_property', 'pause', false] });
      }
@@ -272,6 +276,16 @@ export async function dispatchMpvProtocolMessage(
        start: deps.getCurrentSubStart(),
        end: deps.getCurrentSubEnd(),
      });
+    } else if (msg.name === 'sub-delay') {
+      const parsed = typeof msg.data === 'number' ? msg.data : Number(msg.data);
+      const delay = Number.isFinite(parsed) ? parsed : 0;
+      // A scheduled replay pause sits at the line's end on the video clock; retiming
+      // mid-replay moves that end, so the pause moves with it.
+      const pauseAtTime = deps.getPauseAtTime();
+      if (pauseAtTime !== null) {
+        deps.setPauseAtTime(pauseAtTime + delay - deps.getCurrentSubDelay());
+      }
+      deps.setCurrentSubDelay(delay);
    } else if (msg.name === 'secondary-sub-text') {
      const nextSubText = (msg.data as string) || '';
      deps.setCurrentSecondarySubText(nextSubText);
@@ -160,6 +160,8 @@ export class MpvIpcClient implements MpvClient {
  public currentTimePos = 0;
  public currentSubStart = 0;
  public currentSubEnd = 0;
+  /** mpv `sub-delay`: seconds each primary line plays after its `sub-start`/`sub-end`. */
+  public currentSubDelay = 0;
  public currentSubText = '';
  public currentSecondarySubText = '';
  public currentAudioStreamIndex: number | null = null;
@@ -459,6 +461,10 @@ export class MpvIpcClient implements MpvClient {
        this.currentSubEnd = value;
      },
      getCurrentSubEnd: () => this.currentSubEnd,
+      setCurrentSubDelay: (value: number) => {
+        this.currentSubDelay = value;
+      },
+      getCurrentSubDelay: () => this.currentSubDelay,
      emitMediaPathChange: (payload) => {
        this.emit('media-path-change', payload);
      },
@@ -0,0 +1,32 @@
+/**
+ * mpv's `sub-start`/`sub-end` and parsed cues carry the subtitle file's own timestamps
+ * (the subtitle clock), but mpv plays each line `sub-delay` seconds later (z/x retiming,
+ * `sub-step`). Playback position, seeks, and media cuts are on the video clock, so any
+ * value crossing between the two converts here.
+ */
+
+function finiteDelay(subDelay: number): number {
+  return Number.isFinite(subDelay) ? subDelay : 0;
+}
+
+/** Playback position (`time-pos`) on the subtitle clock, comparable with cue times. */
+export function toSubtitleClock(videoTimeSec: number, subDelay: number): number {
+  return videoTimeSec - finiteDelay(subDelay);
+}
+
+/** Subtitle-clock seconds on the video clock, for seeks. */
+export function toVideoClock(subtitleTimeSec: number, subDelay: number): number {
+  return subtitleTimeSec + finiteDelay(subDelay);
+}
+
+/** A subtitle-clock range on the video clock, for mining and media generation. */
+export function shiftSubtitleRangeToVideoClock<T extends { startTime: number; endTime: number }>(
+  range: T,
+  subDelay: number,
+): T {
+  const delay = finiteDelay(subDelay);
+  if (delay === 0) {
+    return range;
+  }
+  return { ...range, startTime: range.startTime + delay, endTime: range.endTime + delay };
+}
@@ -26,7 +26,7 @@ test('next subtitle navigation skips generated ASS events and seeks to the next
    },
  ];

-  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 10.2), [
+  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 10.2, 0), [
    'seek',
    13.08,
    'absolute+exact',
@@ -41,7 +41,7 @@ test('next subtitle navigation treats simultaneous sanitized cues as one line bo
    { startTime: 13.02, endTime: 16, text: 'Next English' },
  ];

-  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 10.1), [
+  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 10.1, 0), [
    'seek',
    13.08,
    'absolute+exact',
@@ -55,7 +55,7 @@ test('next subtitle navigation advances past the latest overlapping lyric', () =
    { startTime: 16, endTime: 19, text: 'next lyric' },
  ];

-  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 13.2), [
+  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 13.2, 0), [
    'seek',
    16.08,
    'absolute+exact',
@@ -68,7 +68,7 @@ test('previous subtitle navigation leaves the current cue and seeks to the prior
    { startTime: 13, endTime: 16, text: 'current line' },
  ];

-  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', -1], cues, 14.5), [
+  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', -1], cues, 14.5, 0), [
    'seek',
    10.08,
    'absolute+exact',
@@ -78,8 +78,22 @@ test('previous subtitle navigation leaves the current cue and seeks to the prior
 test('subtitle navigation falls back when no sanitized destination exists', () => {
  const cues = [{ startTime: 10, endTime: 13, text: 'only line' }];

-  assert.equal(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 10.2), null);
-  assert.equal(resolveSanitizedSubtitleSeekCommand(['seek', 5], cues, 10.2), null);
+  assert.equal(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 10.2, 0), null);
+  assert.equal(resolveSanitizedSubtitleSeekCommand(['seek', 5], cues, 10.2, 0), null);
+});
+
+test('subtitle cue navigation finds and seeks cues on the sub-delay retimed timeline', () => {
+  const cues = [
+    { startTime: 10, endTime: 13, text: 'one' },
+    { startTime: 13, endTime: 16, text: 'two' },
+  ];
+
+  // At 14.5 with a 2s delay, mpv is showing "one" (12-15 on the video clock).
+  assert.deepEqual(resolveSanitizedSubtitleSeekCommand(['sub-seek', 1], cues, 14.5, 2), [
+    'seek',
+    15.08,
+    'absolute+exact',
+  ]);
 });

 test('sidebar cue seeks share the boundary-safe sanitized cue timestamp', () => {
@@ -1,3 +1,4 @@
+import { toSubtitleClock, toVideoClock } from './subtitle-clock';
 import type { SubtitleCue } from './subtitle-cue-parser';

 const CUE_START_GROUP_TOLERANCE_SECONDS = 0.05;
@@ -80,8 +81,10 @@ export function subtitleCueListSeekTime(
 export function resolveSanitizedSubtitleSeekCommand(
  command: readonly (string | number)[],
  cues: readonly SubtitleCue[],
-  currentTimeSec: number,
+  videoTimeSec: number,
+  subDelay: number,
 ): (string | number)[] | null {
+  const currentTimeSec = toSubtitleClock(videoTimeSec, subDelay);
  if (
    command.length < 2 ||
    command[0] !== 'sub-seek' ||
@@ -124,5 +127,5 @@ export function resolveSanitizedSubtitleSeekCommand(
  if (!destination) {
    return null;
  }
-  return ['seek', subtitleCueSeekTime(destination.cue), 'absolute+exact'];
+  return ['seek', toVideoClock(subtitleCueSeekTime(destination.cue), subDelay), 'absolute+exact'];
 }
@@ -20,7 +20,7 @@ test('getYomitanExtensionSearchPaths prioritizes generated build output before p
  });

  assert.deepEqual(searchPaths, [
-    path.join(repoRoot, 'build', 'yomitan'),
+    path.join(repoRoot, 'dist', 'yomitan'),
    path.join(resourcesPath, 'yomitan'),
    '/usr/share/SubMiner/yomitan',
    path.join(userDataPath, 'yomitan'),
@@ -29,19 +29,19 @@ test('getYomitanExtensionSearchPaths prioritizes generated build output before p

 test('resolveExistingYomitanExtensionPath returns first manifest-backed candidate', () => {
  const existing = new Set<string>([
-    path.join('/repo', 'build', 'yomitan', 'manifest.json'),
+    path.join('/repo', 'dist', 'yomitan', 'manifest.json'),
    path.join('/repo', 'vendor', 'subminer-yomitan', 'ext', 'manifest.json'),
  ]);

  const resolved = resolveExistingYomitanExtensionPath(
    [
-      path.join('/repo', 'build', 'yomitan'),
+      path.join('/repo', 'dist', 'yomitan'),
      path.join('/repo', 'vendor', 'subminer-yomitan', 'ext'),
    ],
    (candidate) => existing.has(candidate),
  );

-  assert.equal(resolved, path.join('/repo', 'build', 'yomitan'));
+  assert.equal(resolved, path.join('/repo', 'dist', 'yomitan'));
 });

 test('resolveExistingYomitanExtensionPath ignores source tree without built manifest', () => {
@@ -22,12 +22,10 @@ export function getYomitanExtensionSearchPaths(
  const searchPaths: string[] = [];

  pushUnique(searchPaths, options.explicitPath ? path.resolve(options.explicitPath) : null);
-  pushUnique(searchPaths, options.cwd ? path.resolve(options.cwd, 'build', 'yomitan') : null);
+  pushUnique(searchPaths, options.cwd ? path.resolve(options.cwd, 'dist', 'yomitan') : null);
  pushUnique(
    searchPaths,
-    options.moduleDir
-      ? path.resolve(options.moduleDir, '..', '..', '..', 'build', 'yomitan')
-      : null,
+    options.moduleDir ? path.resolve(options.moduleDir, '..', '..', '..', 'dist', 'yomitan') : null,
  );
  pushUnique(
    searchPaths,
@@ -328,9 +328,11 @@ import {
  setMpvSubVisibilityRuntime,
  setOverlayDebugVisualizationEnabledRuntime,
  setVisibleOverlayVisible as setVisibleOverlayVisibleCore,
+  shiftSubtitleRangeToVideoClock,
  showMpvOsdRuntime,
  JellyfinPlaybackReporter,
  tokenizeSubtitle as tokenizeSubtitleCore,
+  toSubtitleClock,
  triggerFieldGrouping as triggerFieldGroupingCore,
  upsertYomitanDictionarySettings,
  updateLastCardFromClipboard as updateLastCardFromClipboardCore,
@@ -1937,7 +1939,10 @@ let tokenizeSubtitleDeferred: ((text: string) => Promise<SubtitleData>) | null =
 function withCurrentSubtitleTiming(payload: SubtitleData): SubtitleData {
  const canonical = resolveCanonicalPrimarySubtitle({
    liveText: payload.text,
-    currentTimeSec: Number(appState.mpvClient?.currentTimePos),
+    currentTimeSec: toSubtitleClock(
+      Number(appState.mpvClient?.currentTimePos),
+      appState.mpvClient?.currentSubDelay ?? 0,
+    ),
    cues: appState.activeParsedSubtitleCues,
  });
  return {
@@ -1951,9 +1956,11 @@ function captureCurrentPrimarySubtitleMiningContext(): SubtitleMiningContext | n
  // Mine what the overlay shows, not raw mpv `sub-text`: the raw text lists every active
  // event, so a finished caption row lingering beside a fresh line would end up on the
  // card. The parsed view also carries the cue's own timings for the clip range.
+  // Cues sit on the subtitle clock, so the lookup undoes `sub-delay` first.
+  const subDelay = appState.mpvClient?.currentSubDelay ?? 0;
  const resolved = resolvePrimarySubtitle({
    liveText: appState.mpvClient?.currentSubText ?? '',
-    currentTimeSec: Number(appState.mpvClient?.currentTimePos),
+    currentTimeSec: toSubtitleClock(Number(appState.mpvClient?.currentTimePos), subDelay),
    cues: appState.activeParsedSubtitleCues,
  });
  // Same validity bar as the live capture path: an unusable resolved span must fall
@@ -1968,13 +1975,16 @@ function captureCurrentPrimarySubtitleMiningContext(): SubtitleMiningContext | n
  ) {
    return captureLiveSubtitleMiningContext(appState.mpvClient);
  }
-  return {
-    source: 'overlay',
-    text: resolvedText,
-    startTime: resolved.startTime,
-    endTime: resolved.endTime,
-    capturedAtMs: Date.now(),
-  };
+  return shiftSubtitleRangeToVideoClock<SubtitleMiningContext>(
+    {
+      source: 'overlay',
+      text: resolvedText,
+      startTime: resolved.startTime,
+      endTime: resolved.endTime,
+      capturedAtMs: Date.now(),
+    },
+    subDelay,
+  );
 }
 function emitSubtitlePayload(payload: SubtitleData, options?: { resumePrefetch?: boolean }): void {
  const timedPayload = withCurrentSubtitleTiming(payload);
@@ -2116,13 +2126,18 @@ function getSubtitleSidebarPlaybackState(): SubtitleSidebarPlaybackState {
    subtitleSidebarCuesRef = appState.activeParsedSubtitleCues;
    subtitleSidebarCuesRevision += 1;
  }
+  const subDelay = appState.mpvClient?.currentSubDelay ?? 0;
  return {
    sourceKey: JSON.stringify([
      appState.activeParsedSubtitleMediaPath,
      appState.activeParsedSubtitleSource,
    ]),
    cuesRevision: subtitleSidebarCuesRevision,
-    currentTimeSec: appState.mpvClient?.currentTimePos ?? null,
+    currentTimeSec:
+      appState.mpvClient?.currentTimePos === undefined
+        ? null
+        : toSubtitleClock(appState.mpvClient.currentTimePos, subDelay),
+    subDelay,
    currentSubtitle: {
      text: appState.currentSubText,
      startTime: appState.mpvClient?.currentSubStart ?? null,
@@ -2161,6 +2176,7 @@ function sendRendererMpvCommand(rawCommand: (string | number)[]): void {
      rawCommand,
      appState.activeParsedSubtitleCues,
      appState.mpvClient?.currentTimePos ?? Number.NaN,
+      appState.mpvClient?.currentSubDelay ?? 0,
    ) ?? rawCommand;
  if (isExplicitMpvSeekCommand(command)) {
    explicitSeekIntentExpiresAtMs = Date.now() + EXPLICIT_SEEK_INTENT_TTL_MS;
@@ -3115,7 +3131,10 @@ const mediaTimingReviewRuntime = createMediaTimingReviewRuntime({
  acquireMediaWindow: (source, range) => getSharedRemoteMediaWindowCache().acquire(source, range),
  getSubtitleContextLines: (range) =>
    collectMediaTimingContextLines({
-      cues: appState.activeParsedSubtitleCues,
+      // Review ranges and tracker entries are on the video clock; parsed cues are not.
+      cues: appState.activeParsedSubtitleCues.map((cue) =>
+        shiftSubtitleRangeToVideoClock(cue, appState.mpvClient?.currentSubDelay ?? 0),
+      ),
      fallbackPrevious: appState.subtitleTimingTracker?.getRecentEntries(40) ?? [],
      startTime: range.startTime,
      endTime: range.endTime,
@@ -6028,7 +6047,11 @@ const { registerIpcRuntimeHandlers } = composeIpcRuntimeHandlers({
      // live mpv sub timings at lookup time so media generation clips the mined line even
      // when extraction finishes long after playback has moved on.
      recordSubtitleMiningContext: (context) =>
-        recordSubtitleMiningContext(context ?? captureCurrentPrimarySubtitleMiningContext()),
+        recordSubtitleMiningContext(
+          context
+            ? shiftSubtitleRangeToVideoClock(context, appState.mpvClient?.currentSubDelay ?? 0)
+            : captureCurrentPrimarySubtitleMiningContext(),
+        ),
      tokenizeCurrentSubtitle: async () => {
        const tokenizeSubtitleForCurrent = tokenizeSubtitleDeferred;
        return resolveCurrentSubtitleForRenderer({
@@ -1,3 +1,4 @@
+import { toSubtitleClock } from '../../core/services/subtitle-clock';
 import type { SubtitleCue, SubtitleData } from '../../types';
 import { selectAutoplayStartupCue } from './autoplay-subtitle-primer';
 import { primeVisibleOverlaySubtitleFromMpv } from './current-subtitle-snapshot';
@@ -12,6 +13,7 @@ type AutoplaySubtitlePrimingMpvClient = {
  requestProperty: (name: string) => Promise<unknown>;
  currentVideoPath?: string;
  currentTimePos?: number;
+  currentSubDelay?: number;
  currentSubText?: string;
  currentSecondarySubText?: string;
  setCurrentSecondarySubText?: (text: string) => void;
@@ -156,7 +158,7 @@ export function createAutoplaySubtitlePrimingRuntime(deps: AutoplaySubtitlePrimi
    const currentTimeSec = Number(client?.currentTimePos ?? deps.getLastObservedTimePos());
    return resolvePrimarySubtitleText({
      liveText: text,
-      currentTimeSec,
+      currentTimeSec: toSubtitleClock(currentTimeSec, client?.currentSubDelay ?? 0),
      cues: deps.getActiveParsedSubtitleCues(),
    });
  }
@@ -270,7 +272,10 @@ export function createAutoplaySubtitlePrimingRuntime(deps: AutoplaySubtitlePrimi
    const currentTimeSeconds = Number(
      timePosRaw ?? client?.currentTimePos ?? deps.getLastObservedTimePos() ?? 0,
    );
-    const resolvedTimeSeconds = Number.isFinite(currentTimeSeconds) ? currentTimeSeconds : 0;
+    const resolvedTimeSeconds = toSubtitleClock(
+      Number.isFinite(currentTimeSeconds) ? currentTimeSeconds : 0,
+      client?.currentSubDelay ?? 0,
+    );
    const cue = selectAutoplayStartupCue(
      cues,
      resolvedTimeSeconds,
@@ -176,6 +176,21 @@ test('subtitle-track transitions ignore stale parsed cues until replacement cues
  assert.deepEqual(recordedStarts.slice(-1), [20]);
 });

+test('subtitle timing history records lines on the video clock under sub-delay', () => {
+  const timing: Array<{ text: string; start: number; end: number }> = [];
+  const { handlers } = buildMainDeps({
+    mpvClient: { currentSubDelay: 2 },
+    subtitleTimingTracker: {
+      recordSubtitle: (text: string, start: number, end: number) =>
+        timing.push({ text, start, end }),
+    },
+  });
+
+  handlers.recordSubtitleTiming('食べる', 5, 8);
+
+  assert.deepEqual(timing, [{ text: '食べる', start: 7, end: 10 }]);
+});
+
 test('canonical ASS cues replace live glyph spam for display, history, and immersion', () => {
  const immersion: Array<{ text: string; start: number; end: number }> = [];
  const timing: Array<{ text: string; start: number; end: number }> = [];
@@ -1,3 +1,4 @@
+import { toSubtitleClock } from '../../core/services/subtitle-clock';
 import { createSubtitleLineDedupGate } from '../../core/services/subtitle-line-dedup-gate';
 import type { MergedToken, SubtitleCue, SubtitleData } from '../../types';
 import {
@@ -23,6 +24,7 @@ export function createBuildBindMpvMainEventHandlersMainDepsHandler(deps: {
      currentSubText?: string;
      currentSecondarySubText?: string;
      currentTimePos?: number;
+      currentSubDelay?: number;
      requestProperty?: (name: string) => Promise<unknown>;
    } | null;
    immersionTracker: {
@@ -161,7 +163,10 @@ export function createBuildBindMpvMainEventHandlersMainDepsHandler(deps: {
    resolveSubtitleText: (liveText: string) =>
      resolvePrimarySubtitleText({
        liveText,
-        currentTimeSec: Number(deps.appState.mpvClient?.currentTimePos),
+        currentTimeSec: toSubtitleClock(
+          Number(deps.appState.mpvClient?.currentTimePos),
+          deps.appState.mpvClient?.currentSubDelay ?? 0,
+        ),
        cues: deps.appState.activeParsedSubtitleCues,
      }),
    getCurrentLiveSubtitleText: () => deps.appState.mpvClient?.currentSubText ?? '',
@@ -231,6 +236,9 @@ export function createBuildBindMpvMainEventHandlersMainDepsHandler(deps: {
    hasSubtitleTimingTracker: () => Boolean(deps.appState.subtitleTimingTracker),
    recordSubtitleTiming: (text: string, start: number, end: number) => {
      const secondaryText = deps.appState.mpvClient?.currentSecondarySubText || undefined;
+      // The tracker feeds multi-line mining, so it stores video-clock times: the subtitle
+      // timings plus the `sub-delay` in effect while the line was on screen.
+      const subDelay = deps.appState.mpvClient?.currentSubDelay ?? 0;
      const canonical = resolveCanonicalSample(text, start);
      if (!canonical) {
        const recordableText = resolveTextForRecording(text, start);
@@ -239,8 +247,8 @@ export function createBuildBindMpvMainEventHandlersMainDepsHandler(deps: {
        }
        deps.appState.subtitleTimingTracker?.recordSubtitle?.(
          recordableText,
-          start,
-          end,
+          start + subDelay,
+          end + subDelay,
          secondaryText,
        );
        return;
@@ -253,8 +261,8 @@ export function createBuildBindMpvMainEventHandlersMainDepsHandler(deps: {
        recordedTimingCanonicalKeys.add(key);
        deps.appState.subtitleTimingTracker?.recordSubtitle?.(
          cue.text,
-          cue.startTime,
-          cue.endTime,
+          cue.startTime + subDelay,
+          cue.endTime + subDelay,
          secondaryText,
        );
      }
@@ -481,6 +481,8 @@ function installKeyboardTestGlobals() {
    setSessionBindings: (value: CompiledSessionBinding[]) => {
      sessionBindings = value;
    },
+    // A plain overlay element over playback, outside any SubMiner UI.
+    createPlaybackTarget: () => new TestElement(),
    createInteractiveTarget: () => {
      const target = new TestElement();
      target.closest = (selector: string) => (selector.includes('.modal') ? target : null);
@@ -1297,6 +1299,42 @@ test('Hachidori attention without an open popup pane still forwards imported mpv
  }
 });

+test('an open subtitle sidebar only keeps imported mpv input aimed at the sidebar', async () => {
+  const { ctx, handlers, testGlobals } = createKeyboardHandlerHarness();
+
+  try {
+    testGlobals.setGetMpvInputBindings(async () => ({
+      keys: ['0', 'MBTN_LEFT_DBL'],
+      blockedKeys: [],
+    }));
+    await handlers.setupMpvInputForwarding();
+    await wait(0);
+    ctx.state.subtitleSidebarModalOpen = true;
+    const sidebarTarget = testGlobals.createInteractiveTarget();
+    const playbackTarget = testGlobals.createPlaybackTarget();
+
+    // Sidebar input runs first, while no key or button is held, so a held key cannot
+    // hide a forwarded press. Its release has no matching press to forward.
+    testGlobals.dispatchKeydown({ key: '0', code: 'Digit0', target: sidebarTarget });
+    testGlobals.dispatchMousedown({ button: 0, target: sidebarTarget });
+    testGlobals.dispatchMousedown({ button: 0, type: 'mouseup', target: sidebarTarget });
+    assert.deepEqual(testGlobals.mpvCommands, []);
+
+    testGlobals.dispatchKeydown({ key: '0', code: 'Digit0', target: playbackTarget });
+    testGlobals.dispatchMousedown({ button: 0, target: playbackTarget });
+    testGlobals.dispatchMousedown({ button: 0, type: 'mouseup', target: playbackTarget });
+
+    assert.deepEqual(testGlobals.mpvCommands, [
+      ['keydown', '0'],
+      ['keydown', 'MBTN_LEFT'],
+      ['keyup', 'MBTN_LEFT'],
+    ]);
+  } finally {
+    ctx.state.subtitleSidebarModalOpen = false;
+    testGlobals.restore();
+  }
+});
+
 test('keyboard mode: lookup toggle opens a lookup during Hachidori attention without a pane', async () => {
  const { ctx, handlers, testGlobals } = createKeyboardHandlerHarness();

@@ -123,12 +123,13 @@ export function createKeyboardHandlers(
  }

  // Imported mpv bindings only run when no SubMiner UI could be the input's target.
+  // The subtitle sidebar is a side panel over playback, so only input inside it (a
+  // `.modal` target) stays with SubMiner.
  function canForwardToMpv(target: EventTarget | null): boolean {
    return (
      keyboardConfigLoaded &&
      !ctx.state.playlistBrowserModalOpen &&
      !ctx.state.youtubePickerModalOpen &&
-      !ctx.state.subtitleSidebarModalOpen &&
      !isLookupPopupOpen(ctx.state, document) &&
      !isInteractiveTarget(target)
    );
@@ -28,6 +28,7 @@ export async function setup() {
    ],
    currentSubtitle: { text: '最初の台詞', startTime: 0, endTime: 1 },
    currentTimeSec: 0,
+    subDelay: 0,
    config: {
      ...SUBTITLE_DEFAULT_CONFIG.subtitleSidebar,
      enabled: true,
@@ -199,6 +199,7 @@ function createSidebarHarness(options: SidebarHarnessOptions = {}) {
    cues: options.cues ?? [{ startTime: 1, endTime: 2, text: 'first' }],
    currentSubtitle: options.currentSubtitle ?? { text: 'first', startTime: 1, endTime: 2 },
    currentTimeSec: 'currentTimeSec' in options ? (options.currentTimeSec ?? null) : 1.1,
+    subDelay: 0,
    config: { ...DEFAULT_SIDEBAR_CONFIG, ...options.config },
  };
  const requests = { snapshot: 0, playback: 0 };
@@ -226,8 +227,8 @@ function createSidebarHarness(options: SidebarHarnessOptions = {}) {
        },
        getSubtitleSidebarPlaybackState: async (): Promise<SubtitleSidebarPlaybackState> => {
          requests.playback += 1;
-          const { sourceKey, cuesRevision, currentTimeSec, currentSubtitle } = snapshot;
-          return { sourceKey, cuesRevision, currentTimeSec, currentSubtitle };
+          const { sourceKey, cuesRevision, currentTimeSec, subDelay, currentSubtitle } = snapshot;
+          return { sourceKey, cuesRevision, currentTimeSec, subDelay, currentSubtitle };
        },
        getPlaybackPaused: async () => false,
        sendMpvCommand: (command: MpvCommand) => {
@@ -528,6 +529,16 @@ test('subtitle sidebar seeks to the selected cue start using the overlap-aware s
  assert.deepEqual(h.mpvCommands.at(-1), ['seek', 3.48, 'absolute+exact']);
 });

+test('subtitle sidebar seeks to where mpv plays a sub-delay retimed cue', async () => {
+  const h = createSidebarHarness();
+  h.setSnapshot({ subDelay: 2 });
+  await h.modal.openSubtitleSidebarModal();
+
+  h.modal.seekToCue({ startTime: 1, endTime: 2, text: 'first' });
+
+  assert.deepEqual(h.mpvCommands.at(-1), ['seek', 3.08, 'absolute+exact']);
+});
+
 test('subtitle sidebar close reports hidden visibility and notifies the modal close', async () => {
  const h = createSidebarHarness();
  await h.modal.openSubtitleSidebarModal();
@@ -4,6 +4,7 @@ import type {
  SubtitleMiningContext,
  SubtitleSidebarSnapshot,
 } from '../../types';
+import { toVideoClock } from '../../core/services/subtitle-clock.js';
 import { subtitleCueListSeekTime } from '../../core/services/subtitle-cue-navigation.js';
 import type { ModalStateReader, RendererContext } from '../context';
 import { syncOverlayMouseIgnoreState } from '../overlay-mouse-ignore.js';
@@ -231,6 +232,8 @@ export function createSubtitleSidebarModal(
  let lastSubtitleSidebarLookupCueIndex = -1;
  let subtitleSourceKey: string | null = null;
  let subtitleCuesRevision: number | null = null;
+  // Latest mpv `sub-delay` from main; cue times plus this are where mpv plays the cue.
+  let subtitleSubDelay = 0;

  function restoreEmbeddedSidebarPassthrough(): void {
    syncOverlayMouseIgnoreState(ctx);
@@ -416,7 +419,7 @@ export function createSubtitleSidebarModal(
  function seekToCue(cue: SubtitleCue): void {
    window.electronAPI.sendMpvCommand([
      'seek',
-      subtitleCueListSeekTime(ctx.state.subtitleSidebarCues, cue),
+      toVideoClock(subtitleCueListSeekTime(ctx.state.subtitleSidebarCues, cue), subtitleSubDelay),
      'absolute+exact',
    ]);
  }
@@ -591,6 +594,7 @@ export function createSubtitleSidebarModal(
    const snapshot = await window.electronAPI.getSubtitleSidebarSnapshot();
    pollsSinceFullSnapshot = 0;
    subtitleCuesRevision = snapshot.cuesRevision;
+    subtitleSubDelay = snapshot.subDelay;
    if (snapshot.sourceKey !== subtitleSourceKey) {
      clearSubtitleSidebarSelection(ctx.dom.subtitleSidebarList);
      lastSubtitleSidebarLookupCueIndex = -1;
@@ -640,6 +644,7 @@ export function createSubtitleSidebarModal(
      await refreshSnapshot();
      return;
    }
+    subtitleSubDelay = playback.subDelay;
    updateActiveCue(playback.currentSubtitle, playback.currentTimeSec);
  }

@@ -90,6 +90,8 @@ export interface MpvClient {
  currentTimePos: number;
  currentSubStart: number;
  currentSubEnd: number;
+  /** mpv `sub-delay`; `sub-start`/`sub-end` do not include it. */
+  currentSubDelay: number;
  currentAudioStreamIndex: number | null;
  requestProperty?: (name: string) => Promise<unknown>;
  send(command: { command: unknown[]; request_id?: number }): boolean;
@@ -235,7 +235,10 @@ export interface SubtitleSidebarPlaybackState {
  sourceKey: string | null;
  /** Bumps whenever main swaps in a different parsed cue array. */
  cuesRevision: number;
+  /** Playback position on the subtitle clock (`time-pos` minus `sub-delay`), like cue times. */
  currentTimeSec: number | null;
+  /** mpv `sub-delay`: cue times plus this give the video-clock seek target. */
+  subDelay: number;
  currentSubtitle: {
    text: string;
    startTime: number | null;
@@ -251,6 +254,7 @@ export interface SubtitleSidebarSnapshot extends SubtitleSidebarPlaybackState {
 export interface SubtitleMiningContext {
  source: 'subtitle-sidebar' | 'overlay';
  text: string;
+  /** Video-clock seconds: subtitle timings plus mpv `sub-delay` at capture time. */
  startTime: number;
  endTime: number;
  capturedAtMs?: number;
Author	SHA1	Message	Date
sudacode	d06fe8b572	fix(mpv): move a pending replay pause when sub-delay changes	2026-10-25 22:21:59 -07:00
sudacode	8a2da51e41	test(e2e): mirror AnkiConnect notesInfo and updateNoteFields in fake notesInfo now returns one entry per requested id ({} for unknown notes), and updateNoteFields writes through so later reads see current fields.	2026-10-25 21:53:52 -07:00
sudacode	4d27e068c6	fix(subtitles): follow sub-delay in sidebar, navigation, and overlay matching Anything comparing time-pos with parsed cues now converts through a shared subtitle-clock helper: the sidebar highlight and click-to-seek, the sub-seek cue sanitizer, overlay/primer line resolution, and the replay pause point after sub-seek.	2026-10-25 21:40:02 -07:00
sudacode	929e78b28c	fix(anki): clip mined media on the sub-delay retimed timeline mpv's sub-start/sub-end and parsed cues carry the subtitle file's own timestamps; sub-delay (z/x, sub-step) only moves where mpv plays them. Mining now shifts subtitle timings onto the video clock before media generation, review, and MiscInfo timestamps.	2026-10-25 21:32:59 -07:00
sudacode	3068d02f89	docs(readme): refresh anime screenshots from current build - Replace annotations, one-key-mining, and yomitan-lookup screenshots - Update README alt text to match the new images - Add docs changelog fragment	2026-10-25 19:32:25 -07:00
sudacode	9150a60630	fix(overlay): forward mpv input while subtitle sidebar is open (#300 )	2026-10-24 23:28:58 -07:00
sudacode	3549e0ed93	chore(build): consolidate packaging inputs and build output layout (#299 )	2026-10-24 23:28:38 -07:00