Chore: Prepare & Update for v0.9.2

Chore: Patch Biometrics
Chore: Patch all Svelte-Warnings & Add Aria-Labels
2026-06-13 09:19:56 -05:00 · 2026-05-01 01:07:10 -05:00 · 2026-05-01 05:56:39 -05:00 · 2026-05-01 00:38:15 -05:00 · 2026-05-01 00:09:49 -05:00 · 2026-04-30 23:11:39 -05:00
122 changed files with 5959 additions and 4116 deletions
@@ -88,10 +88,10 @@ jobs:
      - name: Download Suwayomi (Linux x64)
        run: |
          curl -fsSL \
-            "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/Suwayomi-Server-v2.1.1867-linux-x64.tar.gz" \
+            "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087-linux-x64.tar.gz" \
            -o suwayomi-linux.tar.gz

-          echo "b2344bd73c4e26bede63cdb4b44b1b4168d8a8500b3b2b1a0219519a3ef708fe  suwayomi-linux.tar.gz" | sha256sum -c -
+          echo "888bee202649ce7e3e3468a729c4084fb465f024b4033cab3f8ab98b0c66fe76  suwayomi-linux.tar.gz" | sha256sum -c -

          mkdir -p suwayomi-extracted
          tar -xzf suwayomi-linux.tar.gz -C suwayomi-extracted --strip-components=1
@@ -79,7 +79,7 @@ jobs:
          download_suwayomi() {
            local asset="$1" sha="$2" outdir="$3"
            curl -fsSL \
-              "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/${asset}" \
+              "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/${asset}" \
              -o "${outdir}.tar.gz"
            echo "${sha}  ${outdir}.tar.gz" | shasum -a 256 -c -
            mkdir -p "${outdir}"
@@ -87,13 +87,13 @@ jobs:
          }

          download_suwayomi \
-            "Suwayomi-Server-v2.1.1867-macOS-arm64.tar.gz" \
-            "c80abdbba29f7895e9556c6c9481368557d5f930b5f69bcb30639ba498925f3c" \
+            "Suwayomi-Server-v2.1.2087-macOS-arm64.tar.gz" \
+            "59f73a53a139d5d843e16cab4f3ac425a410add6bee0a60920fa26eb0a4b8a5c" \
            "suwayomi-arm64"

          download_suwayomi \
-            "Suwayomi-Server-v2.1.1867-macOS-x64.tar.gz" \
-            "c7590aeb645dd7135a05b9f3ea1fee384a4abeb465c0b3638d5b738d20dfe174" \
+            "Suwayomi-Server-v2.1.2087-macOS-x64.tar.gz" \
+            "da7e664e4c2615a0b9eac09ee38fe979feee1d6c0b266e19dba1ceea8ae3795c" \
            "suwayomi-x64"

      - name: Stage Suwayomi sidecars
@@ -79,9 +79,9 @@ jobs:
        shell: bash
        run: |
          curl -fsSL \
-            "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/Suwayomi-Server-v2.1.1867-windows-x64.zip" \
+            "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087-windows-x64.zip" \
            -o suwayomi-windows.zip
-          echo "ab6687d278e0dd0984f67abbc853511a7e764f84b126a35d09bfd9b0307321ff  suwayomi-windows.zip" | sha256sum -c -
+          echo "65c3ec544190bc4e52f8ba05b49c87448421d9825aaaeb902cb4e34e69ff7207  suwayomi-windows.zip" | sha256sum -c -
          unzip -q suwayomi-windows.zip -d suwayomi-raw

      - name: Extract Suwayomi bundle
@@ -1,5 +1,5 @@
 pkgname=moku
-pkgver=0.9.1
+pkgver=0.9.2
 pkgrel=1
 pkgdesc="Native Linux manga reader frontend for Suwayomi-Server"
 arch=('x86_64')
@@ -19,11 +19,11 @@ makedepends=(
 )
 source=(
    "$pkgname-$pkgver.tar.gz::https://github.com/moku-project/Moku/archive/refs/tags/v$pkgver.tar.gz"
-    "Suwayomi-Server-v2.1.1867.jar::https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/Suwayomi-Server-v2.1.1867.jar"
+    "Suwayomi-Server-v2.1.2087.jar::https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087.jar"
 )
 sha256sums=(
-    'SKIP'
-    '51e307c2581e4e1a002991ab3e3a77503c8b074c42695987a984a7382d0ac5af'
+    '4d0fbed929d5660ddcb591ff33f808910e13df1e8e7bfc8df83f367fd7bcd881'
+    'f589a422674252394c13b289a9c8be691905bf583efb7f4d5f1501ae5e91e6b3'
 )

 prepare() {
@@ -45,11 +45,11 @@ package() {
    install -Dm755 src-tauri/target/release/moku \
        "$pkgdir/usr/bin/moku"

-    install -Dm644 "$srcdir/Suwayomi-Server-v2.1.1867.jar" \
+    install -Dm644 "$srcdir/Suwayomi-Server-v2.1.2087.jar" \
        "$pkgdir/usr/lib/moku/tachidesk/Suwayomi-Server.jar"

    install -dm755 "$pkgdir/usr/lib/moku/tachidesk/default-conf"
-    cat > "$pkgdir/usr/lib/moku/tachidesk/default-conf/server.conf" << 'EOF'
+    cat > "$pkgdir/usr/lib/moku/tachidesk/default-conf/server.conf" << 'CONF'
 server.ip = "127.0.0.1"
 server.port = 4567
 server.webUIEnabled = false
@@ -60,11 +60,11 @@ server.autoDownloadNewChapters = false
 server.globalUpdateInterval = 12
 server.maxSourcesInParallel = 6
 server.extensionRepos = []
-EOF
+CONF

-    install -Dm755 /dev/stdin "$pkgdir/usr/bin/moku-suwayomi" << 'EOF'
+    install -Dm755 /dev/stdin "$pkgdir/usr/bin/moku-suwayomi" << 'LAUNCHER'
 #!/bin/sh
-DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/moku/tachidesk"
+DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/Tachidesk"
 mkdir -p "$DATA_DIR"

 if [ ! -f "$DATA_DIR/server.conf" ]; then
@@ -93,7 +93,7 @@ exec java \
  -Dsun.awt.disablegui=true \
  -Dsuwayomi.tachidesk.config.server.rootDir="$DATA_DIR" \
  -jar /usr/lib/moku/tachidesk/Suwayomi-Server.jar
-EOF
+LAUNCHER

    install -Dm644 packaging/io.github.moku_project.Moku.desktop \
        "$pkgdir/usr/share/applications/io.github.moku_project.Moku.desktop"
@@ -5,7 +5,7 @@
 <div align="center">

 [![Release](https://www.shieldcn.dev/github/release/moku-project/Moku.svg?variant=outline&size=default)](https://github.com/moku-project/Moku/releases/latest)
-[![Last Commit](https://www.shieldcn.dev/github/last-commit/moku-project/Moku.svg?variant=outline&size=default)](https://github.com/moku-project/Moku/commits/main)
+![GitHub Downloads](https://www.shieldcn.dev/github/downloads/moku-project/Moku.svg?variant=outline&size=default)
 [![Stars](https://www.shieldcn.dev/github/stars/moku-project/Moku.svg?variant=outline&size=default)](https://github.com/moku-project/Moku)
 [![Discord](https://www.shieldcn.dev/discord/members/x97hj8zR72.svg?variant=outline&size=default)](https://discord.gg/x97hj8zR72)

@@ -7,10 +7,7 @@ Major Revisions:

 Minor Revisions:
 - Investigate feasibility of Multi-Page Screenshot (Reader)
- - Add Hover Info on Library (Make sure doesn't conflict with additional clicks)
 - Revise Migration (https://github.com/Suwayomi/Suwayomi-WebUI/pull/1073)
- - Look at how Manga are Organized in WebUI and Implement into Series-Detail (Chapter Display is Off)
-

 Priority Bugs:
 - Fix Library-Refresh System (TESTING)
@@ -19,21 +16,27 @@ Priority Bugs:
   - Allow User to Wipe Suwayomi (Scratch)
   - If Possible, Component based Wipe (Library, Etc)

-
-In-Progress:
- - Enable Cloudflare Bypass (Suwayomi Config) (Requires Patching)
+Pending/On-Hold:
+- Enable Cloudflare Bypass (Suwayomi Config) (Requires Patching)
 - Working on 3D Display Cards
 - Add Flathub Support (Pending Video)

+ - Change Auto-Link Threshold
+   - Fix Auto-Link De-dupe for Images
+   - Optimize Auto-Link Latency (IP)

+In-Progress:
 - Fix Tracking Login
   - Pasting OAuth URL is not User-Friendly, Look for Alternatives

- Tracking
-   - Fix SeriesDetail Tracking Window (Maybe Link to TrackingPanel)
+ - Apply Syer's Fix for Library on Backup Load (Manga Metadata)
+   - Note User's have to always install extensions manually
+      - Create "Missing Source" for Manga

- Hide Completed from Library Settting
+ - Wire Series-Detail Refresh to Fix Manga-Metadata (MAJOR)

+ - Add Disable Auto-Completed Feature to Library
+ - Cap ReaderSettings Zoom (100)
+ - Fix SeriesDetail Chapter Amount (Link to Scanlator Filtering)

 Notes from last time:
- - Currently working on #42, just need to mount panel and fix button in reader
@@ -14,11 +14,15 @@
  outputs =
    inputs@{ flake-parts, crane, rust-overlay, ... }:
    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" "aarch64-linux" ];
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];

-      perSystem = { system, lib, ... }:
+      perSystem =
+        { system, lib, ... }:
        let
-          version = "0.9.1";
+          version = "0.9.2";

          pkgs = import inputs.nixpkgs {
            inherit system;
@@ -26,7 +30,10 @@
          };

          rustToolchain = pkgs.rust-bin.stable.latest.default.override {
-            extensions = [ "rust-src" "rust-analyzer" ];
+            extensions = [
+              "rust-src"
+              "rust-analyzer"
+            ];
          };

          craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
@@ -46,10 +53,14 @@
            gsettings-desktop-schemas
          ];

+          # ── source filters ──────────────────────────────────────────────
+
          frontendSrc = lib.cleanSourceWith {
            src = ./.;
-            filter = path: type:
-              let base = builtins.baseNameOf path;
+            filter =
+              path: type:
+              let
+                base = builtins.baseNameOf path;
              in
              (lib.hasInfix "/src" path)
              || base == "index.html"
@@ -59,268 +70,48 @@
              || base == "vite.config.ts";
          };

-          frontend = pkgs.stdenv.mkDerivation {
-            pname   = "moku-frontend";
-            inherit version;
-            src     = frontendSrc;
-
-            nativeBuildInputs = with pkgs; [ nodejs_22 pnpm pnpmConfigHook ];
-
-            pnpmDeps = pkgs.fetchPnpmDeps {
-              pname          = "moku-frontend";
-              inherit version;
-              src            = frontendSrc;
-              fetcherVersion = 1;
-              hash           = "sha256-nlhm3NYn4x+JlKcCgj1lAX43muB3QRKGDzaxfQNfJwc=";
-            };
-
-            buildPhase   = "pnpm build";
-            installPhase = "cp -r dist $out";
-          };
-
          cargoSrc = lib.cleanSourceWith {
            src = ./src-tauri;
-            filter = path: type:
+            filter =
+              path: type:
              (craneLib.filterCargoSources path type)
              || (lib.hasInfix "/icons/" path)
              || (lib.hasInfix "/capabilities/" path)
              || (builtins.baseNameOf path == "tauri.conf.json");
          };

-          commonArgs = {
-            src        = cargoSrc;
-            cargoToml  = ./src-tauri/Cargo.toml;
-            cargoLock  = ./src-tauri/Cargo.lock;
-            strictDeps = true;
-            buildInputs      = runtimeLibs;
-            nativeBuildInputs = with pkgs; [ pkg-config wrapGAppsHook3 ];
-            preBuild = ''
-              cp -r ${frontend} ../dist
-            '';
+          # ── packages ────────────────────────────────────────────────────
+
+          suwayomiServer = pkgs.callPackage ./nix/server.nix { };
+
+          frontend = pkgs.callPackage ./nix/frontend.nix {
+            inherit version;
+            src = frontendSrc;
          };

-          cargoArtifacts = craneLib.buildDepsOnly commonArgs;
-
-          moku = craneLib.buildPackage (commonArgs // {
-            inherit cargoArtifacts;
-            meta.mainProgram = "moku";
-            postInstall = ''
-              mkdir -p "$out/share/applications"
-              cat > "$out/share/applications/moku.desktop" << EOF
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Moku
-Comment=Manga reader frontend for Suwayomi
-Exec=$out/bin/moku
-Icon=moku
-Terminal=false
-Categories=Graphics;Viewer;
-Keywords=manga;comic;reader;suwayomi;
-StartupWMClass=moku
-EOF
-
-              for size in 32x32 128x128 256x256 512x512; do
-                src="icons/$size.png"
-                [ -f "$src" ] && install -Dm644 "$src" \
-                  "$out/share/icons/hicolor/$size/apps/moku.png"
-              done
-
-              for size in 128x128 256x256; do
-                src="icons/''${size}@2x.png"
-                [ -f "$src" ] && install -Dm644 "$src" \
-                  "$out/share/icons/hicolor/''${size}@2/apps/moku.png"
-              done
-
-              install -Dm644 "${./src/assets/moku-icon.svg}" \
-                "$out/share/icons/hicolor/scalable/apps/moku.svg"
-
-              wrapProgram $out/bin/moku \
-                --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share/gsettings-schemas" [
-                  pkgs.gsettings-desktop-schemas
-                  pkgs.gtk3
-                ]}" \
-                --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \
-                --prefix PATH : "${lib.makeBinPath [ pkgs.suwayomi-server ]}" \
-                --set GDK_BACKEND wayland \
-                --set WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS 1
-            '';
-          });
-
-          bumpScript = pkgs.writeShellApplication {
-            name = "moku-bump";
-            runtimeInputs = with pkgs; [ gnused coreutils git rustToolchain
-                                         nodejs_22 pnpm
-                                         (python3.withPackages (ps: [ ps.aiohttp ps.tomlkit ])) ];
-            text = ''
-              [[ $# -lt 1 ]] && { echo "Usage: nix run .#bump -- <version>"; exit 1; }
-              VERSION="$1"
-              REPO="$(git rev-parse --show-toplevel)"
-
-              echo "── Bumping version fields to $VERSION ──"
-              sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" \
-                "$REPO/src-tauri/tauri.conf.json"
-              sed -i "0,/^version = \"[^\"]*\"/s//version = \"$VERSION\"/" \
-                "$REPO/src-tauri/Cargo.toml"
-              sed -i "s/version = \"[^\"]*\";/version = \"$VERSION\";/g" \
-                "$REPO/flake.nix"
-              sed -i "s/^pkgver=.*/pkgver=$VERSION/" "$REPO/PKGBUILD"
-              sed -i "s/^pkgrel=.*/pkgrel=1/"        "$REPO/PKGBUILD"
-              echo "Done"
-
-              echo "── Regenerating Cargo.lock ──"
-              (cd "$REPO/src-tauri" && cargo generate-lockfile)
-              echo "Done"
-
-              echo "── Building frontend ──"
-              cd "$REPO"
-              pnpm install --frozen-lockfile
-              pnpm build
-              echo "Done"
-
-              echo "── Repacking frontend-dist.tar.gz ──"
-              tar -czf "$REPO/packaging/frontend-dist.tar.gz" -C "$REPO" dist
-              FRONTEND_SHA=$(sha256sum "$REPO/packaging/frontend-dist.tar.gz" | awk '{print $1}')
-              echo "sha256: $FRONTEND_SHA"
-
-              echo "── Regenerating cargo-sources.json ──"
-              python3 "$REPO/packaging/flatpak-cargo-generator.py" \
-                "$REPO/src-tauri/Cargo.lock" \
-                -o "$REPO/packaging/cargo-sources.json"
-              echo "Done"
-
-              echo "── Patching flatpak manifest (version + frontend sha256) ──"
-              MANIFEST="$REPO/io.github.moku_project.Moku.yml"
-              sed -i "s/tag: v[^[:space:]]*/tag: v$VERSION/" "$MANIFEST"
-              python3 - "$MANIFEST" "$FRONTEND_SHA" <<'PYEOF'
-              import re, sys
-              path, sha = sys.argv[1], sys.argv[2]
-              text = open(path).read()
-              updated, n = re.subn(
-                r'(path:\s*packaging/frontend-dist\.tar\.gz\s*\n\s*sha256:\s*)[0-9a-f]+',
-                r'\g<1>' + sha, text)
-              if n == 0:
-                  sys.exit("ERROR: could not find frontend-dist sha256 in manifest")
-              open(path, 'w').write(updated)
-              PYEOF
-              echo "Done"
-
-              echo ""
-              echo "Bumped to v$VERSION"
-              echo ""
-              echo "Commit field in the flatpak manifest still points to the old tag."
-              echo "After pushing the tag, run:"
-              echo "  nix run .#post-tag-bump -- $VERSION"
-            '';
+          moku = import ./nix/moku.nix {
+            inherit lib craneLib pkgs runtimeLibs frontend suwayomiServer version cargoSrc;
+            appIcon = ./src/assets/moku-icon.svg;
          };

-          postTagBumpScript = pkgs.writeShellApplication {
-            name = "moku-post-tag-bump";
-            runtimeInputs = with pkgs; [ gnused coreutils git curl ];
-            text = ''
-              [[ $# -lt 1 ]] && { echo "Usage: nix run .#post-tag-bump -- <version>"; exit 1; }
-              VERSION="$1"
-              REPO="$(git rev-parse --show-toplevel)"
-              MANIFEST="$REPO/io.github.moku_project.Moku.yml"
-              PKGBUILD="$REPO/PKGBUILD"
+          # ── dev/release scripts ─────────────────────────────────────────

-              echo "── Resolving commit for v$VERSION ──"
-              COMMIT=$(git ls-remote https://github.com/moku-project/Moku.git "refs/tags/v$VERSION" \
-                | awk '{print $1}')
-              [[ -z "$COMMIT" ]] && { echo "ERROR: tag v$VERSION not found on remote"; exit 1; }
-              echo "commit: $COMMIT"
-              sed -i "s/commit: [0-9a-f]\{40\}/commit: $COMMIT/" "$MANIFEST"
-              echo "Done"
-
-              echo "── Fetching PKGBUILD tarball sha256 ──"
-              TARBALL_URL="https://github.com/moku-project/Moku/archive/refs/tags/v$VERSION.tar.gz"
-              TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')
-              sed -i "s/\(sha256sums=('\)[0-9a-f]\{64\}/\1$TARBALL_SHA/" "$PKGBUILD"
-              grep -q "$TARBALL_SHA" "$PKGBUILD" \
-                || { echo "ERROR: PKGBUILD sha256 replacement failed"; exit 1; }
-              echo "Done"
-
-              echo ""
-              echo "post-tag-bump complete for v$VERSION"
-            '';
-          };
-
-          flatpakScript = pkgs.writeShellApplication {
-            name = "moku-flatpak";
-            runtimeInputs = with pkgs; [
-              gnused coreutils git
-              appstream flatpak-builder flatpak
-            ];
-            text = ''
-              [[ $# -lt 1 ]] && { echo "Usage: nix run .#flatpak -- <version>"; exit 1; }
-              VERSION="$1"
-              REPO="$(git rev-parse --show-toplevel)"
-              MANIFEST="$REPO/io.github.moku_project.Moku.yml"
-
-              echo "── Building flatpak for v$VERSION ──"
-              rm -rf "$REPO/build-dir" "$REPO/repo"
-              flatpak-builder \
-                --repo="$REPO/repo" \
-                --force-clean \
-                "$REPO/build-dir" \
-                "$MANIFEST"
-              flatpak build-bundle "$REPO/repo" "$REPO/moku.flatpak" io.github.moku_project.Moku
-              rm -rf "$REPO/build-dir" "$REPO/repo"
-
-              echo ""
-              echo "moku.flatpak created — v$VERSION"
-            '';
-          };
-
-          pkgbuildBumpScript = pkgs.writeShellApplication {
-            name = "moku-pkgbuild-bump";
-            runtimeInputs = with pkgs; [ gnused curl coreutils git ];
-            text = ''
-              [[ $# -lt 1 ]] && { echo "Usage: nix run .#pkgbuild-bump -- <version>"; exit 1; }
-              VERSION="$1"
-              REPO="$(git rev-parse --show-toplevel)"
-              PKGBUILD="$REPO/PKGBUILD"
-              [[ -f "$PKGBUILD" ]] || { echo "PKGBUILD not found"; exit 1; }
-
-              TARBALL_URL="https://github.com/moku-project/Moku/archive/refs/tags/v$VERSION.tar.gz"
-              echo "Fetching tarball sha256..."
-              TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')
-
-              sed -i "s/^pkgver=.*/pkgver=$VERSION/"   "$PKGBUILD"
-              sed -i "s/^pkgrel=.*/pkgrel=1/"          "$PKGBUILD"
-              sed -i "s/\(sha256sums=('\)[0-9a-f]\{64\}/\1$TARBALL_SHA/" "$PKGBUILD"
-
-              grep -q "$TARBALL_SHA" "$PKGBUILD" \
-                || { echo "ERROR: sha256 replacement failed"; exit 1; }
-
-              echo "PKGBUILD -> $VERSION ($TARBALL_SHA)"
-            '';
-          };
-
-          tunnelScript = pkgs.writeShellApplication {
-            name = "moku-tunnel";
-            runtimeInputs = with pkgs; [ cloudflared ];
-            text = ''
-              PORT="''${1:-4567}"
-              cloudflared tunnel --url "http://localhost:$PORT"
-            '';
-          };
+          scripts = import ./nix/scripts.nix { inherit pkgs rustToolchain version; };

        in
        {
+          packages = {
+            inherit moku frontend suwayomiServer;
+            default = moku;
+          };
+
          apps = {
            default = { type = "app"; program = "${moku}/bin/moku"; };
            moku = { type = "app"; program = "${moku}/bin/moku"; };
-            bump          = { type = "app"; program = "${bumpScript}/bin/moku-bump"; };
-            post-tag-bump = { type = "app"; program = "${postTagBumpScript}/bin/moku-post-tag-bump"; };
-            flatpak       = { type = "app"; program = "${flatpakScript}/bin/moku-flatpak"; };
-            pkgbuild-bump = { type = "app"; program = "${pkgbuildBumpScript}/bin/moku-pkgbuild-bump"; };
-            tunnel        = { type = "app"; program = "${tunnelScript}/bin/moku-tunnel"; };
-          };
-
-          packages = {
-            inherit moku frontend;
-            default = moku;
+            bump = { type = "app"; program = "${scripts.bump}/bin/moku-bump"; };
+            post-tag-bump = { type = "app"; program = "${scripts.postTagBump}/bin/moku-post-tag-bump"; };
+            flatpak = { type = "app"; program = "${scripts.flatpak}/bin/moku-flatpak"; };
+            tunnel = { type = "app"; program = "${scripts.tunnel}/bin/moku-tunnel"; };
          };

          devShells.default = pkgs.mkShell {
@@ -331,10 +122,13 @@ EOF
              wrapGAppsHook3
              nodejs_22
              pnpm
-              suwayomi-server
+              suwayomiServer
              cloudflared
              xdg-utils
-              (python3.withPackages (ps: [ ps.aiohttp ps.tomlkit ]))
+              (python3.withPackages (ps: [
+                ps.aiohttp
+                ps.tomlkit
+              ]))
            ];
            shellHook = ''
              export NO_STRIP=true
@@ -343,12 +137,11 @@ EOF

              echo "Moku dev shell — pnpm install && pnpm tauri:dev"
              echo ""
-              echo "Release workflow:"
-              echo "  nix run .#bump          -- <ver>   bump all versions + rebuild artifacts"
+              echo "  nix run .#bump          -- <ver>"
              echo "  git commit && git tag && git push"
-              echo "  nix run .#post-tag-bump -- <ver>   patch manifest commit + PKGBUILD sha"
-              echo "  nix run .#flatpak       -- <ver>   build moku.flatpak"
-              echo "  nix run .#tunnel        -- [port]  cloudflare tunnel (default 4567)"
+              echo "  nix run .#post-tag-bump -- <ver>"
+              echo "  nix run .#flatpak       -- <ver>"
+              echo "  nix run .#tunnel        -- [port]"
            '';
          };

@@ -114,7 +114,7 @@ modules:
        cat > /app/bin/tachidesk-server << 'EOF'
        #!/bin/sh

-        DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/moku/tachidesk"
+        DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/Tachidesk"
        mkdir -p "$DATA_DIR"

        # Seed conf on first run
@@ -155,8 +155,8 @@ modules:

    sources:
      - type: file
-        url: https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/suwayomi-server-v2.1.1867.jar
-        sha256: 51e307c2581e4e1a002991ab3e3a77503c8b074c42695987a984a7382d0ac5af
+        url: https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087.jar
+        sha256: f589a422674252394c13b289a9c8be691905bf583efb7f4d5f1501ae5e91e6b3
        dest-filename: Suwayomi-Server.jar

  - name: moku
@@ -179,11 +179,11 @@ modules:
    sources:
      - type: git
        url: https://github.com/moku-project/Moku.git
-        tag: v0.9.1
-        commit: 514910667b0d6e375569a48fb7cef11411d30fbd
+        tag: v0.9.2
+        commit: e33464b05baddc7c4ad3815f3f126f791e8c58cc
      - type: file
        path: packaging/frontend-dist.tar.gz
-        sha256: ce773b63c625448df8e128508b46e7e84d2e5cdb1f2b65a6a03f52a4e350b0bf
+        sha256: 22128c591ddacac218b7223106ed3c3f052799db2a647247789492b925370086
      - packaging/cargo-sources.json
      - type: inline
        dest: src-tauri/.cargo
@@ -0,0 +1,18 @@
+{ lib, stdenv, nodejs_22, pnpm, pnpmConfigHook, fetchPnpmDeps, version, src }:
+
+stdenv.mkDerivation {
+  pname = "moku-frontend";
+  inherit version src;
+
+  nativeBuildInputs = [ nodejs_22 pnpm pnpmConfigHook ];
+
+  pnpmDeps = fetchPnpmDeps {
+    pname = "moku-frontend";
+    inherit version src;
+    fetcherVersion = 1;
+    hash = "sha256-t6Gj84hCE3CuDAJfbdXi0FuqgPCqlkMmAzETcKL4e3U=";
+  };
+
+  buildPhase = "pnpm build";
+  installPhase = "cp -r dist $out";
+}
@@ -0,0 +1,74 @@
+{
+  lib,
+  craneLib,
+  pkgs,
+  runtimeLibs,
+  frontend,
+  suwayomiServer,
+  version,
+  cargoSrc,
+  appIcon,
+}:
+
+let
+  commonArgs = {
+    src = cargoSrc;
+    pname = "moku";
+    inherit version;
+    strictDeps = true;
+    buildInputs = runtimeLibs;
+    nativeBuildInputs = with pkgs; [ pkg-config wrapGAppsHook3 ];
+    preBuild = ''
+      cp -r ${frontend} ../dist
+    '';
+  };
+
+  cargoArtifacts = craneLib.buildDepsOnly commonArgs;
+in
+craneLib.buildPackage (commonArgs // {
+  inherit cargoArtifacts;
+
+  meta.mainProgram = "moku";
+
+  postInstall = ''
+    mkdir -p "$out/share/applications"
+    cat > "$out/share/applications/moku.desktop" << EOF
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Moku
+Comment=Manga reader frontend for Suwayomi
+Exec=$out/bin/moku
+Icon=moku
+Terminal=false
+Categories=Graphics;Viewer;
+Keywords=manga;comic;reader;suwayomi;
+StartupWMClass=moku
+EOF
+
+    for size in 32x32 128x128 256x256 512x512; do
+      src="icons/$size.png"
+      [ -f "$src" ] && install -Dm644 "$src" \
+        "$out/share/icons/hicolor/$size/apps/moku.png"
+    done
+
+    for size in 128x128 256x256; do
+      src="icons/''${size}@2x.png"
+      [ -f "$src" ] && install -Dm644 "$src" \
+        "$out/share/icons/hicolor/''${size}@2/apps/moku.png"
+    done
+
+    install -Dm644 "${appIcon}" \
+      "$out/share/icons/hicolor/scalable/apps/moku.svg"
+
+    wrapProgram $out/bin/moku \
+      --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share/gsettings-schemas" [
+        pkgs.gsettings-desktop-schemas
+        pkgs.gtk3
+      ]}" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \
+      --prefix PATH : "${lib.makeBinPath [ suwayomiServer ]}" \
+      --set GDK_BACKEND wayland \
+      --set WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS 1
+  '';
+})
@@ -0,0 +1,133 @@
+{ pkgs, rustToolchain, version }:
+
+{
+  bump = pkgs.writeShellApplication {
+    name = "moku-bump";
+    runtimeInputs = with pkgs; [
+      gnused
+      coreutils
+      git
+      rustToolchain
+      nodejs_22
+      pnpm
+      (python3.withPackages (ps: [ ps.aiohttp ps.tomlkit ]))
+    ];
+    text = ''
+      [[ $# -lt 1 ]] && { echo "Usage: nix run .#bump -- <version>"; exit 1; }
+      VERSION="$1"
+      REPO="$(git rev-parse --show-toplevel)"
+
+      echo "── Bumping version fields to $VERSION ──"
+      sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" \
+        "$REPO/src-tauri/tauri.conf.json"
+      sed -i "0,/^version = \"[^\"]*\"/s//version = \"$VERSION\"/" \
+        "$REPO/src-tauri/Cargo.toml"
+      sed -i "s/version = \"[^\"]*\";/version = \"$VERSION\";/g" \
+        "$REPO/flake.nix"
+      sed -i "s/^pkgver=.*/pkgver=$VERSION/" "$REPO/PKGBUILD"
+      sed -i "s/^pkgrel=.*/pkgrel=1/"        "$REPO/PKGBUILD"
+      echo "Done"
+
+      echo "── Regenerating Cargo.lock ──"
+      (cd "$REPO/src-tauri" && cargo generate-lockfile)
+      echo "Done"
+
+      echo "── Building frontend ──"
+      cd "$REPO"
+      pnpm install --frozen-lockfile
+      pnpm build
+      echo "Done"
+
+      echo "── Repacking frontend-dist.tar.gz ──"
+      tar -czf "$REPO/packaging/frontend-dist.tar.gz" -C "$REPO" dist
+      FRONTEND_SHA=$(sha256sum "$REPO/packaging/frontend-dist.tar.gz" | awk '{print $1}')
+      echo "sha256: $FRONTEND_SHA"
+
+      echo "── Regenerating cargo-sources.json ──"
+      python3 "$REPO/packaging/flatpak-cargo-generator.py" \
+        "$REPO/src-tauri/Cargo.lock" \
+        -o "$REPO/packaging/cargo-sources.json"
+      echo "Done"
+
+      echo "── Patching flatpak manifest ──"
+      MANIFEST="$REPO/io.github.moku_project.Moku.yml"
+      sed -i "s/tag: v[^[:space:]]*/tag: v$VERSION/" "$MANIFEST"
+      python3 - "$MANIFEST" "$FRONTEND_SHA" <<'PYEOF'
+      import re, sys
+      path, sha = sys.argv[1], sys.argv[2]
+      text = open(path).read()
+      updated, n = re.subn(
+        r'(path:\s*packaging/frontend-dist\.tar\.gz\s*\n\s*sha256:\s*)[0-9a-f]+',
+        r'\g<1>' + sha, text)
+      if n == 0:
+          sys.exit("ERROR: could not find frontend-dist sha256 in manifest")
+      open(path, 'w').write(updated)
+      PYEOF
+      echo "Done"
+
+      echo ""
+      echo "Bumped to v$VERSION — commit, tag, push, then: nix run .#post-tag-bump -- $VERSION"
+    '';
+  };
+
+  postTagBump = pkgs.writeShellApplication {
+    name = "moku-post-tag-bump";
+    runtimeInputs = with pkgs; [ gnused coreutils git curl ];
+    text = ''
+      [[ $# -lt 1 ]] && { echo "Usage: nix run .#post-tag-bump -- <version>"; exit 1; }
+      VERSION="$1"
+      REPO="$(git rev-parse --show-toplevel)"
+      MANIFEST="$REPO/io.github.moku_project.Moku.yml"
+      PKGBUILD="$REPO/PKGBUILD"
+
+      echo "── Resolving commit for v$VERSION ──"
+      COMMIT=$(git ls-remote https://github.com/moku-project/Moku.git "refs/tags/v$VERSION" \
+        | awk '{print $1}')
+      [[ -z "$COMMIT" ]] && { echo "ERROR: tag v$VERSION not found on remote"; exit 1; }
+      echo "commit: $COMMIT"
+      sed -i "s/commit: [0-9a-f]\{40\}/commit: $COMMIT/" "$MANIFEST"
+      echo "Done"
+
+      echo "── Fetching PKGBUILD tarball sha256 ──"
+      TARBALL_URL="https://github.com/moku-project/Moku/archive/refs/tags/v$VERSION.tar.gz"
+      TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')
+      sed -i "/sha256sums=/,/)/{ 0,/'/s/'[^']*'/'$TARBALL_SHA'/ }" "$PKGBUILD"
+      grep -q "$TARBALL_SHA" "$PKGBUILD" \
+        || { echo "ERROR: PKGBUILD sha256 replacement failed"; exit 1; }
+      echo "Done"
+
+      echo ""
+      echo "post-tag-bump complete for v$VERSION"
+    '';
+  };
+
+  flatpak = pkgs.writeShellApplication {
+    name = "moku-flatpak";
+    runtimeInputs = with pkgs; [ coreutils git appstream flatpak-builder flatpak ];
+    text = ''
+      [[ $# -lt 1 ]] && { echo "Usage: nix run .#flatpak -- <version>"; exit 1; }
+      REPO="$(git rev-parse --show-toplevel)"
+      MANIFEST="$REPO/io.github.moku_project.Moku.yml"
+
+      rm -rf "$REPO/build-dir" "$REPO/repo"
+      flatpak-builder \
+        --repo="$REPO/repo" \
+        --force-clean \
+        "$REPO/build-dir" \
+        "$MANIFEST"
+      flatpak build-bundle "$REPO/repo" "$REPO/moku.flatpak" io.github.moku_project.Moku
+      rm -rf "$REPO/build-dir" "$REPO/repo"
+
+      echo "moku.flatpak created"
+    '';
+  };
+
+  tunnel = pkgs.writeShellApplication {
+    name = "moku-tunnel";
+    runtimeInputs = with pkgs; [ cloudflared ];
+    text = ''
+      PORT="''${1:-4567}"
+      cloudflared tunnel --url "http://localhost:$PORT"
+    '';
+  };
+}
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  makeWrapper,
+  jdk21_headless,
+}:
+let
+  jdk = jdk21_headless;
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "suwayomi-server";
+  version = "2.1.2087";
+
+  src = fetchurl {
+    url = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}.jar";
+    hash = "sha256-9YmkImdCUjlME7KJqci+aRkFv1g++39NXxUBrl6R5rM=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontUnpack = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    install -Dm644 $src $out/share/suwayomi-server/suwayomi-server.jar
+
+    makeWrapper ${jdk}/bin/java $out/bin/suwayomi-server \
+      --add-flags "-Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false" \
+      --add-flags "-jar $out/share/suwayomi-server/suwayomi-server.jar"
+
+    runHook postBuild
+  '';
+
+  meta = {
+    description = "Free and open source manga reader server that runs extensions built for Mihon (Tachiyomi)";
+    homepage = "https://github.com/Suwayomi/Suwayomi-Server";
+    downloadPage = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases";
+    changelog = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mpl20;
+    platforms = jdk.meta.platforms;
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    mainProgram = "suwayomi-server";
+  };
+})
@@ -14,6 +14,7 @@
    "@tauri-apps/plugin-http": "^2.5.8",
    "@tauri-apps/plugin-os": "^2.3.2",
    "@tauri-apps/plugin-shell": "^2.3.5",
+    "@tauri-apps/plugin-store": "~2.4.2",
    "clsx": "^2.1.1",
    "phosphor-svelte": "^3.1.0",
    "svelte-spa-router": "^4.0.1",
@@ -20,6 +20,9 @@ importers:
      '@tauri-apps/plugin-shell':
        specifier: ^2.3.5
        version: 2.3.5
+      '@tauri-apps/plugin-store':
+        specifier: ~2.4.2
+        version: 2.4.2
      clsx:
        specifier: ^2.1.1
        version: 2.1.1
@@ -457,6 +460,9 @@ packages:
  '@tauri-apps/plugin-shell@2.3.5':
    resolution: {integrity: sha512-jewtULhiQ7lI7+owCKAjc8tYLJr92U16bPOeAa472LHJdgaibLP83NcfAF2e+wkEcA53FxKQAZ7byDzs2eeizg==}

+  '@tauri-apps/plugin-store@2.4.2':
+    resolution: {integrity: sha512-0ClHS50Oq9HEvLPhNzTNFxbWVOqoAp3dRvtewQBeqfIQ0z5m3JRnOISIn2ZVPCrQC0MyGyhTS9DWhHjpigQE7A==}
+
  '@types/estree@1.0.8':
    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}

@@ -1071,6 +1077,10 @@ snapshots:
    dependencies:
      '@tauri-apps/api': 2.10.1

+  '@tauri-apps/plugin-store@2.4.2':
+    dependencies:
+      '@tauri-apps/api': 2.10.1
+
  '@types/estree@1.0.8': {}

  '@types/pug@2.0.10': {}
@@ -1,6 +1,6 @@
 [package]
 name = "moku"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"

 [lib]
@@ -21,6 +21,7 @@ tauri-plugin-process      = "2"
 tauri-plugin-http         = "2"
 tauri-plugin-dialog       = "2"
 tauri-plugin-os           = "2.3.2"
+tauri-plugin-store        = "2"
 tauri-plugin-discord-rpc  = { git = "https://github.com/Youwes09/tauri-plugin-discord-rpc" }
 serde                     = { version = "1", features = ["derive"] }
 serde_json                = "1"
@@ -31,6 +32,12 @@ urlencoding               = "2"
 tokio                     = { version = "1", features = ["rt-multi-thread"] }
 reqwest                   = { version = "0.12", features = ["blocking"] }

+[target.'cfg(target_os = "windows")'.dependencies]
+windows = { version = "0.58", features = [
+    "Security_Credentials_UI",
+    "Win32_UI_WindowsAndMessaging",
+] }
+
 [profile.release]
 codegen-units = 1
 lto           = true
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Moku — Suwayomi launcher for Linux AppImage/deb.
+#  — Suwayomi launcher for Linux AppImage/deb.
 # Tauri resolves this via resolve_server_binary() in lib.rs, which looks for
 # "suwayomi-launcher" or "suwayomi-launcher.sh" in the resource directory.
 set -e
@@ -53,7 +53,7 @@ if [ ! -f "$JAR" ]; then
 fi

 # ── Data directory ─────────────────────────────────────────────────────────────
-DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/moku/tachidesk"
+DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/Tachidesk"
 mkdir -p "$DATA_DIR"

 # ── Seed server.conf on first run ──────────────────────────────────────────────
@@ -30,6 +30,7 @@
    "process:allow-restart",
    "http:default",
    "http:allow-fetch",
+    "store:default",
    "discord-rpc:default",
    "discord-rpc:allow-connect",
    "discord-rpc:allow-disconnect",
@@ -0,0 +1,98 @@
+use std::path::PathBuf;
+use tauri::Manager;
+
+fn backup_dir(app: &tauri::AppHandle) -> PathBuf {
+    app.path()
+        .app_data_dir()
+        .unwrap_or_else(|_| PathBuf::from("."))
+        .join("backups")
+}
+
+fn unix_now() -> u64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_secs()
+}
+
+#[tauri::command]
+pub async fn export_app_data(app: tauri::AppHandle, bytes: Vec<u8>) -> Result<(), String> {
+    use tauri_plugin_dialog::DialogExt;
+
+    let filename = format!("moku-backup-{}.zip", unix_now());
+
+    let path = app
+        .dialog()
+        .file()
+        .set_title("Save Moku app data backup")
+        .set_file_name(&filename)
+        .add_filter("Moku Backup", &["zip"])
+        .blocking_save_file()
+        .ok_or("Cancelled")?;
+
+    std::fs::write(PathBuf::from(path.to_string()), &bytes).map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+pub async fn import_app_data(app: tauri::AppHandle) -> Result<Vec<u8>, String> {
+    use tauri_plugin_dialog::DialogExt;
+
+    let path = app
+        .dialog()
+        .file()
+        .set_title("Open Moku app data backup")
+        .add_filter("Moku Backup", &["zip"])
+        .blocking_pick_file()
+        .ok_or("Cancelled")?;
+
+    std::fs::read(PathBuf::from(path.to_string())).map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+pub fn auto_backup_app_data(app: tauri::AppHandle, bytes: Vec<u8>) -> Result<(), String> {
+    let dir = backup_dir(&app);
+    std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
+
+    let dest = dir.join(format!("auto-moku-backup-{}.zip", unix_now()));
+    std::fs::write(&dest, &bytes).map_err(|e| e.to_string())?;
+
+    let mut entries: Vec<_> = std::fs::read_dir(&dir)
+        .map_err(|e| e.to_string())?
+        .filter_map(|e| e.ok())
+        .filter(|e| {
+            e.file_name()
+                .to_string_lossy()
+                .starts_with("auto-moku-backup-")
+        })
+        .collect();
+
+    entries.sort_by_key(|e| e.file_name());
+
+    for old in entries.iter().take(entries.len().saturating_sub(5)) {
+        let _ = std::fs::remove_file(old.path());
+    }
+
+    Ok(())
+}
+
+#[tauri::command]
+pub fn get_auto_backup_dir(app: tauri::AppHandle) -> String {
+    backup_dir(&app).to_string_lossy().into_owned()
+}
+
+#[tauri::command]
+pub fn read_store_files(app: tauri::AppHandle, names: Vec<String>) -> Vec<(String, String)> {
+    let base = app
+        .path()
+        .app_local_data_dir()
+        .unwrap_or_else(|_| PathBuf::from("."));
+
+    names
+        .into_iter()
+        .map(|name| {
+            let content = std::fs::read_to_string(base.join(&name))
+                .unwrap_or_else(|_| "{}".to_string());
+            (name, content)
+        })
+        .collect()
+}
@@ -0,0 +1,93 @@
+#[cfg(target_os = "windows")]
+mod windows_hello {
+    use windows::{
+        core::HSTRING,
+        Security::Credentials::UI::{UserConsentVerificationResult, UserConsentVerifier},
+        Win32::UI::WindowsAndMessaging::{
+            BringWindowToTop, FindWindowW, IsIconic, SetForegroundWindow, ShowWindow, SW_RESTORE,
+        },
+    };
+
+    fn to_wide(s: &str) -> Vec<u16> {
+        use std::os::windows::ffi::OsStrExt;
+        std::ffi::OsStr::new(s)
+            .encode_wide()
+            .chain(std::iter::once(0))
+            .collect()
+    }
+
+    fn try_focus_hello_dialog() -> bool {
+        let cls = to_wide("Credential Dialog Xaml Host");
+        unsafe {
+            let Ok(hwnd) = FindWindowW(
+                windows::core::PCWSTR(cls.as_ptr()),
+                windows::core::PCWSTR::null(),
+            ) else {
+                return false;
+            };
+            if IsIconic(hwnd).as_bool() {
+                let _ = ShowWindow(hwnd, SW_RESTORE);
+            }
+            let _ = BringWindowToTop(hwnd);
+            let _ = SetForegroundWindow(hwnd);
+            true
+        }
+    }
+
+    fn nudge_focus(retries: u32, delay_ms: u64) {
+        std::thread::spawn(move || {
+            std::thread::sleep(std::time::Duration::from_millis(delay_ms));
+            for _ in 0..retries {
+                if try_focus_hello_dialog() {
+                    break;
+                }
+                std::thread::sleep(std::time::Duration::from_millis(delay_ms));
+            }
+        });
+    }
+
+    pub fn authenticate(reason: &str) -> Result<(), String> {
+        nudge_focus(5, 250);
+        let result = UserConsentVerifier::RequestVerificationAsync(&HSTRING::from(reason))
+            .and_then(|op| {
+                nudge_focus(5, 250);
+                op.get()
+            })
+            .map_err(|e| format!("internalError:{e:?}"))?;
+
+        match result {
+            UserConsentVerificationResult::Verified => Ok(()),
+            UserConsentVerificationResult::Canceled => Err("userCancel".into()),
+            UserConsentVerificationResult::RetriesExhausted => Err("biometryLockout".into()),
+            UserConsentVerificationResult::DeviceBusy => Err("systemCancel".into()),
+            UserConsentVerificationResult::DeviceNotPresent => Err("biometryNotAvailable".into()),
+            UserConsentVerificationResult::DisabledByPolicy => Err("biometryNotAvailable".into()),
+            UserConsentVerificationResult::NotConfiguredForUser => Err("biometryNotEnrolled".into()),
+            _ => Err("authenticationFailed".into()),
+        }
+    }
+
+    pub fn is_available() -> bool {
+        use windows::Security::Credentials::UI::UserConsentVerifierAvailability;
+        UserConsentVerifier::CheckAvailabilityAsync()
+            .and_then(|op| op.get())
+            .map(|a| a == UserConsentVerifierAvailability::Available)
+            .unwrap_or(false)
+    }
+}
+
+#[tauri::command]
+pub fn windows_hello_authenticate(reason: String) -> Result<(), String> {
+    #[cfg(target_os = "windows")]
+    return windows_hello::authenticate(&reason);
+    #[cfg(not(target_os = "windows"))]
+    Err("notSupported".into())
+}
+
+#[tauri::command]
+pub fn windows_hello_available() -> bool {
+    #[cfg(target_os = "windows")]
+    return windows_hello::is_available();
+    #[cfg(not(target_os = "windows"))]
+    false
+}
@@ -0,0 +1,6 @@
+pub mod backup;
+pub mod biometric;
+pub mod server;
+pub mod storage;
+pub mod system;
+pub mod updater;
@@ -0,0 +1,80 @@
+use crate::server::{self, resolve::suwayomi_data_dir, SpawnError};
+use crate::ServerState;
+use tauri::Manager;
+
+#[tauri::command]
+pub fn spawn_server(binary: String, app: tauri::AppHandle) -> Result<(), SpawnError> {
+    {
+        let state = app.state::<ServerState>();
+        if state.0.lock().unwrap().is_some() {
+            return Ok(());
+        }
+    }
+
+    let data_dir = suwayomi_data_dir();
+    let log_path = data_dir.join("moku-spawn.log");
+    let _ = std::fs::create_dir_all(&data_dir);
+    let mut log = std::fs::OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open(&log_path)
+        .ok();
+
+    server::do_log(
+        &mut log,
+        &format!("[spawn_server] binary={:?} data_dir={:?}", binary, data_dir),
+    );
+
+    server::conf::seed_server_conf(&data_dir);
+
+    let mut invocation =
+        server::resolve::resolve_server_binary(&binary, &app, &mut log).map_err(|e| {
+            server::do_log(&mut log, &format!("[spawn_server] resolve failed: {:?}", e));
+            e
+        })?;
+
+    if invocation.bin.ends_with("java") || invocation.bin.ends_with("java.exe") {
+        let rootdir_flag = format!(
+            "-Dsuwayomi.tachidesk.config.server.rootDir={}",
+            data_dir.to_string_lossy()
+        );
+        invocation.args.insert(0, rootdir_flag);
+    }
+
+    let working_dir = invocation
+        .working_dir
+        .unwrap_or_else(|| std::env::current_dir().unwrap_or_default());
+
+    server::do_log(
+        &mut log,
+        &format!(
+            "[spawn_server] bin={:?} args={:?} cwd={:?}",
+            invocation.bin, invocation.args, working_dir
+        ),
+    );
+
+    use tauri_plugin_shell::ShellExt;
+    let cmd = app
+        .shell()
+        .command(&invocation.bin)
+        .env("JAVA_TOOL_OPTIONS", "-Djava.awt.headless=true")
+        .args(&invocation.args)
+        .current_dir(&working_dir);
+
+    match cmd.spawn() {
+        Ok((_rx, child)) => {
+            *app.state::<ServerState>().0.lock().unwrap() = Some(child);
+            Ok(())
+        }
+        Err(e) => {
+            server::do_log(&mut log, &format!("[spawn_server] spawn failed: {}", e));
+            Err(SpawnError::SpawnFailed(e.to_string()))
+        }
+    }
+}
+
+#[tauri::command]
+pub fn kill_server(app: tauri::AppHandle) -> Result<(), String> {
+    server::kill_tachidesk(&app);
+    Ok(())
+}
@@ -0,0 +1,130 @@
+use serde::Serialize;
+use std::path::PathBuf;
+use sysinfo::Disks;
+use tauri::Emitter;
+use walkdir::WalkDir;
+
+use crate::server::resolve::suwayomi_data_dir;
+
+#[derive(Serialize)]
+pub struct StorageInfo {
+    pub manga_bytes: u64,
+    pub total_bytes: u64,
+    pub free_bytes: u64,
+    pub path: String,
+}
+
+fn resolve_downloads_path(downloads_path: &str) -> PathBuf {
+    if !downloads_path.trim().is_empty() {
+        return PathBuf::from(downloads_path.trim());
+    }
+    suwayomi_data_dir().join("downloads")
+}
+
+#[tauri::command]
+pub fn get_storage_info(downloads_path: String) -> Result<StorageInfo, String> {
+    let path = resolve_downloads_path(&downloads_path);
+
+    let manga_bytes = if path.exists() {
+        WalkDir::new(&path)
+            .into_iter()
+            .filter_map(|e| e.ok())
+            .filter_map(|e| e.metadata().ok())
+            .filter(|m| m.is_file())
+            .map(|m| m.len())
+            .sum()
+    } else {
+        0
+    };
+
+    let stat_path = if path.exists() {
+        path.clone()
+    } else {
+        dirs::home_dir().unwrap_or_else(|| PathBuf::from("/"))
+    };
+
+    let disks = Disks::new_with_refreshed_list();
+    let disk = disks
+        .iter()
+        .filter(|d| stat_path.starts_with(d.mount_point()))
+        .max_by_key(|d| d.mount_point().as_os_str().len())
+        .ok_or_else(|| "Could not find disk for path".to_string())?;
+
+    Ok(StorageInfo {
+        manga_bytes,
+        total_bytes: disk.total_space(),
+        free_bytes: disk.available_space(),
+        path: path.to_string_lossy().into_owned(),
+    })
+}
+
+#[tauri::command]
+pub fn get_default_downloads_path() -> String {
+    resolve_downloads_path("").to_string_lossy().into_owned()
+}
+
+#[tauri::command]
+pub fn check_path_exists(path: String) -> bool {
+    std::path::Path::new(path.trim()).is_dir()
+}
+
+#[tauri::command]
+pub fn create_directory(path: String) -> Result<(), String> {
+    std::fs::create_dir_all(path.trim()).map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+pub async fn migrate_downloads(
+    app: tauri::AppHandle,
+    src: String,
+    dst: String,
+) -> Result<(), String> {
+    use std::fs;
+
+    let src_path = PathBuf::from(src.trim());
+    let dst_path = PathBuf::from(dst.trim());
+
+    if !src_path.is_dir() {
+        return Ok(());
+    }
+
+    let total: u64 = WalkDir::new(&src_path)
+        .into_iter()
+        .filter_map(|e| e.ok())
+        .filter(|e| e.file_type().is_file())
+        .count() as u64;
+
+    let _ = app.emit(
+        "migrate_progress",
+        serde_json::json!({ "done": 0u64, "total": total, "current": "" }),
+    );
+
+    let mut done: u64 = 0;
+
+    for entry in WalkDir::new(&src_path).into_iter().filter_map(|e| e.ok()) {
+        let rel = entry
+            .path()
+            .strip_prefix(&src_path)
+            .map_err(|e| e.to_string())?;
+        let target = dst_path.join(rel);
+
+        if entry.file_type().is_dir() {
+            fs::create_dir_all(&target).map_err(|e| e.to_string())?;
+        } else {
+            if let Some(parent) = target.parent() {
+                fs::create_dir_all(parent).map_err(|e| e.to_string())?;
+            }
+            fs::copy(entry.path(), &target).map_err(|e| e.to_string())?;
+            done += 1;
+            let _ = app.emit(
+                "migrate_progress",
+                serde_json::json!({
+                    "done": done, "total": total, "current": rel.to_string_lossy()
+                }),
+            );
+        }
+    }
+
+    fs::remove_dir_all(&src_path).map_err(|e| e.to_string())?;
+    Ok(())
+}
@@ -0,0 +1,101 @@
+#[cfg(target_os = "windows")]
+use crate::server::resolve::strip_unc;
+use tauri::Manager;
+use std::path::PathBuf;
+
+#[tauri::command]
+pub fn get_platform_ui_scale(window: tauri::Window) -> f64 {
+    window.scale_factor().unwrap_or(1.0)
+}
+
+#[tauri::command]
+pub fn restart_app(app: tauri::AppHandle) {
+    tauri::process::restart(&app.env());
+}
+
+#[tauri::command]
+pub fn open_path(path: String) -> Result<(), String> {
+    #[cfg(target_os = "windows")]
+    {
+        let p = strip_unc(PathBuf::from(path.trim()));
+        std::process::Command::new("explorer")
+            .arg(p)
+            .spawn()
+            .map_err(|e| e.to_string())?;
+    }
+    #[cfg(target_os = "macos")]
+    {
+        let p = std::path::Path::new(path.trim());
+        std::process::Command::new("open")
+            .arg(p)
+            .spawn()
+            .map_err(|e| e.to_string())?;
+    }
+    #[cfg(not(any(target_os = "windows", target_os = "macos")))]
+    {
+        let p = std::path::Path::new(path.trim());
+        std::process::Command::new("xdg-open")
+            .arg(p)
+            .spawn()
+            .map_err(|e| e.to_string())?;
+    }
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn pick_downloads_folder(app: tauri::AppHandle) -> Option<String> {
+    use tauri_plugin_dialog::DialogExt;
+    app.dialog()
+        .file()
+        .set_title("Choose Downloads Folder")
+        .blocking_pick_folder()
+        .map(|p| p.to_string())
+}
+
+#[tauri::command]
+pub fn exit_app(app: tauri::AppHandle) {
+    app.exit(0);
+}
+
+#[tauri::command]
+pub fn clear_moku_cache(app: tauri::AppHandle) -> Result<(), String> {
+    use tauri::Manager;
+    let cache_dir = app.path().app_cache_dir().map_err(|e| e.to_string())?;
+    if cache_dir.exists() {
+        std::fs::remove_dir_all(&cache_dir).map_err(|e| e.to_string())?;
+        std::fs::create_dir_all(&cache_dir).map_err(|e| e.to_string())?;
+    }
+    Ok(())
+}
+
+#[tauri::command]
+pub fn clear_suwayomi_cache() -> Result<(), String> {
+    use crate::server::resolve::suwayomi_data_dir;
+    let data_dir = suwayomi_data_dir();
+    for dir in &["cache", "bin/kcef", "cache/kcef"] {
+        let p = data_dir.join(dir);
+        if p.exists() {
+            std::fs::remove_dir_all(&p).map_err(|e| e.to_string())?;
+        }
+    }
+    Ok(())
+}
+
+#[tauri::command]
+pub fn reset_suwayomi_data(app: tauri::AppHandle) -> Result<(), String> {
+    use crate::server::resolve::suwayomi_data_dir;
+
+    crate::server::kill_tachidesk(&app);
+    std::thread::sleep(std::time::Duration::from_millis(500));
+
+    let data_dir = suwayomi_data_dir();
+    for entry_name in &["database.mv.db", "extensions", "settings", "logs", "local"] {
+        let p = data_dir.join(entry_name);
+        if p.is_dir() {
+            std::fs::remove_dir_all(&p).map_err(|e| format!("{entry_name}: {e}"))?;
+        } else if p.exists() {
+            std::fs::remove_file(&p).map_err(|e| format!("{entry_name}: {e}"))?;
+        }
+    }
+    Ok(())
+}
@@ -0,0 +1,150 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Clone)]
+pub struct ReleaseInfo {
+    pub tag_name: String,
+    pub name: String,
+    pub body: String,
+    pub published_at: String,
+    pub html_url: String,
+}
+
+#[derive(Clone, Serialize)]
+#[cfg_attr(not(target_os = "windows"), allow(dead_code))]
+struct UpdateProgress {
+    downloaded: u64,
+    total: Option<u64>,
+}
+
+#[tauri::command]
+pub async fn list_releases() -> Result<Vec<ReleaseInfo>, String> {
+    use tauri_plugin_http::reqwest;
+
+    #[derive(Deserialize)]
+    struct GhRelease {
+        tag_name: String,
+        name: Option<String>,
+        body: Option<String>,
+        published_at: Option<String>,
+        html_url: String,
+    }
+
+    let client = reqwest::Client::builder()
+        .user_agent("Moku")
+        .build()
+        .map_err(|e| e.to_string())?;
+
+    let resp = client
+        .get("https://api.github.com/repos/moku-project/Moku/releases?per_page=30")
+        .send()
+        .await
+        .map_err(|e| e.to_string())?;
+
+    if !resp.status().is_success() {
+        return Err(format!("GitHub API returned {}", resp.status()));
+    }
+
+    let releases: Vec<GhRelease> =
+        serde_json::from_str(&resp.text().await.map_err(|e| e.to_string())?)
+            .map_err(|e| e.to_string())?;
+
+    Ok(releases
+        .into_iter()
+        .map(|r| ReleaseInfo {
+            tag_name: r.tag_name.clone(),
+            name: r.name.unwrap_or_else(|| r.tag_name.clone()),
+            body: r.body.unwrap_or_default(),
+            published_at: r.published_at.unwrap_or_default(),
+            html_url: r.html_url,
+        })
+        .collect())
+}
+
+#[tauri::command]
+#[allow(unused_variables)]
+pub async fn download_and_install_update(app: tauri::AppHandle, tag: String) -> Result<(), String> {
+    #[cfg(not(target_os = "windows"))]
+    return Err("Native install is Windows-only; open the GitHub release page instead.".into());
+
+    #[cfg(target_os = "windows")]
+    {
+        use std::io::Write;
+        use tauri::Emitter;
+        use tauri_plugin_http::reqwest;
+
+        #[derive(Deserialize)]
+        struct Asset {
+            name: String,
+            browser_download_url: String,
+            size: u64,
+        }
+        #[derive(Deserialize)]
+        struct Release {
+            assets: Vec<Asset>,
+        }
+
+        let client = reqwest::Client::builder()
+            .user_agent("Moku")
+            .build()
+            .map_err(|e| e.to_string())?;
+
+        let resp = client
+            .get(format!(
+                "https://api.github.com/repos/moku-project/Moku/releases/tags/{}",
+                tag
+            ))
+            .send()
+            .await
+            .map_err(|e| e.to_string())?;
+
+        if !resp.status().is_success() {
+            return Err(format!(
+                "GitHub API returned {} for tag {}",
+                resp.status(),
+                tag
+            ));
+        }
+
+        let release: Release = serde_json::from_str(&resp.text().await.map_err(|e| e.to_string())?)
+            .map_err(|e| e.to_string())?;
+
+        let asset = release
+            .assets
+            .into_iter()
+            .find(|a| a.name.ends_with("_x64-setup.exe"))
+            .ok_or_else(|| format!("No x64-setup.exe asset found in release {}", tag))?;
+
+        let total = if asset.size > 0 {
+            Some(asset.size)
+        } else {
+            None
+        };
+        let mut resp = client
+            .get(&asset.browser_download_url)
+            .send()
+            .await
+            .map_err(|e| e.to_string())?;
+
+        let tmp_path = std::env::temp_dir().join(&asset.name);
+        let mut file = std::fs::File::create(&tmp_path).map_err(|e| e.to_string())?;
+        let mut downloaded: u64 = 0;
+
+        while let Some(chunk) = resp.chunk().await.map_err(|e| e.to_string())? {
+            file.write_all(&chunk).map_err(|e| e.to_string())?;
+            downloaded += chunk.len() as u64;
+            let _ = app.emit("update-progress", UpdateProgress { downloaded, total });
+        }
+        drop(file);
+
+        use std::os::windows::process::CommandExt;
+        const CREATE_NO_WINDOW: u32 = 0x08000000;
+        std::process::Command::new(&tmp_path)
+            .creation_flags(CREATE_NO_WINDOW)
+            .spawn()
+            .map_err(|e| e.to_string())?;
+
+        let _ = app.emit("update-launching", ());
+
+        Ok(())
+    }
+}
@@ -1,810 +1,17 @@
-use std::path::PathBuf;
+mod commands;
+mod server;
+
 use std::sync::Mutex;
-use std::io::Write;
-use sysinfo::Disks;
-use serde::Serialize;
 use tauri::{Manager, WindowEvent};
-#[cfg(target_os = "windows")]
-use tauri::Emitter;
-use tauri_plugin_shell::{ShellExt, process::CommandChild};
-use walkdir::WalkDir;
+use tauri_plugin_shell::process::CommandChild;

-struct ServerState(Mutex<Option<CommandChild>>);
-
-#[derive(Serialize)]
-pub struct StorageInfo {
-    manga_bytes: u64,
-    total_bytes: u64,
-    free_bytes:  u64,
-    path:        String,
-}
-
-#[derive(Serialize, Debug)]
-#[serde(tag = "kind", content = "message")]
-pub enum SpawnError {
-    NotConfigured(String),
-    SpawnFailed(String),
-}
-
-#[derive(Serialize, Clone)]
-pub struct ReleaseInfo {
-    pub tag_name:     String,
-    pub name:         String,
-    pub body:         String,
-    pub published_at: String,
-    pub html_url:     String,
-}
-
-#[derive(Clone, serde::Serialize)]
-#[cfg_attr(not(target_os = "windows"), allow(dead_code))]
-struct UpdateProgress {
-    downloaded: u64,
-    total:      Option<u64>,
-}
-
-fn strip_unc(path: PathBuf) -> PathBuf {
-    let s = path.to_string_lossy();
-    if let Some(stripped) = s.strip_prefix(r"\\?\") {
-        PathBuf::from(stripped)
-    } else {
-        path
-    }
-}
-
-fn resolve_downloads_path(downloads_path: &str) -> PathBuf {
-    if !downloads_path.trim().is_empty() {
-        return PathBuf::from(downloads_path.trim());
-    }
-    suwayomi_data_dir().join("downloads")
-}
-
-#[tauri::command]
-fn get_storage_info(downloads_path: String) -> Result<StorageInfo, String> {
-    let path = resolve_downloads_path(&downloads_path);
-
-    let manga_bytes = if path.exists() {
-        WalkDir::new(&path)
-            .into_iter()
-            .filter_map(|e| e.ok())
-            .filter_map(|e| e.metadata().ok())
-            .filter(|m| m.is_file())
-            .map(|m| m.len())
-            .sum()
-    } else {
-        0
-    };
-
-    let stat_path = if path.exists() {
-        path.clone()
-    } else {
-        dirs::home_dir().unwrap_or_else(|| PathBuf::from("/"))
-    };
-
-    let disks = Disks::new_with_refreshed_list();
-    let disk = disks
-        .iter()
-        .filter(|d| stat_path.starts_with(d.mount_point()))
-        .max_by_key(|d| d.mount_point().as_os_str().len())
-        .ok_or_else(|| "Could not find disk for path".to_string())?;
-
-    Ok(StorageInfo {
-        manga_bytes,
-        total_bytes: disk.total_space(),
-        free_bytes:  disk.available_space(),
-        path: path.to_string_lossy().into_owned(),
-    })
-}
-
-#[tauri::command]
-fn get_default_downloads_path() -> String {
-    resolve_downloads_path("").to_string_lossy().into_owned()
-}
-
-#[tauri::command]
-fn check_path_exists(path: String) -> bool {
-    std::path::Path::new(path.trim()).is_dir()
-}
-
-#[tauri::command]
-fn create_directory(path: String) -> Result<(), String> {
-    std::fs::create_dir_all(path.trim()).map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-async fn migrate_downloads(app: tauri::AppHandle, src: String, dst: String) -> Result<(), String> {
-    use tauri::Emitter;
-    use std::fs;
-
-    let src_path = std::path::PathBuf::from(src.trim());
-    let dst_path = std::path::PathBuf::from(dst.trim());
-
-    if !src_path.is_dir() {
-        return Ok(());
-    }
-
-    let total: u64 = WalkDir::new(&src_path)
-        .into_iter()
-        .filter_map(|e| e.ok())
-        .filter(|e| e.file_type().is_file())
-        .count() as u64;
-
-    let _ = app.emit("migrate_progress", serde_json::json!({ "done": 0u64, "total": total, "current": "" }));
-
-    let mut done: u64 = 0;
-
-    for entry in WalkDir::new(&src_path).into_iter().filter_map(|e| e.ok()) {
-        let rel    = entry.path().strip_prefix(&src_path).map_err(|e| e.to_string())?;
-        let target = dst_path.join(rel);
-
-        if entry.file_type().is_dir() {
-            fs::create_dir_all(&target).map_err(|e| e.to_string())?;
-        } else {
-            if let Some(parent) = target.parent() {
-                fs::create_dir_all(parent).map_err(|e| e.to_string())?;
-            }
-            fs::copy(entry.path(), &target).map_err(|e| e.to_string())?;
-            done += 1;
-            let _ = app.emit("migrate_progress", serde_json::json!({
-                "done": done, "total": total, "current": rel.to_string_lossy()
-            }));
-        }
-    }
-
-    fs::remove_dir_all(&src_path).map_err(|e| e.to_string())?;
-    Ok(())
-}
-
-#[tauri::command]
-fn get_platform_ui_scale(window: tauri::Window) -> f64 {
-    window.scale_factor().unwrap_or(1.0)
-}
-
-fn kill_tachidesk(app: &tauri::AppHandle) {
-    let state = app.state::<ServerState>();
-    if let Some(child) = state.0.lock().unwrap().take() {
-        let _ = child.kill();
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-        use std::os::windows::process::CommandExt;
-        const CREATE_NO_WINDOW: u32 = 0x08000000;
-
-        let _ = std::process::Command::new("taskkill")
-            .args(["/F", "/FI", "IMAGENAME eq java.exe"])
-            .creation_flags(CREATE_NO_WINDOW)
-            .status();
-
-        for _ in 0..30 {
-            let still_running = std::process::Command::new("tasklist")
-                .args(["/FI", "IMAGENAME eq java.exe", "/NH"])
-                .creation_flags(CREATE_NO_WINDOW)
-                .output()
-                .map(|o| String::from_utf8_lossy(&o.stdout).contains("java.exe"))
-                .unwrap_or(false);
-
-            if !still_running { break; }
-            std::thread::sleep(std::time::Duration::from_millis(100));
-        }
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    let _ = std::process::Command::new("pkill").args(["-f", "tachidesk"]).status();
-}
-
-const DEFAULT_SERVER_CONF: &str = r#"server.ip = "127.0.0.1"
-server.port = 4567
-server.webUIEnabled = false
-server.initialOpenInBrowserEnabled = false
-server.systemTrayEnabled = false
-server.webUIInterface = "browser"
-server.webUIFlavor = "WebUI"
-server.webUIChannel = "stable"
-server.electronPath = ""
-server.debugLogsEnabled = false
-server.downloadAsCbz = true
-server.autoDownloadNewChapters = false
-server.globalUpdateInterval = 12
-server.maxSourcesInParallel = 6
-server.extensionRepos = []
-"#;
-
-fn seed_server_conf(data_dir: &PathBuf) {
-    let conf_path = data_dir.join("server.conf");
-
-    if !conf_path.exists() {
-        if let Err(e) = std::fs::create_dir_all(data_dir) {
-            eprintln!("Could not create Suwayomi data dir: {e}");
-            return;
-        }
-        if let Err(e) = std::fs::write(&conf_path, DEFAULT_SERVER_CONF) {
-            eprintln!("Could not write server.conf: {e}");
-        }
-        return;
-    }
-
-    let Ok(contents) = std::fs::read_to_string(&conf_path) else { return };
-
-    let patched = patch_conf_key(
-        patch_conf_key(
-            patch_conf_key(contents, "server.webUIEnabled", "false"),
-            "server.initialOpenInBrowserEnabled", "false",
-        ),
-        "server.systemTrayEnabled", "false",
-    );
-
-    let _ = std::fs::write(&conf_path, patched);
-}
-
-fn patch_conf_key(text: String, key: &str, value: &str) -> String {
-    let replacement = format!("{key} = {value}");
-    let lines: Vec<&str> = text.lines().collect();
-
-    if let Some(pos) = lines.iter().position(|l| l.trim_start().starts_with(key)) {
-        let mut out = lines
-            .iter()
-            .enumerate()
-            .map(|(i, l)| if i == pos { replacement.as_str() } else { l })
-            .collect::<Vec<_>>()
-            .join("\n");
-        out.push('\n');
-        return out;
-    }
-
-    let mut out = text;
-    if !out.ends_with('\n') { out.push('\n'); }
-    out.push_str(&replacement);
-    out.push('\n');
-    out
-}
-
-fn suwayomi_data_dir() -> PathBuf {
-    #[cfg(target_os = "windows")]
-    {
-        dirs::data_dir()
-            .unwrap_or_else(|| PathBuf::from("C:\\ProgramData"))
-            .join("moku\\tachidesk")
-    }
-    #[cfg(target_os = "macos")]
-    {
-        dirs::data_dir()
-            .unwrap_or_else(|| dirs::home_dir().unwrap_or_else(|| PathBuf::from("~")))
-            .join("io.github.moku_project.Moku.app/tachidesk")
-    }
-    #[cfg(not(any(target_os = "windows", target_os = "macos")))]
-    {
-        let base = std::env::var("XDG_DATA_HOME")
-            .map(PathBuf::from)
-            .unwrap_or_else(|_| dirs::data_dir().unwrap_or_else(|| PathBuf::from("/tmp")));
-        base.join("moku/tachidesk")
-    }
-}
-
-struct ServerInvocation {
-    bin:         String,
-    args:        Vec<String>,
-    working_dir: Option<PathBuf>,
-}
-
-#[cfg(not(target_os = "macos"))]
-fn find_java_in_bundle(bundle_dir: &PathBuf, log: &mut Option<std::fs::File>) -> Option<PathBuf> {
-    #[cfg(target_os = "windows")]
-    let java = strip_unc(bundle_dir.join("jre").join("bin").join("java.exe"));
-    #[cfg(not(target_os = "windows"))]
-    let java = bundle_dir.join("jre").join("bin").join("java");
-
-    do_log(log, &format!("[find_java] path: {:?} exists: {}", java, java.exists()));
-    if java.exists() { Some(java) } else { None }
-}
-
-fn do_log(log: &mut Option<std::fs::File>, msg: &str) {
-    eprintln!("{}", msg);
-    if let Some(f) = log {
-        let _ = writeln!(f, "{}", msg);
-    }
-}
-
-fn resolve_server_binary(
-    binary: &str,
-    app: &tauri::AppHandle,
-    log: &mut Option<std::fs::File>,
-) -> Result<ServerInvocation, SpawnError> {
-    do_log(log, &format!("[resolve] binary = {:?}", binary));
-
-    if !binary.trim().is_empty() {
-        let path = strip_unc(PathBuf::from(binary.trim()));
-        do_log(log, &format!("[resolve] user path: {:?} exists={}", path, path.exists()));
-        if path.exists() {
-            return Ok(ServerInvocation {
-                bin:         path.to_string_lossy().into_owned(),
-                args:        vec![],
-                working_dir: path.parent().map(|p| p.to_path_buf()),
-            });
-        }
-        do_log(log, "[resolve] user path not found, falling through");
-    }
-
-    if let Ok(exe) = std::env::current_exe() {
-        if let Some(bin_dir) = exe.parent() {
-            for name in &["tachidesk-server", "suwayomi-launcher"] {
-                let p = bin_dir.join(name);
-                do_log(log, &format!("[resolve] sibling: {:?} exists={}", p, p.exists()));
-                if p.exists() {
-                    return Ok(ServerInvocation {
-                        bin:         p.to_string_lossy().into_owned(),
-                        args:        vec![],
-                        working_dir: Some(bin_dir.to_path_buf()),
-                    });
-                }
-            }
-        }
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    let resource_dir = {
-        let raw = app.path().resource_dir().unwrap_or_default();
-        let stripped = strip_unc(raw);
-        do_log(log, &format!("[resolve] resource_dir = {:?}", stripped));
-        stripped
-    };
-
-    #[cfg(not(target_os = "macos"))]
-    {
-        let bundle_dir = resource_dir.join("binaries").join("suwayomi-bundle");
-        let jar        = bundle_dir.join("bin").join("Suwayomi-Server.jar");
-
-        do_log(log, &format!("[resolve] bundle_dir={:?} exists={}", bundle_dir, bundle_dir.exists()));
-        do_log(log, &format!("[resolve] jar={:?} exists={}", jar, jar.exists()));
-
-        match find_java_in_bundle(&bundle_dir, log) {
-            Some(java) if jar.exists() => {
-                do_log(log, "[resolve] using bundled JRE");
-                return Ok(ServerInvocation {
-                    bin:  java.to_string_lossy().into_owned(),
-                    args: vec!["-jar".to_string(), jar.to_string_lossy().into_owned()],
-                    working_dir: Some(bundle_dir),
-                });
-            }
-            _ => do_log(log, "[resolve] bundled JRE/jar not found, falling through"),
-        }
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    {
-        for name in &["suwayomi-launcher", "suwayomi-launcher.sh", "tachidesk-server"] {
-            let p = resource_dir.join(name);
-            do_log(log, &format!("[resolve] sidecar: {:?} exists={}", p, p.exists()));
-            if p.exists() {
-                return Ok(ServerInvocation {
-                    bin:         p.to_string_lossy().into_owned(),
-                    args:        vec![],
-                    working_dir: Some(resource_dir.clone()),
-                });
-            }
-        }
-
-        if let Some(java) = find_java_in_bundle(&resource_dir, log) {
-            let jar = std::fs::read_dir(&resource_dir)
-                .ok()
-                .and_then(|mut rd| {
-                    rd.find(|e| e.as_ref().map(|e| e.file_name().to_string_lossy().ends_with(".jar")).unwrap_or(false))
-                        .and_then(|e| e.ok())
-                        .map(|e| e.path())
-                });
-
-            if let Some(jar_path) = jar {
-                do_log(log, &format!("[resolve] generic JRE java={:?} jar={:?}", java, jar_path));
-                return Ok(ServerInvocation {
-                    bin:  java.to_string_lossy().into_owned(),
-                    args: vec!["-jar".to_string(), jar_path.to_string_lossy().into_owned()],
-                    working_dir: Some(resource_dir),
-                });
-            }
-        }
-    }
-
-    #[cfg(target_os = "macos")]
-    {
-        let resource_dir = app.path().resource_dir().unwrap_or_default();
-        let contents_dir = resource_dir
-            .parent()
-            .unwrap_or(&resource_dir)
-            .to_path_buf();
-
-        do_log(log, &format!("[resolve] macOS contents_dir = {:?}", contents_dir));
-
-        const NATIVE_NAMES: &[&str] = &[
-            "suwayomi-server-aarch64-apple-darwin",
-            "suwayomi-server-x86_64-apple-darwin",
-            "suwayomi-server",
-            "suwayomi-launcher",
-            "suwayomi-launcher.sh",
-            "tachidesk-server",
-        ];
-
-        let mut found_binary: Option<ServerInvocation> = None;
-        let mut found_java:   Option<(PathBuf, PathBuf)> = None;
-
-        'outer: for depth in 0u8..=8 {
-            let entries: Vec<PathBuf> = WalkDir::new(&contents_dir)
-                .min_depth(depth as usize)
-                .max_depth(depth as usize)
-                .into_iter()
-                .filter_map(|e| e.ok())
-                .filter(|e| e.file_type().is_dir())
-                .map(|e| e.into_path())
-                .collect();
-
-            for dir in &entries {
-                do_log(log, &format!("[resolve] scanning depth={} dir={:?}", depth, dir));
-
-                for name in NATIVE_NAMES {
-                    let p = dir.join(name);
-                    if p.exists() {
-                        do_log(log, &format!("[resolve] found native binary: {:?}", p));
-                        found_binary = Some(ServerInvocation {
-                            bin:         p.to_string_lossy().into_owned(),
-                            args:        vec![],
-                            working_dir: Some(dir.clone()),
-                        });
-                        break 'outer;
-                    }
-                }
-
-                if found_java.is_none() {
-                    let java_exe = dir.join("bin").join("java");
-                    if java_exe.exists() {
-                        do_log(log, &format!("[resolve] found java: {:?}", java_exe));
-                        let mut search = dir.as_path();
-                        'jar: for _ in 0..5 {
-                            if let Ok(rd) = std::fs::read_dir(search) {
-                                for entry in rd.filter_map(|e| e.ok()) {
-                                    if entry.file_name().to_string_lossy().ends_with(".jar") {
-                                        let jar = entry.path();
-                                        do_log(log, &format!("[resolve] found jar: {:?}", jar));
-                                        found_java = Some((java_exe.clone(), jar));
-                                        break 'jar;
-                                    }
-                                }
-                            }
-                            let bin_sibling = search.join("bin");
-                            if let Ok(rd) = std::fs::read_dir(&bin_sibling) {
-                                for entry in rd.filter_map(|e| e.ok()) {
-                                    if entry.file_name().to_string_lossy().ends_with(".jar") {
-                                        let jar = entry.path();
-                                        do_log(log, &format!("[resolve] found jar in bin/: {:?}", jar));
-                                        found_java = Some((java_exe.clone(), jar));
-                                        break 'jar;
-                                    }
-                                }
-                            }
-                            match search.parent() {
-                                Some(p) => search = p,
-                                None    => break,
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if let Some(inv) = found_binary {
-            return Ok(inv);
-        }
-
-        if let Some((java, jar)) = found_java {
-            let working_dir = jar.parent().map(|p| p.to_path_buf());
-            return Ok(ServerInvocation {
-                bin:  java.to_string_lossy().into_owned(),
-                args: vec!["-jar".to_string(), jar.to_string_lossy().into_owned()],
-                working_dir,
-            });
-        }
-
-        do_log(log, "[resolve] macOS scan found nothing in bundle");
-    }
-
-    for name in &["suwayomi-server", "tachidesk-server"] {
-        #[cfg(target_os = "windows")]
-        let found = std::process::Command::new("where").arg(name).output().map(|o| o.status.success()).unwrap_or(false);
-        #[cfg(not(target_os = "windows"))]
-        let found = std::process::Command::new("which").arg(name).output().map(|o| o.status.success()).unwrap_or(false);
-
-        if found {
-            return Ok(ServerInvocation { bin: name.to_string(), args: vec![], working_dir: None });
-        }
-    }
-
-    Err(SpawnError::NotConfigured(
-        "Server binary not found. Install Suwayomi-Server or set the path in Settings.".to_string(),
-    ))
-}
-
-#[tauri::command]
-fn spawn_server(binary: String, app: tauri::AppHandle) -> Result<(), SpawnError> {
-    {
-        let state = app.state::<ServerState>();
-        if state.0.lock().unwrap().is_some() {
-            return Ok(());
-        }
-    }
-
-    let data_dir = suwayomi_data_dir();
-    let log_path = data_dir.join("moku-spawn.log");
-    let _ = std::fs::create_dir_all(&data_dir);
-    let mut log = std::fs::OpenOptions::new().create(true).append(true).open(&log_path).ok();
-
-    do_log(&mut log, &format!("[spawn_server] binary={:?} data_dir={:?}", binary, data_dir));
-
-    seed_server_conf(&data_dir);
-
-    let mut invocation = resolve_server_binary(&binary, &app, &mut log).map_err(|e| {
-        do_log(&mut log, &format!("[spawn_server] resolve failed: {:?}", e));
-        e
-    })?;
-
-    if invocation.bin.ends_with("java") || invocation.bin.ends_with("java.exe") {
-        let rootdir_flag = format!(
-            "-Dsuwayomi.tachidesk.config.server.rootDir={}",
-            data_dir.to_string_lossy()
-        );
-        invocation.args.insert(0, rootdir_flag);
-    }
-
-    let working_dir = invocation.working_dir.unwrap_or_else(|| std::env::current_dir().unwrap_or_default());
-
-    do_log(&mut log, &format!("[spawn_server] bin={:?} args={:?} cwd={:?}", invocation.bin, invocation.args, working_dir));
-
-    let cmd = app.shell()
-        .command(&invocation.bin)
-        .env("JAVA_TOOL_OPTIONS", "-Djava.awt.headless=true")
-        .args(&invocation.args)
-        .current_dir(&working_dir);
-
-    match cmd.spawn() {
-        Ok((_rx, child)) => {
-            *app.state::<ServerState>().0.lock().unwrap() = Some(child);
-            Ok(())
-        }
-        Err(e) => {
-            do_log(&mut log, &format!("[spawn_server] spawn failed: {}", e));
-            Err(SpawnError::SpawnFailed(e.to_string()))
-        }
-    }
-}
-
-#[tauri::command]
-fn kill_server(app: tauri::AppHandle) -> Result<(), String> {
-    kill_tachidesk(&app);
-    Ok(())
-}
-
-#[tauri::command]
-async fn list_releases() -> Result<Vec<ReleaseInfo>, String> {
-    use tauri_plugin_http::reqwest;
-
-    let client = reqwest::Client::builder()
-        .user_agent("Moku")
-        .build()
-        .map_err(|e| e.to_string())?;
-
-    let resp = client
-        .get("https://api.github.com/repos/moku-project/Moku/releases?per_page=30")
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-
-    if !resp.status().is_success() {
-        return Err(format!("GitHub API returned {}", resp.status()));
-    }
-
-    #[derive(serde::Deserialize)]
-    struct GhRelease {
-        tag_name:     String,
-        name:         Option<String>,
-        body:         Option<String>,
-        published_at: Option<String>,
-        html_url:     String,
-    }
-
-    let body = resp.text().await.map_err(|e| e.to_string())?;
-    let releases: Vec<GhRelease> = serde_json::from_str(&body).map_err(|e| e.to_string())?;
-
-    Ok(releases.into_iter().map(|r| ReleaseInfo {
-        tag_name:     r.tag_name.clone(),
-        name:         r.name.unwrap_or_else(|| r.tag_name.clone()),
-        body:         r.body.unwrap_or_default(),
-        published_at: r.published_at.unwrap_or_default(),
-        html_url:     r.html_url,
-    }).collect())
-}
-
-#[tauri::command]
-#[allow(unused_variables)]
-async fn download_and_install_update(app: tauri::AppHandle, tag: String) -> Result<(), String> {
-    #[cfg(not(target_os = "windows"))]
-    return Err("Native install is Windows-only; open the GitHub release page instead.".into());
-
-    #[cfg(target_os = "windows")]
-    {
-        use tauri_plugin_http::reqwest;
-        use std::io::Write;
-
-        let client = reqwest::Client::builder()
-            .user_agent("Moku")
-            .build()
-            .map_err(|e| e.to_string())?;
-
-        let url = format!("https://api.github.com/repos/moku-project/Moku/releases/tags/{}", tag);
-        let resp = client.get(&url).send().await.map_err(|e| e.to_string())?;
-        if !resp.status().is_success() {
-            return Err(format!("GitHub API returned {} for tag {}", resp.status(), tag));
-        }
-
-        #[derive(serde::Deserialize)]
-        struct Asset { name: String, browser_download_url: String, size: u64 }
-        #[derive(serde::Deserialize)]
-        struct Release { assets: Vec<Asset> }
-
-        let body = resp.text().await.map_err(|e| e.to_string())?;
-        let release: Release = serde_json::from_str(&body).map_err(|e| e.to_string())?;
-
-        let asset = release.assets
-            .into_iter()
-            .find(|a| a.name.ends_with("_x64-setup.exe"))
-            .ok_or_else(|| format!("No x64-setup.exe asset found in release {}", tag))?;
-
-        let total = if asset.size > 0 { Some(asset.size) } else { None };
-        let mut resp = client.get(&asset.browser_download_url).send().await.map_err(|e| e.to_string())?;
-
-        let tmp_path = std::env::temp_dir().join(&asset.name);
-        let mut file = std::fs::File::create(&tmp_path).map_err(|e| e.to_string())?;
-        let mut downloaded: u64 = 0;
-
-        while let Some(chunk) = resp.chunk().await.map_err(|e| e.to_string())? {
-            file.write_all(&chunk).map_err(|e| e.to_string())?;
-            downloaded += chunk.len() as u64;
-            let _ = app.emit("update-progress", UpdateProgress { downloaded, total });
-        }
-        drop(file);
-
-        use std::os::windows::process::CommandExt;
-        const CREATE_NO_WINDOW: u32 = 0x08000000;
-        std::process::Command::new(&tmp_path)
-            .creation_flags(CREATE_NO_WINDOW)
-            .spawn()
-            .map_err(|e| e.to_string())?;
-
-        let _ = app.emit("update-launching", ());
-
-        Ok(())
-    }
-}
-
-#[tauri::command]
-fn restart_app(app: tauri::AppHandle) {
-    tauri::process::restart(&app.env());
-}
-
-#[tauri::command]
-fn open_path(path: String) -> Result<(), String> {
-    #[cfg(target_os = "windows")]
-    {
-        let p = strip_unc(std::path::PathBuf::from(path.trim()));
-        std::process::Command::new("explorer")
-            .arg(p)
-            .spawn()
-            .map_err(|e| e.to_string())?;
-    }
-    #[cfg(target_os = "macos")]
-    {
-        let p = std::path::Path::new(path.trim());
-        std::process::Command::new("open")
-            .arg(p)
-            .spawn()
-            .map_err(|e| e.to_string())?;
-    }
-    #[cfg(not(any(target_os = "windows", target_os = "macos")))]
-    {
-        let p = std::path::Path::new(path.trim());
-        std::process::Command::new("xdg-open")
-            .arg(p)
-            .spawn()
-            .map_err(|e| e.to_string())?;
-    }
-    Ok(())
-}
-
-#[tauri::command]
-async fn pick_downloads_folder(app: tauri::AppHandle) -> Option<String> {
-    use tauri_plugin_dialog::DialogExt;
-    app.dialog()
-        .file()
-        .set_title("Choose Downloads Folder")
-        .blocking_pick_folder()
-        .map(|p| p.to_string())
-}
-
-fn moku_backup_dir(app: &tauri::AppHandle) -> PathBuf {
-    app.path().app_data_dir()
-        .unwrap_or_else(|_| PathBuf::from("."))
-        .join("backups")
-}
-
-#[tauri::command]
-async fn export_app_data(app: tauri::AppHandle, json: String) -> Result<String, String> {
-    use tauri_plugin_dialog::DialogExt;
-
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_secs();
-    let filename = format!("moku-backup-{}.json", now);
-
-    let path = app.dialog()
-        .file()
-        .set_title("Save Moku app data backup")
-        .set_file_name(&filename)
-        .blocking_save_file()
-        .ok_or("Cancelled")?;
-
-    let dest = PathBuf::from(path.to_string());
-    std::fs::write(&dest, json.as_bytes()).map_err(|e| e.to_string())?;
-
-    Ok(dest.to_string_lossy().into_owned())
-}
-
-#[tauri::command]
-async fn import_app_data(app: tauri::AppHandle) -> Result<String, String> {
-    use tauri_plugin_dialog::DialogExt;
-
-    let path = app.dialog()
-        .file()
-        .set_title("Open Moku app data backup")
-        .blocking_pick_file()
-        .ok_or("Cancelled")?;
-
-    let src = PathBuf::from(path.to_string());
-    let contents = std::fs::read_to_string(&src).map_err(|e| e.to_string())?;
-
-    Ok(contents)
-}
-
-#[tauri::command]
-fn auto_backup_app_data(app: tauri::AppHandle, json: String) -> Result<(), String> {
-    let backup_dir = moku_backup_dir(&app);
-    std::fs::create_dir_all(&backup_dir).map_err(|e| e.to_string())?;
-
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_secs();
-    let dest = backup_dir.join(format!("auto-moku-backup-{}.json", now));
-    std::fs::write(&dest, json.as_bytes()).map_err(|e| e.to_string())?;
-
-    let mut entries: Vec<_> = std::fs::read_dir(&backup_dir)
-        .map_err(|e| e.to_string())?
-        .filter_map(|e| e.ok())
-        .filter(|e| e.file_name().to_string_lossy().starts_with("auto-moku-backup-"))
-        .collect();
-
-    entries.sort_by_key(|e| e.file_name());
-
-    for old in entries.iter().take(entries.len().saturating_sub(5)) {
-        let _ = std::fs::remove_file(old.path());
-    }
-
-    Ok(())
-}
-
-#[tauri::command]
-fn get_auto_backup_dir(app: tauri::AppHandle) -> String {
-    moku_backup_dir(&app).to_string_lossy().into_owned()
-}
+pub struct ServerState(pub Mutex<Option<CommandChild>>);

 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
    tauri::Builder::default()
+        .plugin(tauri_plugin_store::Builder::new().build())
+        .plugin(tauri_plugin_store::Builder::default().build())
        .plugin(tauri_plugin_discord_rpc::init())
        .plugin(tauri_plugin_dialog::init())
        .plugin(tauri_plugin_os::init())
@@ -813,28 +20,34 @@ pub fn run() {
        .plugin(tauri_plugin_process::init())
        .manage(ServerState(Mutex::new(None)))
        .invoke_handler(tauri::generate_handler![
-            get_storage_info,
-            get_default_downloads_path,
-            check_path_exists,
-            create_directory,
-            migrate_downloads,
-            spawn_server,
-            kill_server,
-            get_platform_ui_scale,
-            list_releases,
-            download_and_install_update,
-            restart_app,
-            open_path,
-            pick_downloads_folder,
-            export_app_data,
-            import_app_data,
-            auto_backup_app_data,
-            get_auto_backup_dir,
+            commands::storage::get_storage_info,
+            commands::storage::get_default_downloads_path,
+            commands::storage::check_path_exists,
+            commands::storage::create_directory,
+            commands::storage::migrate_downloads,
+            commands::server::spawn_server,
+            commands::server::kill_server,
+            commands::system::get_platform_ui_scale,
+            commands::system::restart_app,
+            commands::system::exit_app,
+            commands::system::clear_moku_cache,
+            commands::system::clear_suwayomi_cache,
+            commands::system::reset_suwayomi_data,
+            commands::system::open_path,
+            commands::system::pick_downloads_folder,
+            commands::backup::export_app_data,
+            commands::backup::import_app_data,
+            commands::backup::auto_backup_app_data,
+            commands::backup::get_auto_backup_dir,
+            commands::updater::list_releases,
+            commands::updater::download_and_install_update,
+            commands::biometric::windows_hello_authenticate,
+            commands::biometric::windows_hello_available,
        ])
        .setup(|_app| Ok(()))
        .on_window_event(|window, event| {
            if let WindowEvent::Destroyed = event {
-                kill_tachidesk(window.app_handle());
+                server::kill_tachidesk(window.app_handle());
            }
        })
        .run(tauri::generate_context!())
@@ -0,0 +1,73 @@
+use std::path::PathBuf;
+
+const DEFAULT_SERVER_CONF: &str = r#"server.ip = "127.0.0.1"
+server.port = 4567
+server.webUIEnabled = true
+server.initialOpenInBrowserEnabled = false
+server.systemTrayEnabled = false
+server.webUIInterface = "browser"
+server.webUIFlavor = "WebUI"
+server.webUIChannel = "preview"
+server.electronPath = ""
+server.debugLogsEnabled = false
+server.downloadAsCbz = true
+server.autoDownloadNewChapters = false
+server.globalUpdateInterval = 12
+server.maxSourcesInParallel = 6
+server.extensionRepos = []
+"#;
+
+pub fn seed_server_conf(data_dir: &PathBuf) {
+    let conf_path = data_dir.join("server.conf");
+
+    if !conf_path.exists() {
+        if let Err(e) = std::fs::create_dir_all(data_dir) {
+            eprintln!("Could not create Suwayomi data dir: {e}");
+            return;
+        }
+        if let Err(e) = std::fs::write(&conf_path, DEFAULT_SERVER_CONF) {
+            eprintln!("Could not write server.conf: {e}");
+        }
+        return;
+    }
+
+    let Ok(contents) = std::fs::read_to_string(&conf_path) else {
+        return;
+    };
+
+    let patched = patch_conf_key(
+        patch_conf_key(
+            patch_conf_key(contents, "server.webUIEnabled", "true"),
+            "server.initialOpenInBrowserEnabled",
+            "false",
+        ),
+        "server.systemTrayEnabled",
+        "false",
+    );
+
+    let _ = std::fs::write(&conf_path, patched);
+}
+
+fn patch_conf_key(text: String, key: &str, value: &str) -> String {
+    let replacement = format!("{key} = {value}");
+    let lines: Vec<&str> = text.lines().collect();
+
+    if let Some(pos) = lines.iter().position(|l| l.trim_start().starts_with(key)) {
+        let mut out = lines
+            .iter()
+            .enumerate()
+            .map(|(i, l)| if i == pos { replacement.as_str() } else { l })
+            .collect::<Vec<_>>()
+            .join("\n");
+        out.push('\n');
+        return out;
+    }
+
+    let mut out = text;
+    if !out.ends_with('\n') {
+        out.push('\n');
+    }
+    out.push_str(&replacement);
+    out.push('\n');
+    out
+}
@@ -0,0 +1,53 @@
+pub mod conf;
+pub mod resolve;
+
+use std::io::Write;
+use tauri::Manager;
+
+use crate::ServerState;
+
+pub use resolve::SpawnError;
+
+pub fn do_log(log: &mut Option<std::fs::File>, msg: &str) {
+    eprintln!("{}", msg);
+    if let Some(f) = log {
+        let _ = writeln!(f, "{}", msg);
+    }
+}
+
+pub fn kill_tachidesk(app: &tauri::AppHandle) {
+    let state = app.state::<ServerState>();
+    if let Some(child) = state.0.lock().unwrap().take() {
+        let _ = child.kill();
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+        use std::os::windows::process::CommandExt;
+        const CREATE_NO_WINDOW: u32 = 0x08000000;
+
+        let _ = std::process::Command::new("taskkill")
+            .args(["/F", "/FI", "IMAGENAME eq java.exe"])
+            .creation_flags(CREATE_NO_WINDOW)
+            .status();
+
+        for _ in 0..30 {
+            let still_running = std::process::Command::new("tasklist")
+                .args(["/FI", "IMAGENAME eq java.exe", "/NH"])
+                .creation_flags(CREATE_NO_WINDOW)
+                .output()
+                .map(|o| String::from_utf8_lossy(&o.stdout).contains("java.exe"))
+                .unwrap_or(false);
+
+            if !still_running {
+                break;
+            }
+            std::thread::sleep(std::time::Duration::from_millis(100));
+        }
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    let _ = std::process::Command::new("pkill")
+        .args(["-f", "tachidesk"])
+        .status();
+}
@@ -0,0 +1,338 @@
+use crate::server::do_log;
+use serde::Serialize;
+use std::path::PathBuf;
+use tauri::Manager;
+
+#[derive(Serialize, Debug)]
+#[serde(tag = "kind", content = "message")]
+pub enum SpawnError {
+    NotConfigured(String),
+    SpawnFailed(String),
+}
+
+pub struct ServerInvocation {
+    pub bin: String,
+    pub args: Vec<String>,
+    pub working_dir: Option<PathBuf>,
+}
+
+pub fn suwayomi_data_dir() -> PathBuf {
+    #[cfg(target_os = "windows")]
+    {
+        dirs::data_dir()
+            .unwrap_or_else(|| PathBuf::from("C:\\ProgramData"))
+            .join("Tachidesk")
+    }
+    #[cfg(target_os = "macos")]
+    {
+        dirs::data_dir()
+            .unwrap_or_else(|| dirs::home_dir().unwrap_or_else(|| PathBuf::from("~")))
+            .join("Tachidesk")
+    }
+    #[cfg(not(any(target_os = "windows", target_os = "macos")))]
+    {
+        let base = std::env::var("XDG_DATA_HOME")
+            .map(PathBuf::from)
+            .unwrap_or_else(|_| dirs::data_dir().unwrap_or_else(|| PathBuf::from("/tmp")));
+        base.join("Tachidesk")
+    }
+}
+
+pub fn strip_unc(path: PathBuf) -> PathBuf {
+    let s = path.to_string_lossy();
+    if let Some(stripped) = s.strip_prefix(r"\\?\") {
+        PathBuf::from(stripped)
+    } else {
+        path
+    }
+}
+
+#[cfg(not(target_os = "macos"))]
+fn find_java_in_bundle(bundle_dir: &PathBuf, log: &mut Option<std::fs::File>) -> Option<PathBuf> {
+    #[cfg(target_os = "windows")]
+    let java = strip_unc(bundle_dir.join("jre").join("bin").join("java.exe"));
+    #[cfg(not(target_os = "windows"))]
+    let java = bundle_dir.join("jre").join("bin").join("java");
+
+    do_log(
+        log,
+        &format!("[find_java] path: {:?} exists: {}", java, java.exists()),
+    );
+    if java.exists() {
+        Some(java)
+    } else {
+        None
+    }
+}
+
+fn data_root_args() -> Vec<String> {
+    vec!["--dataRoot".to_string(), suwayomi_data_dir().to_string_lossy().into_owned()]
+}
+
+fn jar_data_root_flag() -> String {
+    format!("-Dsuwayomi.server.rootDir={}", suwayomi_data_dir().to_string_lossy())
+}
+
+pub fn resolve_server_binary(
+    binary: &str,
+    app: &tauri::AppHandle,
+    log: &mut Option<std::fs::File>,
+) -> Result<ServerInvocation, SpawnError> {
+    do_log(log, &format!("[resolve] binary = {:?}", binary));
+
+    if !binary.trim().is_empty() {
+        let path = strip_unc(PathBuf::from(binary.trim()));
+        do_log(
+            log,
+            &format!("[resolve] user path: {:?} exists={}", path, path.exists()),
+        );
+        if path.exists() {
+            return Ok(ServerInvocation {
+                bin: path.to_string_lossy().into_owned(),
+                args: data_root_args(),
+                working_dir: path.parent().map(|p| p.to_path_buf()),
+            });
+        }
+        do_log(log, "[resolve] user path not found, falling through");
+    }
+
+    if let Ok(exe) = std::env::current_exe() {
+        if let Some(bin_dir) = exe.parent() {
+            for name in &["tachidesk-server", "suwayomi-launcher"] {
+                let p = bin_dir.join(name);
+                do_log(
+                    log,
+                    &format!("[resolve] sibling: {:?} exists={}", p, p.exists()),
+                );
+                if p.exists() {
+                    return Ok(ServerInvocation {
+                        bin: p.to_string_lossy().into_owned(),
+                        args: data_root_args(),
+                        working_dir: Some(bin_dir.to_path_buf()),
+                    });
+                }
+            }
+        }
+    }
+
+    #[cfg(not(target_os = "macos"))]
+    let resource_dir = {
+        let raw = app.path().resource_dir().unwrap_or_default();
+        let stripped = strip_unc(raw);
+        do_log(log, &format!("[resolve] resource_dir = {:?}", stripped));
+        stripped
+    };
+
+    #[cfg(not(target_os = "macos"))]
+    {
+        let bundle_dir = resource_dir.join("binaries").join("suwayomi-bundle");
+        let jar = bundle_dir.join("bin").join("Suwayomi-Server.jar");
+
+        do_log(
+            log,
+            &format!(
+                "[resolve] bundle_dir={:?} exists={}",
+                bundle_dir,
+                bundle_dir.exists()
+            ),
+        );
+        do_log(
+            log,
+            &format!("[resolve] jar={:?} exists={}", jar, jar.exists()),
+        );
+
+        match find_java_in_bundle(&bundle_dir, log) {
+            Some(java) if jar.exists() => {
+                do_log(log, "[resolve] using bundled JRE");
+                return Ok(ServerInvocation {
+                    bin: java.to_string_lossy().into_owned(),
+                    args: vec![jar_data_root_flag(), "-jar".to_string(), jar.to_string_lossy().into_owned()],
+                    working_dir: Some(bundle_dir),
+                });
+            }
+            _ => do_log(log, "[resolve] bundled JRE/jar not found, falling through"),
+        }
+
+        for name in &[
+            "suwayomi-launcher",
+            "suwayomi-launcher.sh",
+            "tachidesk-server",
+        ] {
+            let p = resource_dir.join(name);
+            do_log(
+                log,
+                &format!("[resolve] sidecar: {:?} exists={}", p, p.exists()),
+            );
+            if p.exists() {
+                return Ok(ServerInvocation {
+                    bin: p.to_string_lossy().into_owned(),
+                    args: data_root_args(),
+                    working_dir: Some(resource_dir.clone()),
+                });
+            }
+        }
+
+        if let Some(java) = find_java_in_bundle(&resource_dir, log) {
+            let jar = std::fs::read_dir(&resource_dir).ok().and_then(|mut rd| {
+                rd.find(|e| {
+                    e.as_ref()
+                        .map(|e| e.file_name().to_string_lossy().ends_with(".jar"))
+                        .unwrap_or(false)
+                })
+                .and_then(|e| e.ok())
+                .map(|e| e.path())
+            });
+
+            if let Some(jar_path) = jar {
+                do_log(
+                    log,
+                    &format!("[resolve] generic JRE java={:?} jar={:?}", java, jar_path),
+                );
+                return Ok(ServerInvocation {
+                    bin: java.to_string_lossy().into_owned(),
+                    args: vec![jar_data_root_flag(), "-jar".to_string(), jar_path.to_string_lossy().into_owned()],
+                    working_dir: Some(resource_dir),
+                });
+            }
+        }
+    }
+
+    #[cfg(target_os = "macos")]
+    {
+        let resource_dir = app.path().resource_dir().unwrap_or_default();
+        let contents_dir = resource_dir.parent().unwrap_or(&resource_dir).to_path_buf();
+
+        do_log(
+            log,
+            &format!("[resolve] macOS contents_dir = {:?}", contents_dir),
+        );
+
+        const NATIVE_NAMES: &[&str] = &[
+            "suwayomi-server-aarch64-apple-darwin",
+            "suwayomi-server-x86_64-apple-darwin",
+            "suwayomi-server",
+            "suwayomi-launcher",
+            "suwayomi-launcher.sh",
+            "tachidesk-server",
+        ];
+
+        let mut found_binary: Option<ServerInvocation> = None;
+        let mut found_java: Option<(PathBuf, PathBuf)> = None;
+
+        'outer: for depth in 0u8..=8 {
+            let entries: Vec<PathBuf> = WalkDir::new(&contents_dir)
+                .min_depth(depth as usize)
+                .max_depth(depth as usize)
+                .into_iter()
+                .filter_map(|e| e.ok())
+                .filter(|e| e.file_type().is_dir())
+                .map(|e| e.into_path())
+                .collect();
+
+            for dir in &entries {
+                do_log(
+                    log,
+                    &format!("[resolve] scanning depth={} dir={:?}", depth, dir),
+                );
+
+                for name in NATIVE_NAMES {
+                    let p = dir.join(name);
+                    if p.exists() {
+                        do_log(log, &format!("[resolve] found native binary: {:?}", p));
+                        found_binary = Some(ServerInvocation {
+                            bin: p.to_string_lossy().into_owned(),
+                            args: data_root_args(),
+                            working_dir: Some(dir.clone()),
+                        });
+                        break 'outer;
+                    }
+                }
+
+                if found_java.is_none() {
+                    let java_exe = dir.join("bin").join("java");
+                    if java_exe.exists() {
+                        do_log(log, &format!("[resolve] found java: {:?}", java_exe));
+                        let mut search = dir.as_path();
+                        'jar: for _ in 0..5 {
+                            if let Ok(rd) = std::fs::read_dir(search) {
+                                for entry in rd.filter_map(|e| e.ok()) {
+                                    if entry.file_name().to_string_lossy().ends_with(".jar") {
+                                        let jar = entry.path();
+                                        do_log(log, &format!("[resolve] found jar: {:?}", jar));
+                                        found_java = Some((java_exe.clone(), jar));
+                                        break 'jar;
+                                    }
+                                }
+                            }
+                            let bin_sibling = search.join("bin");
+                            if let Ok(rd) = std::fs::read_dir(&bin_sibling) {
+                                for entry in rd.filter_map(|e| e.ok()) {
+                                    if entry.file_name().to_string_lossy().ends_with(".jar") {
+                                        let jar = entry.path();
+                                        do_log(
+                                            log,
+                                            &format!("[resolve] found jar in bin/: {:?}", jar),
+                                        );
+                                        found_java = Some((java_exe.clone(), jar));
+                                        break 'jar;
+                                    }
+                                }
+                            }
+                            match search.parent() {
+                                Some(p) => search = p,
+                                None => break,
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if let Some(inv) = found_binary {
+            return Ok(inv);
+        }
+
+        if let Some((java, jar)) = found_java {
+            let working_dir = jar.parent().map(|p| p.to_path_buf());
+            return Ok(ServerInvocation {
+                bin: java.to_string_lossy().into_owned(),
+                args: vec![jar_data_root_flag(), "-jar".to_string(), jar.to_string_lossy().into_owned()],
+                working_dir,
+            });
+        }
+
+        do_log(log, "[resolve] macOS scan found nothing in bundle");
+    }
+
+    for name in &["suwayomi-server", "tachidesk-server"] {
+        #[cfg(target_os = "windows")]
+        let resolved = std::process::Command::new("where")
+            .arg(name)
+            .output()
+            .ok()
+            .filter(|o| o.status.success())
+            .and_then(|o| String::from_utf8(o.stdout).ok())
+            .and_then(|s| s.lines().next().map(|l| l.trim().to_string()));
+        #[cfg(not(target_os = "windows"))]
+        let resolved = std::process::Command::new("which")
+            .arg(name)
+            .output()
+            .ok()
+            .filter(|o| o.status.success())
+            .and_then(|o| String::from_utf8(o.stdout).ok())
+            .and_then(|s| s.lines().next().map(|l| l.trim().to_string()));
+
+        if let Some(bin_path) = resolved {
+            do_log(log, &format!("[resolve] found on PATH: {:?}", bin_path));
+            return Ok(ServerInvocation {
+                bin: bin_path,
+                args: vec![],
+                working_dir: None,
+            });
+        }
+    }
+
+    Err(SpawnError::NotConfigured(
+        "Server binary not found. Install Suwayomi-Server or set the path in Settings.".to_string(),
+    ))
+}
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "Moku",
-  "version": "0.9.1",
+  "version": "0.9.2",
  "identifier": "io.github.MokuProject.Moku",
  "build": {
    "frontendDist": "../dist",
@@ -6,7 +6,7 @@
  import { platform }          from "@tauri-apps/plugin-os";
  import { store, setActiveDownloads } from "@store/state.svelte";
  import { downloadStore } from "@features/downloads/store/downloadState.svelte";
-  import { boot, startProbe, stopProbe, retryBoot, bypassBoot } from "@store/boot.svelte";
+  import { boot, initStore, startProbe, stopProbe, retryBoot, bypassBoot } from "@store/boot.svelte";
  import { initRpc, setIdle, clearReading, destroyRpc } from "@store/discord";
  import { applyTheme }        from "@core/theme";
  import { applyZoom, mountZoomKey, mountIdleDetection } from "@core/ui";
@@ -100,6 +100,7 @@
      });
    }

+    await initStore();
    startProbe();

    const unlistenDownload = await listen<{ chapterId: number; mangaId: number; progress: number }[]>(
@@ -127,7 +128,7 @@
  <SplashScreen mode="idle" showFps showCards={store.settings.splashCards ?? true}
    onDismiss={() => setTimeout(() => devSplash = false, 340)} />

-{:else if !appReady && !boot.loginRequired && !boot.unsupportedMode}
+{:else if !appReady && !boot.loginRequired}
  <SplashScreen mode="loading" ringFull={boot.serverProbeOk}
    failed={boot.failed} notConfigured={boot.notConfigured}
    showCards={store.settings.splashCards ?? true}
@@ -135,7 +136,7 @@
    onRetry={retryBoot}
    onBypass={() => bypassBoot(() => { appReady = true; })} />

-{:else if boot.unsupportedMode || boot.loginRequired}
+{:else if boot.loginRequired}
  <SplashScreen mode="loading" ringFull={true} showCards={store.settings.splashCards ?? true} />
  <AuthGate onReady={() => { appReady = true; }} />

@@ -145,6 +146,11 @@
      onDismiss={() => { idle = false; }} />
  {/if}

+  {#if boot.sessionExpired}
+    <SplashScreen mode="loading" ringFull={true} showCards={store.settings.splashCards ?? true} />
+    <AuthGate onReady={() => { boot.sessionExpired = false; }} />
+  {/if}
+
  <div id="app-shell" class="root">
    {#if !store.activeChapter}<TitleBar />{/if}
    <div class="content">
@@ -1,5 +1,6 @@
 import { store } from "@store/state.svelte";
-import { fetchAuthenticated } from "../core/auth";
+import { fetchAuthenticated, AuthRequiredError } from "../core/auth";
+import { boot } from "@store/boot.svelte";

 const DEFAULT_URL = "http://127.0.0.1:4567";

@@ -43,12 +44,13 @@ async function fetchWithRetry(
  for (let i = 0; i < retries; i++) {
    if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
    try {
-      const res = await fetchAuthenticated(url, init, signal);
+      const res = await fetchAuthenticated(url, init, signal, boot.skipped);
      if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
      return res;
    } catch (e: any) {
      if (e?.authRequired) throw e;
      if (e?.name === "AbortError" || signal?.aborted) throw new DOMException("Aborted", "AbortError");
+      if (e instanceof AuthRequiredError) throw e;
      if (i === retries - 1) throw e;
      await abortableSleep(delayMs * Math.pow(1.5, i), signal);
    }
@@ -70,6 +72,15 @@ export async function gql<T>(
  if (!res.ok) throw new Error(`Suwayomi HTTP ${res.status}`);
  const json: GQLResponse<T> = await res.json();
  if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
-  if (json.errors?.length) throw new Error(json.errors[0].message);
+  if (json.errors?.length) {
+    const isAuthError = json.errors.some(e => /unauthorized|unauthenticated/i.test(e.message));
+    if (isAuthError && !boot.skipped) {
+      boot.sessionExpired = true;
+      boot.loginRequired  = true;
+      boot.loginUser      = store.settings.serverAuthUser ?? "";
+      throw new AuthRequiredError(json.errors[0].message);
+    }
+    throw new Error(json.errors[0].message);
+  }
  return json.data;
 }
@@ -3,7 +3,7 @@ export const FETCH_CHAPTERS = `
    fetchChapters(input: { mangaId: $mangaId }) {
      chapters {
        id name chapterNumber sourceOrder isRead isDownloaded isBookmarked
-        pageCount mangaId uploadDate realUrl lastPageRead scanlator
+        pageCount mangaId uploadDate realUrl lastPageRead lastReadAt scanlator
      }
    }
  }
@@ -46,3 +46,19 @@ export const DELETE_DOWNLOADED_CHAPTERS = `
    }
  }
 `;
+
+export const SET_CHAPTER_META = `
+  mutation SetChapterMeta($chapterId: Int!, $key: String!, $value: String!) {
+    setChapterMeta(input: { meta: { chapterId: $chapterId, key: $key, value: $value } }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const DELETE_CHAPTER_META = `
+  mutation DeleteChapterMeta($chapterId: Int!, $key: String!) {
+    deleteChapterMeta(input: { chapterId: $chapterId, key: $key }) {
+      meta { key value }
+    }
+  }
+`;
@@ -17,6 +17,14 @@ export const UPDATE_EXTENSION = `
  }
 `;

+export const UPDATE_EXTENSIONS = `
+  mutation UpdateExtensions($ids: [String!]!, $install: Boolean, $uninstall: Boolean, $update: Boolean) {
+    updateExtensions(input: { ids: $ids, patch: { install: $install, uninstall: $uninstall, update: $update } }) {
+      extensions { apkName pkgName name isInstalled hasUpdate }
+    }
+  }
+`;
+
 export const INSTALL_EXTERNAL_EXTENSION = `
  mutation InstallExternalExtension($url: String!) {
    installExternalExtension(input: { extensionUrl: $url }) {
@@ -25,6 +33,82 @@ export const INSTALL_EXTERNAL_EXTENSION = `
  }
 `;

+export const UPDATE_SOURCE_PREFERENCE = `
+  mutation UpdateSourcePreference($source: LongString!, $change: SourcePreferenceChangeInput!) {
+    updateSourcePreference(input: { source: $source, change: $change }) {
+      source { id displayName }
+    }
+  }
+`;
+
+export const SET_SOURCE_META = `
+  mutation SetSourceMeta($sourceId: LongString!, $key: String!, $value: String!) {
+    setSourceMeta(input: { meta: { sourceId: $sourceId, key: $key, value: $value } }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const DELETE_SOURCE_META = `
+  mutation DeleteSourceMeta($sourceId: LongString!, $key: String!) {
+    deleteSourceMeta(input: { sourceId: $sourceId, key: $key }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const SET_CATEGORY_META = `
+  mutation SetCategoryMeta($categoryId: Int!, $key: String!, $value: String!) {
+    setCategoryMeta(input: { meta: { categoryId: $categoryId, key: $key, value: $value } }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const DELETE_CATEGORY_META = `
+  mutation DeleteCategoryMeta($categoryId: Int!, $key: String!) {
+    deleteCategoryMeta(input: { categoryId: $categoryId, key: $key }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const SET_GLOBAL_META = `
+  mutation SetGlobalMeta($key: String!, $value: String!) {
+    setGlobalMeta(input: { meta: { key: $key, value: $value } }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const DELETE_GLOBAL_META = `
+  mutation DeleteGlobalMeta($key: String!) {
+    deleteGlobalMeta(input: { key: $key }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const CLEAR_CACHED_IMAGES = `
+  mutation ClearCachedImages($cachedPages: Boolean, $cachedThumbnails: Boolean, $downloadedThumbnails: Boolean) {
+    clearCachedImages(input: {
+      cachedPages: $cachedPages
+      cachedThumbnails: $cachedThumbnails
+      downloadedThumbnails: $downloadedThumbnails
+    }) {
+      cachedPages cachedThumbnails downloadedThumbnails
+    }
+  }
+`;
+
+export const RESET_SETTINGS = `
+  mutation ResetSettings {
+    resetSettings(input: {}) {
+      settings { extensionRepos }
+    }
+  }
+`;
+
 export const SET_EXTENSION_REPOS = `
  mutation SetExtensionRepos($repos: [String!]!) {
    setSettings(input: { settings: { extensionRepos: $repos } }) {
@@ -33,6 +33,14 @@ export const UPDATE_MANGA_CATEGORIES = `
  }
 `;

+export const UPDATE_MANGAS_CATEGORIES = `
+  mutation UpdateMangasCategories($ids: [Int!]!, $addTo: [Int!]!, $removeFrom: [Int!]!) {
+    updateMangasCategories(input: { ids: $ids, patch: { addToCategories: $addTo, removeFromCategories: $removeFrom } }) {
+      mangas { id }
+    }
+  }
+`;
+
 export const CREATE_CATEGORY = `
  mutation CreateCategory($name: String!) {
    createCategory(input: { name: $name }) {
@@ -49,6 +57,14 @@ export const UPDATE_CATEGORY = `
  }
 `;

+export const UPDATE_CATEGORIES = `
+  mutation UpdateCategories($ids: [Int!]!, $patch: UpdateCategoryPatchInput!) {
+    updateCategories(input: { ids: $ids, patch: $patch }) {
+      categories { id name order default includeInUpdate includeInDownload }
+    }
+  }
+`;
+
 export const DELETE_CATEGORY = `
  mutation DeleteCategory($id: Int!) {
    deleteCategory(input: { categoryId: $id }) {
@@ -65,6 +81,16 @@ export const UPDATE_CATEGORY_ORDER = `
  }
 `;

+export const UPDATE_CATEGORY_MANGA = `
+  mutation UpdateCategoryManga($categoryId: Int!) {
+    updateCategoryManga(input: { categoryId: $categoryId }) {
+      updateStatus {
+        jobsInfo { isRunning finishedJobs totalJobs }
+      }
+    }
+  }
+`;
+
 export const UPDATE_LIBRARY = `
  mutation UpdateLibrary {
    updateLibrary(input: {}) {
@@ -75,6 +101,26 @@ export const UPDATE_LIBRARY = `
  }
 `;

+export const UPDATE_LIBRARY_MANGA = `
+  mutation UpdateLibraryManga($mangaId: Int!) {
+    updateLibraryManga(input: { mangaId: $mangaId }) {
+      updateStatus {
+        jobsInfo { isRunning finishedJobs totalJobs }
+      }
+    }
+  }
+`;
+
+export const UPDATE_STOP = `
+  mutation UpdateStop {
+    updateStop(input: {}) {
+      updateStatus {
+        jobsInfo { isRunning finishedJobs totalJobs }
+      }
+    }
+  }
+`;
+
 export const CREATE_BACKUP = `
  mutation CreateBackup {
    createBackup(input: {}) { url }
@@ -89,3 +135,19 @@ export const RESTORE_BACKUP = `
    }
  }
 `;
+
+export const SET_MANGA_META = `
+  mutation SetMangaMeta($mangaId: Int!, $key: String!, $value: String!) {
+    setMangaMeta(input: { meta: { mangaId: $mangaId, key: $key, value: $value } }) {
+      meta { key value }
+    }
+  }
+`;
+
+export const DELETE_MANGA_META = `
+  mutation DeleteMangaMeta($mangaId: Int!, $key: String!) {
+    deleteMangaMeta(input: { mangaId: $mangaId, key: $key }) {
+      meta { key value }
+    }
+  }
+`;
@@ -2,449 +2,129 @@

 ## Manga (`mutations/manga.ts`)

-### `FETCH_MANGA`
-Fetches and refreshes manga metadata from its source.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `Int!` | Manga ID |
-
---
-
-### `UPDATE_MANGA`
-Updates a single manga's library membership.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `Int!` | Manga ID |
-| `inLibrary` | `Boolean` | Add/remove from library |
-
---
-
-### `UPDATE_MANGAS`
-Bulk-updates library membership for multiple manga.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `ids` | `[Int!]!` | Manga IDs |
-| `inLibrary` | `Boolean` | Add/remove from library |
-
---
-
-### `UPDATE_MANGA_CATEGORIES`
-Adds or removes a manga from categories.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `mangaId` | `Int!` | Manga ID |
-| `addTo` | `[Int!]!` | Category IDs to add to |
-| `removeFrom` | `[Int!]!` | Category IDs to remove from |
-
---
-
-### `CREATE_CATEGORY`
-Creates a new manga category.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `name` | `String!` | Category name |
-
---
-
-### `UPDATE_CATEGORY`
-Updates a category's name.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `Int!` | Category ID |
-| `name` | `String` | New name |
-
---
-
-### `DELETE_CATEGORY`
-Deletes a category by ID.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `Int!` | Category ID |
-
---
-
-### `UPDATE_CATEGORY_ORDER`
-Moves a category to a new position.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `Int!` | Category ID |
-| `position` | `Int!` | New position index |
-
---
-
-### `UPDATE_LIBRARY`
-Triggers a library-wide metadata refresh and returns job status.
-
-**Variables:** none
-
---
-
-### `CREATE_BACKUP`
-Creates a backup and returns its download URL.
-
-**Variables:** none
-
---
-
-### `RESTORE_BACKUP`
-Restores a backup from an uploaded file and returns restore job status.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `backup` | `Upload!` | Backup file |
+| Mutation | Variables | Description |
+|----------|-----------|-------------|
+| `FETCH_MANGA` | `id: Int!` | Fetch and refresh manga metadata from its source |
+| `UPDATE_MANGA` | `id: Int!`, `inLibrary: Boolean` | Update a single manga's library membership |
+| `UPDATE_MANGAS` | `ids: [Int!]!`, `inLibrary: Boolean` | Bulk-update library membership for multiple manga |
+| `UPDATE_MANGA_CATEGORIES` | `mangaId: Int!`, `addTo: [Int!]!`, `removeFrom: [Int!]!` | Add or remove a single manga from categories |
+| `UPDATE_MANGAS_CATEGORIES` | `ids: [Int!]!`, `addTo: [Int!]!`, `removeFrom: [Int!]!` | Bulk add/remove multiple manga from categories |
+| `CREATE_CATEGORY` | `name: String!` | Create a new category |
+| `UPDATE_CATEGORY` | `id: Int!`, `name: String` | Update a category's name |
+| `UPDATE_CATEGORIES` | `ids: [Int!]!`, `patch: UpdateCategoryPatchInput!` | Bulk-update multiple categories |
+| `DELETE_CATEGORY` | `id: Int!` | Delete a category |
+| `UPDATE_CATEGORY_ORDER` | `id: Int!`, `position: Int!` | Move a category to a new position |
+| `UPDATE_CATEGORY_MANGA` | `categoryId: Int!` | Trigger a metadata update for all manga in a category |
+| `UPDATE_LIBRARY` | — | Trigger a full library metadata refresh |
+| `UPDATE_LIBRARY_MANGA` | `mangaId: Int!` | Trigger a metadata update for a single manga |
+| `UPDATE_STOP` | — | Stop the currently running library update job |
+| `CREATE_BACKUP` | — | Create a backup and return its download URL |
+| `RESTORE_BACKUP` | `backup: Upload!` | Restore a backup file and return the restore job status |
+| `SET_MANGA_META` | `mangaId: Int!`, `key: String!`, `value: String!` | Set a key/value meta entry on a manga |
+| `DELETE_MANGA_META` | `mangaId: Int!`, `key: String!` | Delete a key/value meta entry from a manga |

 ---

 ## Chapters (`mutations/chapters.ts`)

-### `FETCH_CHAPTERS`
-Fetches/refreshes the chapter list for a manga from its source.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `mangaId` | `Int!` | Manga ID |
-
---
-
-### `FETCH_CHAPTER_PAGES`
-Fetches the page URLs for a specific chapter.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `chapterId` | `Int!` | Chapter ID |
-
---
-
-### `MARK_CHAPTER_READ`
-Marks a single chapter as read or unread.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `Int!` | Chapter ID |
-| `isRead` | `Boolean!` | Read state |
-
---
-
-### `MARK_CHAPTERS_READ`
-Bulk-marks multiple chapters as read or unread.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `ids` | `[Int!]!` | Chapter IDs |
-| `isRead` | `Boolean!` | Read state |
-
---
-
-### `UPDATE_CHAPTERS_PROGRESS`
-Bulk-updates read state, bookmark state, and last page read for multiple chapters.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `ids` | `[Int!]!` | Chapter IDs |
-| `isRead` | `Boolean` | Read state |
-| `isBookmarked` | `Boolean` | Bookmark state |
-| `lastPageRead` | `Int` | Last page index read |
-
---
-
-### `DELETE_DOWNLOADED_CHAPTERS`
-Deletes downloaded chapter files for the given chapter IDs.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `ids` | `[Int!]!` | Chapter IDs |
+| Mutation | Variables | Description |
+|----------|-----------|-------------|
+| `FETCH_CHAPTERS` | `mangaId: Int!` | Fetch/refresh the chapter list for a manga from its source |
+| `FETCH_CHAPTER_PAGES` | `chapterId: Int!` | Fetch the page URLs for a specific chapter |
+| `MARK_CHAPTER_READ` | `id: Int!`, `isRead: Boolean!` | Mark a single chapter read or unread |
+| `MARK_CHAPTERS_READ` | `ids: [Int!]!`, `isRead: Boolean!` | Bulk mark chapters read or unread |
+| `UPDATE_CHAPTERS_PROGRESS` | `ids: [Int!]!`, `isRead: Boolean`, `isBookmarked: Boolean`, `lastPageRead: Int` | Bulk update read state, bookmark state, and last page read |
+| `DELETE_DOWNLOADED_CHAPTERS` | `ids: [Int!]!` | Delete downloaded chapter files |
+| `SET_CHAPTER_META` | `chapterId: Int!`, `key: String!`, `value: String!` | Set a key/value meta entry on a chapter |
+| `DELETE_CHAPTER_META` | `chapterId: Int!`, `key: String!` | Delete a key/value meta entry from a chapter |

 ---

 ## Downloads (`mutations/downloads.ts`)

-### `ENQUEUE_DOWNLOAD`
-Adds a single chapter to the download queue.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `chapterId` | `Int!` | Chapter ID |
-
---
-
-### `ENQUEUE_CHAPTERS_DOWNLOAD`
-Adds multiple chapters to the download queue.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `chapterIds` | `[Int!]!` | Chapter IDs |
-
---
-
-### `DEQUEUE_DOWNLOAD`
-Removes a chapter from the download queue.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `chapterId` | `Int!` | Chapter ID |
-
---
-
-### `START_DOWNLOADER`
-Starts the downloader and returns the current queue state.
-
-**Variables:** none
-
---
-
-### `STOP_DOWNLOADER`
-Stops the downloader and returns the current queue state.
-
-**Variables:** none
-
---
-
-### `CLEAR_DOWNLOADER`
-Clears all items from the download queue.
-
-**Variables:** none
-
---
-
-### `FETCH_SOURCE_MANGA`
-Fetches manga from a source (browse/search), with pagination and optional filters.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `source` | `LongString!` | Source ID |
-| `type` | `FetchSourceMangaType!` | Browse type (e.g. popular, latest, search) |
-| `page` | `Int!` | Page number |
-| `query` | `String` | Search query |
-| `filters` | `[FilterChangeInput!]` | Source-specific filters |
-
---
-
-### `SET_DOWNLOADS_PATH`
-Sets the downloads directory path in settings.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `path` | `String!` | Filesystem path |
-
---
-
-### `SET_LOCAL_SOURCE_PATH`
-Sets the local source directory path in settings.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `path` | `String!` | Filesystem path |
+| Mutation | Variables | Description |
+|----------|-----------|-------------|
+| `ENQUEUE_DOWNLOAD` | `chapterId: Int!` | Add a single chapter to the download queue |
+| `ENQUEUE_CHAPTERS_DOWNLOAD` | `chapterIds: [Int!]!` | Add multiple chapters to the download queue |
+| `DEQUEUE_DOWNLOAD` | `chapterId: Int!` | Remove a single chapter from the download queue |
+| `DEQUEUE_CHAPTERS_DOWNLOAD` | `chapterIds: [Int!]!` | Remove multiple chapters from the download queue |
+| `REORDER_DOWNLOAD` | `chapterId: Int!`, `to: Int!` | Move a queued chapter to a new position |
+| `START_DOWNLOADER` | — | Start the downloader |
+| `STOP_DOWNLOADER` | — | Stop the downloader |
+| `CLEAR_DOWNLOADER` | — | Clear all items from the download queue |
+| `FETCH_SOURCE_MANGA` | `source: LongString!`, `type: FetchSourceMangaType!`, `page: Int!`, `query: String`, `filters: [FilterChangeInput!]` | Fetch manga from a source (browse/search) with pagination |
+| `SET_DOWNLOADS_PATH` | `path: String!` | Set the downloads directory path |
+| `SET_LOCAL_SOURCE_PATH` | `path: String!` | Set the local source directory path |

 ---

 ## Extensions (`mutations/extensions.ts`)

-### `FETCH_EXTENSIONS`
-Fetches the latest extension list from configured repos.
-
-**Variables:** none
-
---
-
-### `UPDATE_EXTENSION`
-Installs, uninstalls, or updates an extension.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `String!` | Extension package name |
-| `install` | `Boolean` | Install the extension |
-| `uninstall` | `Boolean` | Uninstall the extension |
-| `update` | `Boolean` | Update the extension |
-
---
-
-### `INSTALL_EXTERNAL_EXTENSION`
-Installs an extension from an external APK URL.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `url` | `String!` | APK download URL |
-
---
-
-### `SET_EXTENSION_REPOS`
-Sets the list of extension repository URLs.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `repos` | `[String!]!` | Repository URLs |
-
---
-
-### `SET_SERVER_AUTH`
-Configures server authentication mode and credentials.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `authMode` | `AuthMode!` | Auth mode |
-| `authUsername` | `String!` | Username |
-| `authPassword` | `String!` | Password |
-
---
-
-### `SET_SOCKS_PROXY`
-Configures SOCKS proxy settings.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `socksProxyEnabled` | `Boolean!` | Enable/disable proxy |
-| `socksProxyHost` | `String!` | Proxy host |
-| `socksProxyPort` | `String!` | Proxy port |
-| `socksProxyVersion` | `Int!` | SOCKS version (4 or 5) |
-| `socksProxyUsername` | `String!` | Proxy username |
-| `socksProxyPassword` | `String!` | Proxy password |
-
---
-
-### `SET_FLARESOLVERR`
-Configures FlareSolverr integration settings.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `flareSolverrEnabled` | `Boolean!` | Enable/disable FlareSolverr |
-| `flareSolverrUrl` | `String!` | FlareSolverr URL |
-| `flareSolverrTimeout` | `Int!` | Request timeout (ms) |
-| `flareSolverrSessionName` | `String!` | Session name |
-| `flareSolverrSessionTtl` | `Int!` | Session TTL (seconds) |
-| `flareSolverrAsResponseFallback` | `Boolean!` | Use as fallback only |
+| Mutation | Variables | Description |
+|----------|-----------|-------------|
+| `FETCH_EXTENSIONS` | — | Fetch the latest extension list from configured repos |
+| `UPDATE_EXTENSION` | `id: String!`, `install: Boolean`, `uninstall: Boolean`, `update: Boolean` | Install, uninstall, or update a single extension |
+| `UPDATE_EXTENSIONS` | `ids: [String!]!`, `install: Boolean`, `uninstall: Boolean`, `update: Boolean` | Bulk install, uninstall, or update multiple extensions |
+| `INSTALL_EXTERNAL_EXTENSION` | `url: String!` | Install an extension from an external APK URL |
+| `UPDATE_SOURCE_PREFERENCE` | `source: LongString!`, `change: SourcePreferenceChangeInput!` | Update a source-specific preference value |
+| `SET_SOURCE_META` | `sourceId: LongString!`, `key: String!`, `value: String!` | Set a key/value meta entry on a source |
+| `DELETE_SOURCE_META` | `sourceId: LongString!`, `key: String!` | Delete a key/value meta entry from a source |
+| `SET_CATEGORY_META` | `categoryId: Int!`, `key: String!`, `value: String!` | Set a key/value meta entry on a category |
+| `DELETE_CATEGORY_META` | `categoryId: Int!`, `key: String!` | Delete a key/value meta entry from a category |
+| `SET_GLOBAL_META` | `key: String!`, `value: String!` | Set a global key/value meta entry |
+| `DELETE_GLOBAL_META` | `key: String!` | Delete a global key/value meta entry |
+| `CLEAR_CACHED_IMAGES` | `cachedPages: Boolean`, `cachedThumbnails: Boolean`, `downloadedThumbnails: Boolean` | Selectively clear cached page images, cached thumbnails, or downloaded thumbnails |
+| `RESET_SETTINGS` | — | Reset all server settings to defaults |
+| `UPDATE_WEBUI` | — | Trigger a WebUI update and return live status |
+| `RESET_WEBUI_UPDATE_STATUS` | — | Reset the WebUI update status back to idle |
+| `SET_EXTENSION_REPOS` | `repos: [String!]!` | Set the list of extension repository URLs |
+| `SET_SERVER_AUTH` | `authMode: AuthMode!`, `authUsername: String!`, `authPassword: String!` | Configure server auth mode and credentials |
+| `SET_SOCKS_PROXY` | `socksProxyEnabled: Boolean!`, `socksProxyHost: String!`, `socksProxyPort: String!`, `socksProxyVersion: Int!`, `socksProxyUsername: String!`, `socksProxyPassword: String!` | Configure SOCKS proxy settings |
+| `SET_FLARESOLVERR` | `flareSolverrEnabled: Boolean!`, `flareSolverrUrl: String!`, `flareSolverrTimeout: Int!`, `flareSolverrSessionName: String!`, `flareSolverrSessionTtl: Int!`, `flareSolverrAsResponseFallback: Boolean!` | Configure FlareSolverr integration |

 ---

 ## Tracking (`mutations/tracking.ts`)

-### `BIND_TRACK`
-Binds a manga to a remote tracker entry.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `mangaId` | `Int!` | Manga ID |
-| `trackerId` | `Int!` | Tracker ID |
-| `remoteId` | `LongString!` | Remote entry ID on the tracker |
+| Mutation | Variables | Description |
+|----------|-----------|-------------|
+| `BIND_TRACK` | `mangaId: Int!`, `trackerId: Int!`, `remoteId: LongString!` | Bind a manga to a remote tracker entry |
+| `UPDATE_TRACK` | `recordId: Int!`, `status: Int`, `lastChapterRead: Float`, `scoreString: String`, `startDate: LongString`, `finishDate: LongString`, `private: Boolean` | Update tracking progress, status, score, and dates |
+| `UNBIND_TRACK` | `recordId: Int!` | Unbind a manga from a tracker record |
+| `FETCH_TRACK` | `recordId: Int!` | Refresh a track record from the remote tracker |
+| `TRACK_PROGRESS` | `mangaId: Int!` | Sync current reading progress to all bound trackers for a manga |
+| `LOGIN_TRACKER_OAUTH` | `trackerId: Int!`, `callbackUrl: String!` | Initiate OAuth login for a tracker |
+| `LOGIN_TRACKER_CREDENTIALS` | `trackerId: Int!`, `username: String!`, `password: String!` | Log into a tracker with username and password |
+| `LOGOUT_TRACKER` | `trackerId: Int!` | Log out of a tracker |
+| `CONNECT_KOSYNC` | `username: String!`, `password: String!`, `serverAddress: String!` | Connect a KOReader sync account |
+| `LOGOUT_KOSYNC` | — | Disconnect the KOReader sync account |
+| `PULL_KOSYNC_PROGRESS` | `chapterId: Int!` | Pull reading progress from KOReader sync for a chapter |
+| `PUSH_KOSYNC_PROGRESS` | `chapterId: Int!` | Push reading progress to KOReader sync for a chapter |
+| `LOGIN_USER` | `username: String!`, `password: String!` | Authenticate and return access + refresh tokens |
+| `REFRESH_TOKEN` | — | Refresh the current access token |

 ---

-### `UPDATE_TRACK`
-Updates tracking progress, status, score, and dates for a track record.
+## New in Preview

-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `recordId` | `Int!` | Track record ID |
-| `status` | `Int` | Reading status |
-| `lastChapterRead` | `Float` | Last chapter read |
-| `scoreString` | `String` | Score in tracker's format |
-| `startDate` | `LongString` | Start date |
-| `finishDate` | `LongString` | Finish date |
-| `private` | `Boolean` | Mark as private |
+Mutations now available and not yet wired to any feature in Moku:

---
-
-### `UNBIND_TRACK`
-Unbinds a manga from a tracker record.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `recordId` | `Int!` | Track record ID |
-
---
-
-### `FETCH_TRACK`
-Refreshes a track record from the remote tracker.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `recordId` | `Int!` | Track record ID |
-
---
-
-### `LOGIN_TRACKER_OAUTH`
-Initiates OAuth login for a tracker using a callback URL.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `trackerId` | `Int!` | Tracker ID |
-| `callbackUrl` | `String!` | OAuth callback URL |
-
---
-
-### `LOGIN_TRACKER_CREDENTIALS`
-Logs into a tracker using username and password.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `trackerId` | `Int!` | Tracker ID |
-| `username` | `String!` | Username |
-| `password` | `String!` | Password |
-
---
-
-### `LOGOUT_TRACKER`
-Logs out of a tracker.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `trackerId` | `Int!` | Tracker ID |
-
---
-
-### `LOGIN_USER`
-Authenticates a user and returns access and refresh tokens.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `username` | `String!` | Username |
-| `password` | `String!` | Password |
-
---
-
-### `REFRESH_TOKEN`
-Refreshes the current access token.
-
-**Variables:** none
+| Mutation | Potential Feature |
+|----------|-------------------|
+| `UPDATE_MANGAS_CATEGORIES` | Bulk category editor — move/assign multiple manga at once |
+| `UPDATE_CATEGORIES` | Bulk category settings — toggle update/download flags for multiple categories at once |
+| `UPDATE_CATEGORY_MANGA` | Per-category refresh button — update only one category's manga |
+| `UPDATE_LIBRARY_MANGA` | Single manga refresh — trigger from series detail without a full library update |
+| `UPDATE_STOP` | Cancel button for library update jobs |
+| `UPDATE_EXTENSIONS` | Bulk extension updater — "update all" button in extensions page |
+| `UPDATE_SOURCE_PREFERENCE` | Source settings page — persist source-specific preferences |
+| `SET_SOURCE_META` / `DELETE_SOURCE_META` | Per-source client state — store browse position, last filter, etc. |
+| `SET_CATEGORY_META` / `DELETE_CATEGORY_META` | Per-category client state — store sort/filter preferences per category |
+| `SET_CHAPTER_META` / `DELETE_CHAPTER_META` | Per-chapter client state — annotations, custom notes |
+| `SET_GLOBAL_META` / `DELETE_GLOBAL_META` | Server-synced app state — replace local persistence for settings that should roam |
+| `CLEAR_CACHED_IMAGES` | Storage settings — granular cache clearing (pages, thumbnails, downloaded) |
+| `RESET_SETTINGS` | Settings page — factory reset button |
+| `UPDATE_WEBUI` / `RESET_WEBUI_UPDATE_STATUS` | WebUI update flow in settings — trigger and monitor update progress |
+| `TRACK_PROGRESS` | One-tap sync — push current reading position to all trackers without opening tracking panel |
+| `CONNECT_KOSYNC` / `LOGOUT_KOSYNC` | KOReader sync settings section — connect/disconnect account |
+| `PULL_KOSYNC_PROGRESS` / `PUSH_KOSYNC_PROGRESS` | KOReader sync — manual pull/push per chapter, or auto-sync on chapter open/close |
@@ -1,6 +1,6 @@
 const TRACK_RECORD_FRAGMENT = `
  id trackerId remoteId title status score displayScore
-  lastChapterRead totalChapters remoteUrl startDate finishDate private
+  lastChapterRead totalChapters remoteUrl startDate finishDate private libraryId
 `;

 export const BIND_TRACK = `
@@ -15,7 +15,7 @@ export const UPDATE_TRACK = `
  mutation UpdateTrack($recordId: Int!, $status: Int, $lastChapterRead: Float, $scoreString: String, $startDate: LongString, $finishDate: LongString, $private: Boolean) {
    updateTrack(input: { recordId: $recordId, status: $status, lastChapterRead: $lastChapterRead, scoreString: $scoreString, startDate: $startDate, finishDate: $finishDate, private: $private }) {
      trackRecord {
-        id trackerId status score displayScore lastChapterRead totalChapters startDate finishDate private
+        id trackerId status score displayScore lastChapterRead totalChapters startDate finishDate private libraryId
      }
    }
  }
@@ -33,7 +33,17 @@ export const FETCH_TRACK = `
  mutation FetchTrack($recordId: Int!) {
    fetchTrack(input: { recordId: $recordId }) {
      trackRecord {
-        id trackerId status score displayScore lastChapterRead totalChapters startDate finishDate
+        id trackerId status score displayScore lastChapterRead totalChapters startDate finishDate libraryId
+      }
+    }
+  }
+`;
+
+export const TRACK_PROGRESS = `
+  mutation TrackProgress($mangaId: Int!) {
+    trackProgress(input: { mangaId: $mangaId }) {
+      trackRecords {
+        id trackerId lastChapterRead status
      }
    }
  }
@@ -43,7 +53,7 @@ export const LOGIN_TRACKER_OAUTH = `
  mutation LoginTrackerOAuth($trackerId: Int!, $callbackUrl: String!) {
    loginTrackerOAuth(input: { trackerId: $trackerId, callbackUrl: $callbackUrl }) {
      isLoggedIn
-      tracker { id name isLoggedIn authUrl }
+      tracker { id name isLoggedIn isTokenExpired authUrl }
    }
  }
 `;
@@ -52,7 +62,7 @@ export const LOGIN_TRACKER_CREDENTIALS = `
  mutation LoginTrackerCredentials($trackerId: Int!, $username: String!, $password: String!) {
    loginTrackerCredentials(input: { trackerId: $trackerId, username: $username, password: $password }) {
      isLoggedIn
-      tracker { id name isLoggedIn authUrl }
+      tracker { id name isLoggedIn isTokenExpired authUrl }
    }
  }
 `;
@@ -60,7 +70,39 @@ export const LOGIN_TRACKER_CREDENTIALS = `
 export const LOGOUT_TRACKER = `
  mutation LogoutTracker($trackerId: Int!) {
    logoutTracker(input: { trackerId: $trackerId }) {
-      tracker { id name isLoggedIn authUrl }
+      tracker { id name isLoggedIn isTokenExpired authUrl }
+    }
+  }
+`;
+
+export const CONNECT_KOSYNC = `
+  mutation ConnectKoSync($username: String!, $password: String!, $serverAddress: String!) {
+    connectKoSyncAccount(input: { username: $username, password: $password, serverAddress: $serverAddress }) {
+      isConnected
+    }
+  }
+`;
+
+export const LOGOUT_KOSYNC = `
+  mutation LogoutKoSync {
+    logoutKoSyncAccount(input: {}) {
+      isConnected
+    }
+  }
+`;
+
+export const PULL_KOSYNC_PROGRESS = `
+  mutation PullKoSyncProgress($chapterId: Int!) {
+    pullKoSyncProgress(input: { chapterId: $chapterId }) {
+      chapter { id lastPageRead isRead }
+    }
+  }
+`;
+
+export const PUSH_KOSYNC_PROGRESS = `
+  mutation PushKoSyncProgress($chapterId: Int!) {
+    pushKoSyncProgress(input: { chapterId: $chapterId }) {
+      chapter { id lastPageRead isRead }
    }
  }
 `;
@@ -68,13 +110,13 @@ export const LOGOUT_TRACKER = `
 export const LOGIN_USER = `
  mutation Login($username: String!, $password: String!) {
    login(input: { username: $username, password: $password }) {
-      accessToken refreshToken
+      accessToken
    }
  }
 `;

 export const REFRESH_TOKEN = `
  mutation RefreshToken {
-    refreshToken { accessToken }
+    refreshToken(input: {}) { accessToken }
  }
 `;
@@ -15,7 +15,7 @@ export const GET_CHAPTERS = `
    chapters(condition: { mangaId: $mangaId }) {
      nodes {
        id name chapterNumber sourceOrder isRead isDownloaded isBookmarked
-        pageCount mangaId uploadDate realUrl lastPageRead scanlator
+        pageCount mangaId uploadDate realUrl lastPageRead lastReadAt scanlator
      }
    }
  }
@@ -3,7 +3,7 @@ export const GET_DOWNLOAD_STATUS = `
    downloadStatus {
      state
      queue {
-        progress state
+        progress state tries
        chapter {
          id name pageCount mangaId
          manga { id title thumbnailUrl }
@@ -20,7 +20,10 @@ export const GET_EXTENSIONS = `
 export const GET_SOURCES = `
  query GetSources {
    sources {
-      nodes { id name lang displayName iconUrl isNsfw }
+      nodes {
+        id name lang displayName iconUrl isNsfw
+        isConfigurable supportsLatest baseUrl
+      }
    }
  }
 `;
@@ -3,3 +3,5 @@ export * from "./chapters";
 export * from "./downloads";
 export * from "./extensions";
 export * from "./tracking";
+export * from "./updater";
+export * from "./meta";
@@ -2,10 +2,15 @@ export const GET_LIBRARY = `
  query GetLibrary {
    mangas(condition: { inLibrary: true }) {
      nodes {
-        id title thumbnailUrl inLibrary downloadCount unreadCount
+        id title thumbnailUrl inLibrary downloadCount unreadCount bookmarkCount
        description status author artist genre
+        inLibraryAt lastFetchedAt chaptersLastFetchedAt thumbnailUrlLastFetched
        source { id name displayName }
        chapters { totalCount }
+        latestFetchedChapter { id uploadDate }
+        latestUploadedChapter { id uploadDate }
+        lastReadChapter { id chapterNumber }
+        firstUnreadChapter { id chapterNumber }
      }
    }
  }
@@ -23,7 +28,11 @@ export const GET_MANGA = `
  query GetManga($id: Int!) {
    manga(id: $id) {
      id title description thumbnailUrl status author artist genre inLibrary realUrl
+      inLibraryAt lastFetchedAt thumbnailUrlLastFetched updateStrategy
      source { id name displayName }
+      lastReadChapter { id chapterNumber lastPageRead }
+      firstUnreadChapter { id chapterNumber }
+      highestNumberedChapter { id chapterNumber }
    }
  }
 `;
@@ -58,7 +67,9 @@ export const GET_DOWNLOADS_PATH = `
 export const LIBRARY_UPDATE_STATUS = `
  query LibraryUpdateStatus {
    libraryUpdateStatus {
-      jobsInfo { isRunning finishedJobs totalJobs skippedMangasCount }
+      jobsInfo {
+        isRunning finishedJobs totalJobs skippedMangasCount skippedCategoriesCount
+      }
      mangaUpdates {
        status
        manga { id title thumbnailUrl unreadCount }
@@ -0,0 +1,15 @@
+export const GET_META = `
+  query GetMeta($key: String!) {
+    meta(key: $key) {
+      key value
+    }
+  }
+`;
+
+export const GET_METAS = `
+  query GetMetas {
+    metas {
+      nodes { key value }
+    }
+  }
+`;
@@ -2,170 +2,116 @@

 ## Manga (`queries/manga.ts`)

-### `GET_LIBRARY`
-Fetches all manga marked as in-library, including metadata, source info, chapter count, download count, and unread count.
-
-**Variables:** none
-
---
-
-### `GET_ALL_MANGA`
-Fetches all manga (library and non-library) with minimal fields.
-
-**Variables:** none
-
---
-
-### `GET_MANGA`
-Fetches a single manga by ID with full metadata and source info.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `Int!` | Manga ID |
-
---
-
-### `GET_CATEGORIES`
-Fetches all categories with their order, settings, and the manga assigned to each.
-
-**Variables:** none
-
---
-
-### `GET_DOWNLOADED_CHAPTERS_PAGES`
-Fetches page counts for all downloaded chapters.
-
-**Variables:** none
-
---
-
-### `GET_DOWNLOADS_PATH`
-Fetches the configured downloads path and local source path from settings.
-
-**Variables:** none
-
---
-
-### `LIBRARY_UPDATE_STATUS`
-Fetches the current library update job status, including progress and any manga with new chapters.
-
-**Variables:** none
-
---
-
-### `GET_RESTORE_STATUS`
-Fetches the status of a backup restore operation by its job ID.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `id` | `String!` | Restore job ID |
-
---
-
-### `VALIDATE_BACKUP`
-Validates a backup file and returns any missing sources or trackers.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `backup` | `Upload!` | Backup file |
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_LIBRARY` | — | All in-library manga with metadata, source, chapter counts, download count, unread count, bookmark count, and read progress anchors (`lastReadChapter`, `firstUnreadChapter`) |
+| `GET_ALL_MANGA` | — | Minimal manga list — id, title, thumbnail, library flag, download count |
+| `GET_MANGA` | `id: Int!` | Full detail for a single manga — includes `updateStrategy`, `lastReadChapter`, `firstUnreadChapter`, `highestNumberedChapter` |
+| `GET_CATEGORIES` | — | All categories with order/settings and their assigned manga (minimal fields) |
+| `GET_DOWNLOADED_CHAPTERS_PAGES` | — | Page counts for all downloaded chapters — used for storage stats |
+| `GET_DOWNLOADS_PATH` | — | `downloadsPath` and `localSourcePath` from settings |
+| `LIBRARY_UPDATE_STATUS` | — | Current library update job — `jobsInfo` progress and `mangaUpdates` list with new chapters |
+| `GET_RESTORE_STATUS` | `id: String!` | Backup restore job status by job ID — `mangaProgress`, `state`, `totalManga` |
+| `VALIDATE_BACKUP` | `backup: Upload!` | Validate a backup file before restore — returns missing sources and trackers |
+| `MANGAS_BY_GENRE` | `filter: MangaFilterInput`, `first: Int`, `offset: Int` | Paginated manga filtered by genre, ordered by `IN_LIBRARY_AT DESC` |

 ---

 ## Chapters (`queries/chapters.ts`)

-### `GET_CHAPTERS`
-Fetches all chapters for a given manga, including read/download/bookmark state and page info.
-
-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `mangaId` | `Int!` | Manga ID |
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_RECENTLY_UPDATED` | — | Latest 300 chapters ordered by `FETCHED_AT DESC` with parent manga info |
+| `GET_CHAPTERS` | `mangaId: Int!` | All chapters for a manga — includes `lastReadAt`, `lastPageRead`, read/download/bookmark state, page count, scanlator |

 ---

 ## Downloads (`queries/downloads.ts`)

-### `GET_DOWNLOAD_STATUS`
-Fetches the current downloader state and full queue with chapter and manga info.
-
-**Variables:** none
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_DOWNLOAD_STATUS` | — | Downloader state (`DownloaderState` enum) and full queue with chapter and manga info |

 ---

 ## Extensions (`queries/extensions.ts`)

-### `GET_EXTENSIONS`
-Fetches all extensions with install status, update availability, and metadata.
-
-**Variables:** none
-
---
-
-### `GET_SOURCES`
-Fetches all available sources with language and NSFW flags.
-
-**Variables:** none
-
---
-
-### `GET_SETTINGS`
-Fetches extension repository settings.
-
-**Variables:** none
-
---
-
-### `GET_SERVER_SECURITY`
-Fetches all server security settings including auth mode, SOCKS proxy config, and FlareSolverr config.
-
-**Variables:** none
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_LOCAL_MANGA` | — | Manga from the local source (`sourceId: "0"`) |
+| `GET_EXTENSIONS` | — | All extensions — install status, update flag, obsolete flag, metadata |
+| `GET_SOURCES` | — | All sources — id, name, lang, display name, icon, NSFW flag, `isConfigurable`, `supportsLatest`, `baseUrl` |
+| `GET_SETTINGS` | — | `extensionRepos` from settings |
+| `GET_SERVER_SECURITY` | — | Full security config — auth mode, SOCKS proxy settings, FlareSolverr settings |

 ---

 ## Tracking (`queries/tracking.ts`)

-### `GET_TRACKERS`
-Fetches all trackers with login status, supported scores, statuses, and auth info.
-
-**Variables:** none
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_TRACKERS` | — | All trackers with login state, token expiry, capability flags (`supportsPrivateTracking`, `supportsReadingDates`, `supportsTrackDeletion`), scores, and statuses |
+| `GET_MANGA_TRACK_RECORDS` | `mangaId: Int!` | All track records for a specific manga — includes `libraryId`, score, dates, privacy flag |
+| `SEARCH_TRACKER` | `trackerId: Int!`, `query: String!` | Search a tracker by query string — returns id, title, cover, summary, publishing info |
+| `GET_ALL_TRACKER_RECORDS` | — | All trackers and their full record lists with associated manga — includes `isTokenExpired`, `libraryId` |
+| `GET_TRACKER_RECORDS` | `trackerId: Int!` | Records for a specific tracker with associated manga |

 ---

-### `GET_MANGA_TRACK_RECORDS`
-Fetches all tracking records for a specific manga across all trackers.
+## Updater (`queries/updater.ts`)

-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `mangaId` | `Int!` | Manga ID |
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_ABOUT_SERVER` | — | Server name, version, build type, build time, GitHub and Discord links |
+| `GET_ABOUT_WEBUI` | — | WebUI channel, tag, and last update timestamp |
+| `CHECK_FOR_SERVER_UPDATES` | — | Available server updates — channel, tag, download URL |
+| `CHECK_FOR_WEBUI_UPDATE` | — | Available WebUI updates — channel and tag |
+| `GET_WEBUI_UPDATE_STATUS` | — | Live WebUI update state (`UpdateState` enum), progress percent, and info block |

 ---

-### `SEARCH_TRACKER`
-Searches a tracker for manga by query string.
+## Meta (`queries/meta.ts`)

-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `trackerId` | `Int!` | Tracker ID |
-| `query` | `String!` | Search query |
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_META` | `key: String!` | Single server-side key/value meta entry |
+| `GET_METAS` | — | All global meta entries as a node list |

 ---

-### `GET_ALL_TRACKER_RECORDS`
-Fetches all trackers and their full track records, including associated manga info.
+## KoSync (`queries/kosync.ts`)

-**Variables:** none
+| Query | Variables | Description |
+|-------|-----------|-------------|
+| `GET_KOSYNC_STATUS` | — | KOReader sync connection status |

 ---

-### `GET_TRACKER_RECORDS`
-Fetches track records for a specific tracker.
+## New in Preview

-**Variables:**
-| Name | Type | Description |
-|------|------|-------------|
-| `trackerId` | `Int!` | Tracker ID |
+Queries and fields now available but not yet wired to any feature in Moku:
+
+| Query / Field | Potential Feature |
+|---------------|-------------------|
+| `GET_ABOUT_SERVER` | About page — server version, build info, links to GitHub and Discord |
+| `GET_ABOUT_WEBUI` | About page — WebUI version and release channel |
+| `CHECK_FOR_SERVER_UPDATES` | Update available banner or settings badge |
+| `CHECK_FOR_WEBUI_UPDATE` | Update available banner or settings badge |
+| `GET_WEBUI_UPDATE_STATUS` | Update progress indicator in settings |
+| `GET_META` / `GET_METAS` | Server-side persistence — sync app state across clients without local storage |
+| `GET_KOSYNC_STATUS` | KOReader sync settings section — show connection state |
+| `trackRecords` (top-level) | Flat tracker record browser — filter by score, privacy, tracker |
+| `category` (single by id) | Direct category detail without fetching all categories |
+| `chapter` (single by id) | Direct chapter lookup without fetching full manga chapter list |
+| `source` (single by id) | Source detail page — preferences, filters, browse |
+| `tracker` (single by id) | Individual tracker detail — statuses, records |
+| `trackRecord` (single by id) | Direct track record lookup for deep linking |
+| `lastUpdateTimestamp` | Stale data detection — poll before refetching library |
+| `MangaType.hasDuplicateChapters` | Library health view — flag manga with duplicate chapter numbers |
+| `MangaType.age` / `chaptersAge` | Stale manga indicator — highlight series with no updates in N days |
+| `MangaType.initialized` | Loading skeleton gating — skip detail render until manga is fully fetched |
+| `SourceType.isConfigurable` | Source list — show gear icon only when source is configurable |
+| `SourceType.supportsLatest` | Source browse UI — conditionally show Latest tab |
+| `TrackerType.supportsTrackDeletion` | Tracking panel — show remove button only when tracker supports it |
+| `TrackerType.supportsReadingDates` | Tracking panel — show date fields only when tracker supports them |
+| `TrackerType.isTokenExpired` | Re-auth prompt — detect expired tokens before a request fails |
@@ -2,7 +2,9 @@ export const GET_TRACKERS = `
  query GetTrackers {
    trackers {
      nodes {
-        id name icon isLoggedIn authUrl supportsPrivateTracking scores
+        id name icon isLoggedIn isTokenExpired authUrl
+        supportsPrivateTracking supportsReadingDates supportsTrackDeletion
+        scores
        statuses { value name }
      }
    }
@@ -15,7 +17,7 @@ export const GET_MANGA_TRACK_RECORDS = `
      trackRecords {
        nodes {
          id trackerId remoteId title status score displayScore
-          lastChapterRead totalChapters remoteUrl startDate finishDate private
+          lastChapterRead totalChapters remoteUrl startDate finishDate private libraryId
        }
      }
    }
@@ -37,12 +39,12 @@ export const GET_ALL_TRACKER_RECORDS = `
  query GetAllTrackerRecords {
    trackers {
      nodes {
-        id name icon isLoggedIn scores
+        id name icon isLoggedIn isTokenExpired scores
        statuses { value name }
        trackRecords {
          nodes {
            id trackerId title status displayScore lastChapterRead
-            totalChapters remoteUrl private
+            totalChapters remoteUrl private libraryId
            manga { id title thumbnailUrl inLibrary }
          }
        }
@@ -0,0 +1,23 @@
+export const GET_ABOUT_SERVER = `
+  query GetAboutServer {
+    aboutServer {
+      name version buildType buildTime github discord
+    }
+  }
+`;
+
+export const GET_ABOUT_WEBUI = `
+  query GetAboutWebUI {
+    aboutWebUI {
+      channel tag updateTimestamp
+    }
+  }
+`;
+
+export const CHECK_FOR_SERVER_UPDATES = `
+  query CheckForServerUpdates {
+    checkForServerUpdates {
+      channel tag url
+    }
+  }
+`;
@@ -1,50 +1,5 @@
-import type { Manga, Source } from "@types";
-import type { Settings }      from "@types";
-import { shouldHideSource }   from "@core/util";
+export { shouldHideNsfw, shouldHideSource, dedupeSourcesByLang } from "@core/util";

-// ── Source deduplication ──────────────────────────────────────────────────────
-
-/**
- * Deduplicates sources by name, preferring `preferredLang` when multiple
- * sources share a name. The local source (id "0") is always excluded.
- *
- * When `applyHide` is true, sources that fail the NSFW/block check are
- * also removed — used in fan-out and cache-build paths where only
- * user-visible sources should be queried.
- */
-export function dedupeSourcesByLang(
-  sources:      Source[],
-  preferredLang: string,
-  settings:     Pick<Settings, "showNsfw" | "nsfwAllowedSourceIds" | "nsfwBlockedSourceIds">,
-  applyHide     = false,
-): Source[] {
-  const map = new Map<string, Source>();
-  for (const s of sources) {
-    if (s.id === "0") continue;
-    if (applyHide && shouldHideSource(s, settings)) continue;
-    const existing = map.get(s.name);
-    if (!existing) { map.set(s.name, s); continue; }
-    const existingPref = existing.lang === preferredLang;
-    const newPref      = s.lang === preferredLang;
-    if (newPref && !existingPref) map.set(s.name, s);
-    else if (!existingPref && !newPref && s.lang < existing.lang) map.set(s.name, s);
-  }
-  return Array.from(map.values());
-}
-
-// ── Manga predicate filters ───────────────────────────────────────────────────
-
-/**
- * Generic predicate pipeline — composes multiple boolean predicates into one.
- * All predicates must return true for an item to pass.
- *
- * Usage:
- *   const keep = buildFilter<Manga>(
- *     m => !shouldHideNsfw(m, settings),
- *     m => m.inLibrary,
- *   );
- *   const filtered = items.filter(keep);
- */
 export function buildFilter<T>(...predicates: ((item: T) => boolean)[]): (item: T) => boolean {
  return (item) => predicates.every((p) => p(item));
 }
@@ -1,10 +1,29 @@
 import { store, updateSettings } from "@store/state.svelte";

-export type AuthMode = "NONE" | "BASIC_AUTH" | "SIMPLE_LOGIN" | "UI_LOGIN";
+export type AuthMode = "NONE" | "BASIC_AUTH" | "UI_LOGIN";
+
+export class AuthRequiredError extends Error {
+  constructor(msg = "Authentication required") {
+    super(msg);
+    this.name = "AuthRequiredError";
+  }
+}
+
+let _accessToken: string | null = null;
+
+export const uiAuth = {
+  getToken:   () => _accessToken,
+  setToken:   (t: string) => { _accessToken = t; },
+  clearToken: () => { _accessToken = null; },
+};

 export const authSession = {
-  clearTokens() {},
-  hasSession(): boolean { return true; },
+  clearTokens() { uiAuth.clearToken(); },
+  hasSession(): boolean {
+    const mode = store.settings.serverAuthMode ?? "NONE";
+    if (mode === "UI_LOGIN") return _accessToken !== null;
+    return true;
+  },
 };

 function getServerBase(): string {
@@ -22,24 +41,72 @@ function basicHeader(user: string, pass: string): Record<string, string> {
  return { Authorization: `Basic ${btoa(`${user}:${pass}`)}` };
 }

-export function fetchAuthenticated(url: string, init: RequestInit, signal?: AbortSignal): Promise<Response> {
+function bearerHeader(token: string): Record<string, string> {
+  return { Authorization: `Bearer ${token}` };
+}
+
+function gqlBody(query: string, variables?: Record<string, unknown>): string {
+  return JSON.stringify({ query, ...(variables ? { variables } : {}) });
+}
+
+export async function fetchAuthenticated(
+  url: string,
+  init: RequestInit,
+  signal?: AbortSignal,
+  skipped = false,
+): Promise<Response> {
  const mode        = store.settings.serverAuthMode ?? "NONE";
+  const baseHeaders = (init.headers ?? {}) as Record<string, string>;
+
  if (mode === "BASIC_AUTH") {
    const user = store.settings.serverAuthUser?.trim() ?? "";
    const pass = store.settings.serverAuthPass?.trim() ?? "";
    return fetch(url, {
      ...init, signal, credentials: "omit",
-      headers: { ...(init.headers as Record<string, string> ?? {}), ...(user && pass ? basicHeader(user, pass) : {}) },
+      headers: { ...baseHeaders, ...(user && pass ? basicHeader(user, pass) : {}) },
    });
  }
+
+  if (mode === "UI_LOGIN") {
+    const token = uiAuth.getToken();
+    if (!token) {
+      if (skipped) return fetch(url, { ...init, signal, credentials: "omit", headers: baseHeaders });
+      throw new AuthRequiredError();
+    }
+    return fetch(url, {
+      ...init, signal, credentials: "omit",
+      headers: { ...baseHeaders, ...bearerHeader(token) },
+    });
+  }
+
  return fetch(url, { ...init, signal, credentials: "omit" });
 }

+export async function loginUI(user: string, pass: string): Promise<void> {
+  const res = await fetch(`${getServerBase()}/api/graphql`, {
+    method: "POST", credentials: "omit",
+    headers: { "Content-Type": "application/json" },
+    body: gqlBody(
+      `mutation Login($username: String!, $password: String!) {
+         login(input: { username: $username, password: $password }) { accessToken }
+       }`,
+      { username: user, password: pass },
+    ),
+    signal: timeoutSignal(8000),
+  });
+  if (!res.ok) throw new Error(`Login request failed (${res.status})`);
+  const json = await res.json();
+  const token: string | undefined = json?.data?.login?.accessToken;
+  if (!token) throw new Error(json?.errors?.[0]?.message ?? "Login failed");
+  uiAuth.setToken(token);
+  updateSettings({ serverAuthMode: "UI_LOGIN" });
+}
+
 export async function loginBasic(user: string, pass: string): Promise<void> {
  const res = await fetch(`${getServerBase()}/api/graphql`, {
    method: "POST", credentials: "omit",
    headers: { "Content-Type": "application/json", ...basicHeader(user, pass) },
-    body: JSON.stringify({ query: "{ __typename }" }),
+    body: gqlBody("{ __typename }"),
    signal: timeoutSignal(5000),
  });
  if (!res.ok) throw new Error(`Authentication failed (${res.status})`);
@@ -47,39 +114,37 @@ export async function loginBasic(user: string, pass: string): Promise<void> {
 }

 export async function logout(): Promise<void> {
-  updateSettings({ serverAuthPass: "" });
+  uiAuth.clearToken();
+  updateSettings({ serverAuthPass: "", serverAuthMode: "NONE" });
 }

-export async function probeServer(): Promise<"ok" | "auth_required" | "unsupported_mode" | "unreachable"> {
+export async function probeServer(): Promise<"ok" | "auth_required" | "unreachable"> {
  const base = getServerBase();
  const mode = store.settings.serverAuthMode ?? "NONE";
  const s    = store.settings;
+
+  if (mode === "UI_LOGIN" && !_accessToken) return "auth_required";
+
  try {
    const headers: Record<string, string> = { "Content-Type": "application/json" };
    if (mode === "BASIC_AUTH") {
      const user = s.serverAuthUser?.trim() ?? "";
      const pass = s.serverAuthPass?.trim() ?? "";
      if (user && pass) Object.assign(headers, basicHeader(user, pass));
+    } else if (mode === "UI_LOGIN" && _accessToken) {
+      Object.assign(headers, bearerHeader(_accessToken));
    }
+
    const res = await fetch(`${base}/api/graphql`, {
      method: "POST", credentials: "omit", headers,
-      body: JSON.stringify({ query: "{ __typename }" }),
+      body: gqlBody("{ __typename }"),
      signal: timeoutSignal(5000),
    });
+
    if (res.ok) return "ok";
-    if (res.status === 401) {
-      const wwwAuth = res.headers.get("WWW-Authenticate") ?? "";
-      if (/basic/i.test(wwwAuth)) {
-        if (mode !== "BASIC_AUTH") updateSettings({ serverAuthMode: "BASIC_AUTH" });
-        return "auth_required";
-      }
-      if (/bearer/i.test(wwwAuth)) {
-        if (mode !== "UI_LOGIN") updateSettings({ serverAuthMode: "UI_LOGIN" });
-      } else if (mode === "NONE") {
-        updateSettings({ serverAuthMode: "SIMPLE_LOGIN" });
-      }
-      return "unsupported_mode";
-    }
+    if (res.status === 401) return "auth_required";
    return "unreachable";
-  } catch { return "unreachable"; }
+  } catch {
+    return "unreachable";
+  }
 }
@@ -1,38 +1,256 @@
 import { invoke } from "@tauri-apps/api/core";
+import {
+  persistSettings,
+  persistLibrary,
+  persistUpdates,
+} from "@core/persistence/persist";

-function collectAppData(): Record<string, string> {
-  const data: Record<string, string> = {};
-  for (let i = 0; i < localStorage.length; i++) {
-    const key = localStorage.key(i);
-    if (key !== null) data[key] = localStorage.getItem(key) ?? "";
-  }
-  return data;
-}
-
-function applyAppData(data: Record<string, string>): void {
-  localStorage.clear();
-  for (const [key, value] of Object.entries(data)) {
-    localStorage.setItem(key, value);
-  }
-}
+const STORE_FILES = ["settings.json", "library.json", "updates.json"] as const;

 export async function exportAppData(): Promise<void> {
-  const json = JSON.stringify(collectAppData(), null, 2);
-  await invoke("export_app_data", { json });
+  const entries: [string, string][] = await invoke("read_store_files", {
+    names: [...STORE_FILES],
+  });
+
+  const zip = buildZip(
+    entries.map(([name, content]) => ({
+      name,
+      bytes: new TextEncoder().encode(content),
+    }))
+  );
+
+  await invoke("export_app_data", { bytes: Array.from(zip) });
 }

 export async function importAppData(): Promise<void> {
-  const json = await invoke<string>("import_app_data");
-  const data: Record<string, string> = JSON.parse(json);
-  applyAppData(data);
-  location.reload();
+  const raw: number[] = await invoke("import_app_data");
+  const files = parseZip(new Uint8Array(raw));
+
+  const decode = (name: string) => {
+    const bytes = files.get(name);
+    if (!bytes) throw new Error(`Backup is missing ${name}`);
+    return JSON.parse(new TextDecoder().decode(bytes));
+  };
+
+  const s = decode("settings.json");
+  const l = decode("library.json");
+  const u = decode("updates.json");
+
+  await Promise.all([
+    persistSettings({
+      settings:     s.settings     ?? null,
+      storeVersion: s.storeVersion ?? 1,
+    }),
+    persistLibrary({
+      history:         l.history         ?? [],
+      bookmarks:       l.bookmarks       ?? [],
+      markers:         l.markers         ?? [],
+      readLog:         l.readLog         ?? [],
+      readingStats:    l.readingStats    ?? null,
+      dailyReadCounts: l.dailyReadCounts ?? {},
+    }),
+    persistUpdates({
+      libraryUpdates:        u.libraryUpdates        ?? [],
+      lastLibraryRefresh:    u.lastLibraryRefresh    ?? 0,
+      acknowledgedUpdateIds: u.acknowledgedUpdateIds ?? [],
+    }),
+  ]);
+
+  await showExitModal();
+  invoke("exit_app");
+}
+
+function showExitModal(): Promise<void> {
+  return new Promise(resolve => {
+    const backdrop = document.createElement("div");
+    backdrop.className = "s-backdrop";
+    backdrop.style.cssText = "z-index:99999";
+
+    const modal = document.createElement("div");
+    modal.style.cssText = [
+      "background:var(--bg-surface)",
+      "border:1px solid var(--border-base)",
+      "border-radius:var(--radius-2xl)",
+      "box-shadow:0 0 0 1px rgba(255,255,255,0.04) inset,0 24px 80px rgba(0,0,0,0.7),0 8px 24px rgba(0,0,0,0.4)",
+      "width:min(400px,calc(100vw - 40px))",
+      "display:flex",
+      "flex-direction:column",
+      "overflow:hidden",
+      "animation:s-scale-in 0.2s cubic-bezier(0.16,1,0.3,1) both",
+    ].join(";");
+
+    const header = document.createElement("div");
+    header.style.cssText = "padding:var(--sp-4) var(--sp-5) var(--sp-3);border-bottom:1px solid var(--border-dim)";
+
+    const title = document.createElement("p");
+    title.style.cssText = "margin:0;font-size:var(--text-sm);font-weight:var(--weight-medium);color:var(--text-primary);letter-spacing:0.01em";
+    title.textContent = "Import complete";
+    header.appendChild(title);
+
+    const body = document.createElement("div");
+    body.style.cssText = "padding:var(--sp-4) var(--sp-5);display:flex;flex-direction:column;gap:var(--sp-2)";
+
+    const sub = document.createElement("p");
+    sub.style.cssText = "margin:0;font-family:var(--font-ui);font-size:var(--text-xs);color:var(--text-faint);letter-spacing:var(--tracking-wide);line-height:var(--leading-snug)";
+    sub.textContent = "Your settings have been restored. Moku will close so you can relaunch with the imported data.";
+
+    const counter = document.createElement("p");
+    counter.style.cssText = "margin:0;font-family:var(--font-ui);font-size:var(--text-xs);color:var(--text-faint);letter-spacing:var(--tracking-wide)";
+    counter.textContent = "Closing in 3…";
+
+    body.append(sub, counter);
+
+    const footer = document.createElement("div");
+    footer.style.cssText = "padding:var(--sp-3) var(--sp-5);border-top:1px solid var(--border-dim);display:flex;justify-content:flex-end";
+
+    const btn = document.createElement("button");
+    btn.className = "s-btn s-btn-danger";
+    btn.textContent = "Close now";
+
+    footer.appendChild(btn);
+    modal.append(header, body, footer);
+    backdrop.appendChild(modal);
+    document.body.appendChild(backdrop);
+
+    let secs = 3;
+    const tick = setInterval(() => {
+      secs--;
+      counter.textContent = secs > 0 ? `Closing in ${secs}…` : "Closing…";
+      if (secs <= 0) { clearInterval(tick); backdrop.remove(); resolve(); }
+    }, 1000);
+
+    btn.addEventListener("click", () => { clearInterval(tick); backdrop.remove(); resolve(); });
+  });
 }

 export async function autoBackupAppData(): Promise<void> {
  try {
-    const json = JSON.stringify(collectAppData());
-    await invoke("auto_backup_app_data", { json });
+    const entries: [string, string][] = await invoke("read_store_files", {
+      names: [...STORE_FILES],
+    });
+    const zip = buildZip(
+      entries.map(([name, content]) => ({
+        name,
+        bytes: new TextEncoder().encode(content),
+      }))
+    );
+    await invoke("auto_backup_app_data", { bytes: Array.from(zip) });
  } catch (e) {
    console.warn("[moku] auto-backup failed:", e);
  }
 }
+
+function crc32(data: Uint8Array): number {
+  let crc = 0xffffffff;
+  for (const byte of data) {
+    crc ^= byte;
+    for (let j = 0; j < 8; j++) {
+      crc = crc & 1 ? (crc >>> 1) ^ 0xedb88320 : crc >>> 1;
+    }
+  }
+  return (crc ^ 0xffffffff) >>> 0;
+}
+
+function localHeader(name: Uint8Array, data: Uint8Array): Uint8Array {
+  const buf = new ArrayBuffer(30 + name.byteLength);
+  const v   = new DataView(buf);
+  v.setUint32(0,  0x04034b50,      true);
+  v.setUint16(4,  20,              true);
+  v.setUint16(6,  0,               true);
+  v.setUint16(8,  0,               true);
+  v.setUint16(10, 0,               true);
+  v.setUint16(12, 0,               true);
+  v.setUint32(14, crc32(data),     true);
+  v.setUint32(18, data.byteLength, true);
+  v.setUint32(22, data.byteLength, true);
+  v.setUint16(26, name.byteLength, true);
+  v.setUint16(28, 0,               true);
+  new Uint8Array(buf).set(name, 30);
+  return new Uint8Array(buf);
+}
+
+function centralHeader(name: Uint8Array, data: Uint8Array, offset: number): Uint8Array {
+  const buf = new ArrayBuffer(46 + name.byteLength);
+  const v   = new DataView(buf);
+  v.setUint32(0,  0x02014b50,      true);
+  v.setUint16(4,  20,              true);
+  v.setUint16(6,  20,              true);
+  v.setUint16(8,  0,               true);
+  v.setUint16(10, 0,               true);
+  v.setUint16(12, 0,               true);
+  v.setUint16(14, 0,               true);
+  v.setUint32(16, crc32(data),     true);
+  v.setUint32(20, data.byteLength, true);
+  v.setUint32(24, data.byteLength, true);
+  v.setUint16(28, name.byteLength, true);
+  v.setUint16(30, 0,               true);
+  v.setUint16(32, 0,               true);
+  v.setUint16(34, 0,               true);
+  v.setUint16(36, 0,               true);
+  v.setUint32(38, 0,               true);
+  v.setUint32(42, offset,          true);
+  new Uint8Array(buf).set(name, 46);
+  return new Uint8Array(buf);
+}
+
+function eocd(count: number, cdSize: number, cdOffset: number): Uint8Array {
+  const buf = new ArrayBuffer(22);
+  const v   = new DataView(buf);
+  v.setUint32(0,  0x06054b50, true);
+  v.setUint16(4,  0,          true);
+  v.setUint16(6,  0,          true);
+  v.setUint16(8,  count,      true);
+  v.setUint16(10, count,      true);
+  v.setUint32(12, cdSize,     true);
+  v.setUint32(16, cdOffset,   true);
+  v.setUint16(20, 0,          true);
+  return new Uint8Array(buf);
+}
+
+function buildZip(files: { name: string; bytes: Uint8Array }[]): Uint8Array {
+  const enc     = new TextEncoder();
+  const parts:   Uint8Array[] = [];
+  const offsets: number[]     = [];
+  let pos = 0;
+
+  for (const { name, bytes } of files) {
+    const nameBytes = enc.encode(name);
+    const lh        = localHeader(nameBytes, bytes);
+    offsets.push(pos);
+    parts.push(lh, bytes);
+    pos += lh.byteLength + bytes.byteLength;
+  }
+
+  const cdParts = files.map(({ name, bytes }, i) =>
+    centralHeader(enc.encode(name), bytes, offsets[i])
+  );
+  const cd = concat(cdParts);
+
+  return concat([...parts, cd, eocd(files.length, cd.byteLength, pos)]);
+}
+
+function parseZip(data: Uint8Array): Map<string, Uint8Array> {
+  const view  = new DataView(data.buffer, data.byteOffset, data.byteLength);
+  const files = new Map<string, Uint8Array>();
+  let pos     = 0;
+
+  while (pos + 30 <= data.byteLength && view.getUint32(pos, true) === 0x04034b50) {
+    const fnLen = view.getUint16(pos + 26, true);
+    const exLen = view.getUint16(pos + 28, true);
+    const cSize = view.getUint32(pos + 18, true);
+    const name  = new TextDecoder().decode(data.subarray(pos + 30, pos + 30 + fnLen));
+    const start = pos + 30 + fnLen + exLen;
+    files.set(name, data.subarray(start, start + cSize));
+    pos = start + cSize;
+  }
+
+  return files;
+}
+
+function concat(arrays: Uint8Array[]): Uint8Array {
+  const total = arrays.reduce((n, a) => n + a.byteLength, 0);
+  const out   = new Uint8Array(total);
+  let pos     = 0;
+  for (const a of arrays) { out.set(a, pos); pos += a.byteLength; }
+  return out;
+}
@@ -0,0 +1,27 @@
+import { store, linkManga } from "@store/state.svelte";
+import type { Manga } from "@types";
+
+export function autoLinkLibrary(focal: Manga, allManga: Manga[]): Promise<number> {
+  return new Promise((resolve) => {
+    const worker = new Worker(
+      new URL("./autoLinkWorker.ts", import.meta.url),
+      { type: "module" },
+    );
+
+    worker.onmessage = (e: MessageEvent<number[]>) => {
+      const matches = e.data;
+      for (const id of matches) linkManga(focal.id, id);
+      worker.terminate();
+      resolve(matches.length);
+    };
+
+    worker.onerror = () => { worker.terminate(); resolve(0); };
+
+    worker.postMessage({
+      focalTitle: focal.title,
+      focalId:    focal.id,
+      allManga:   allManga.map(m => ({ id: m.id, title: m.title })),
+      linkedIds:  store.settings.mangaLinks?.[focal.id] ?? [],
+    });
+  });
+}
@@ -0,0 +1,29 @@
+interface WorkerMsg {
+  focalTitle: string;
+  focalId: number;
+  allManga: { id: number; title: string }[];
+  linkedIds: number[];
+}
+
+function titleSimilarity(a: string, b: string): number {
+  const norm = (s: string) =>
+    s.toLowerCase().replace(/[^a-z0-9\s]/g, "").split(/\s+/).filter(Boolean);
+  const wa = new Set(norm(a));
+  const wb = new Set(norm(b));
+  if (!wa.size || !wb.size) return 0;
+  const intersection = [...wa].filter(w => wb.has(w)).length;
+  return intersection / new Set([...wa, ...wb]).size;
+}
+
+self.onmessage = (e: MessageEvent<WorkerMsg>) => {
+  const { focalTitle, focalId, allManga, linkedIds } = e.data;
+  const matches: number[] = [];
+
+  for (const m of allManga) {
+    if (m.id === focalId) continue;
+    if (linkedIds.includes(m.id)) continue;
+    if (titleSimilarity(focalTitle, m.title) >= 0.65) matches.push(m.id);
+  }
+
+  self.postMessage(matches);
+};
@@ -0,0 +1,54 @@
+const THUMB_SIZE  = 16;
+const DUPE_THRESH = 0.12;
+
+const hashCache = new Map<string, Uint8ClampedArray>();
+
+function toGray(data: Uint8ClampedArray, pixels: number): Uint8ClampedArray {
+  const gray = new Uint8ClampedArray(pixels);
+  for (let i = 0; i < pixels; i++) {
+    const o = i * 4;
+    gray[i] = (data[o] * 299 + data[o + 1] * 587 + data[o + 2] * 114) / 1000;
+  }
+  return gray;
+}
+
+function loadThumb(url: string): Promise<Uint8ClampedArray> {
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    img.crossOrigin = "anonymous";
+    img.onload = () => {
+      const canvas = document.createElement("canvas");
+      canvas.width = canvas.height = THUMB_SIZE;
+      const ctx = canvas.getContext("2d")!;
+      ctx.drawImage(img, 0, 0, THUMB_SIZE, THUMB_SIZE);
+      resolve(toGray(ctx.getImageData(0, 0, THUMB_SIZE, THUMB_SIZE).data, THUMB_SIZE * THUMB_SIZE));
+    };
+    img.onerror = reject;
+    img.src = url;
+  });
+}
+
+function similarity(a: Uint8ClampedArray, b: Uint8ClampedArray): number {
+  let diff = 0;
+  for (let i = 0; i < a.length; i++) diff += Math.abs(a[i] - b[i]);
+  return diff / (a.length * 255);
+}
+
+export async function getHash(url: string): Promise<Uint8ClampedArray | null> {
+  if (hashCache.has(url)) return hashCache.get(url)!;
+  try {
+    const thumb = await loadThumb(url);
+    hashCache.set(url, thumb);
+    return thumb;
+  } catch {
+    return null;
+  }
+}
+
+export function areDuplicates(a: Uint8ClampedArray, b: Uint8ClampedArray): boolean {
+  return similarity(a, b) <= DUPE_THRESH;
+}
+
+export function clearHashCache(): void {
+  hashCache.clear();
+}
@@ -0,0 +1,95 @@
+import { store }                    from "@store/state.svelte";
+import { searchWithScore }          from "@core/algorithms/search";
+import { getHash, areDuplicates }   from "@core/cover/coverHash";
+
+type CoverManga = { id: number; thumbnailUrl: string; source?: { displayName: string } | null };
+
+export type CoverCandidate = {
+  mangaId:  number;
+  url:      string;
+  label:    string;
+  isActive: boolean;
+};
+
+const FUZZY_SCORE_THRESHOLD = 0.65;
+
+function normalizeUrl(url: string): string {
+  try {
+    const u = new URL(url);
+    u.search = "";
+    return u.href.toLowerCase();
+  } catch {
+    return url.toLowerCase();
+  }
+}
+
+export function resolvedCover(mangaId: number, ownUrl: string): string {
+  return store.settings.mangaPrefs?.[mangaId]?.coverUrl ?? ownUrl;
+}
+
+function fuzzyMatchIds(
+  mangaId:  number,
+  title:    string,
+  mangaById: Map<number, CoverManga & { title: string }>,
+): number[] {
+  const results = searchWithScore(
+    [...mangaById.values()].filter(m => m.id !== mangaId),
+    title,
+    m => m.title,
+  );
+  return results
+    .filter(r => r.score >= FUZZY_SCORE_THRESHOLD)
+    .map(r => r.item.id);
+}
+
+export function coverCandidatesSync(
+  mangaId:   number,
+  title:     string,
+  ownUrl:    string,
+  mangaById: Map<number, CoverManga & { title: string }>,
+): CoverCandidate[] {
+  const linkedIds  = store.getLinkedMangaIds(mangaId);
+  const fuzzyIds   = fuzzyMatchIds(mangaId, title, mangaById);
+  const current    = store.settings.mangaPrefs?.[mangaId]?.coverUrl ?? ownUrl;
+
+  const allIds = Array.from(new Set([...linkedIds, ...fuzzyIds]));
+
+  const raw: { mangaId: number; url: string; label: string }[] = [
+    { mangaId, url: ownUrl, label: "This source" },
+    ...allIds.flatMap(id => {
+      const m = mangaById.get(id);
+      return m ? [{ mangaId: m.id, url: m.thumbnailUrl, label: m.source?.displayName ?? `ID ${m.id}` }] : [];
+    }),
+  ];
+
+  const seen = new Set<string>();
+  return raw
+    .filter(c => {
+      const key = normalizeUrl(c.url);
+      if (seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    })
+    .map(c => ({ ...c, isActive: normalizeUrl(c.url) === normalizeUrl(current) }));
+}
+
+export async function dedupeByImage(candidates: CoverCandidate[]): Promise<CoverCandidate[]> {
+  const hashes = await Promise.all(candidates.map(c => getHash(c.url)));
+
+  const groups: number[][] = [];
+
+  for (let i = 0; i < candidates.length; i++) {
+    const hi = hashes[i];
+    const existing = hi
+      ? groups.find(g => { const hj = hashes[g[0]]; return hj ? areDuplicates(hi, hj) : false; })
+      : undefined;
+    if (existing) existing.push(i);
+    else groups.push([i]);
+  }
+
+  return groups.map(group => {
+    const active = group.find(i => candidates[i].isActive) ?? group[0];
+    const labels = [...new Set(group.map(i => candidates[i].label))];
+    return { ...candidates[active], label: labels.join(" · ") };
+  });
+}
@@ -0,0 +1,4 @@
+export { getHash, areDuplicates, clearHashCache } from "./coverHash";
+export { resolvedCover, coverCandidatesSync, dedupeByImage } from "./coverResolver";
+export type { CoverCandidate } from "./coverResolver";
+export { autoLinkLibrary } from "./autoLink";
@@ -0,0 +1,88 @@
+const VAULT_KEY       = "moku-credential-vault";
+const SALT_ITERATIONS = 200_000;
+const KEY_USAGE: KeyUsage[] = ["encrypt", "decrypt"];
+
+export interface VaultPayload {
+  refreshToken?: string;
+  basicUser?:    string;
+  basicPass?:    string;
+  authMode:      "UI_LOGIN" | "BASIC_AUTH" | "NONE";
+}
+
+interface StoredVault {
+  salt: string;
+  iv:   string;
+  data: string;
+}
+
+function toB64(buf: ArrayBuffer): string {
+  return btoa(String.fromCharCode(...new Uint8Array(buf)));
+}
+
+function fromB64(s: string): Uint8Array {
+  return Uint8Array.from(atob(s), (c) => c.charCodeAt(0));
+}
+
+async function deriveKey(pin: string, salt: Uint8Array): Promise<CryptoKey> {
+  const enc    = new TextEncoder();
+  const keyMat = await crypto.subtle.importKey("raw", enc.encode(pin), "PBKDF2", false, ["deriveKey"]);
+  return crypto.subtle.deriveKey(
+    { name: "PBKDF2", salt, iterations: SALT_ITERATIONS, hash: "SHA-256" },
+    keyMat,
+    { name: "AES-GCM", length: 256 },
+    false,
+    KEY_USAGE,
+  );
+}
+
+export function vaultExists(): boolean {
+  return !!localStorage.getItem(VAULT_KEY);
+}
+
+export async function lockVault(pin: string, payload: VaultPayload): Promise<void> {
+  const salt = crypto.getRandomValues(new Uint8Array(16));
+  const iv   = crypto.getRandomValues(new Uint8Array(12));
+  const key  = await deriveKey(pin, salt);
+
+  const enc    = new TextEncoder();
+  const cipher = await crypto.subtle.encrypt(
+    { name: "AES-GCM", iv },
+    key,
+    enc.encode(JSON.stringify(payload)),
+  );
+
+  localStorage.setItem(VAULT_KEY, JSON.stringify({
+    salt: toB64(salt),
+    iv:   toB64(iv),
+    data: toB64(cipher),
+  } satisfies StoredVault));
+}
+
+export async function unlockVault(pin: string): Promise<VaultPayload | null> {
+  const raw = localStorage.getItem(VAULT_KEY);
+  if (!raw) return null;
+
+  try {
+    const stored = JSON.parse(raw) as StoredVault;
+    const key    = await deriveKey(pin, fromB64(stored.salt));
+    const plain  = await crypto.subtle.decrypt(
+      { name: "AES-GCM", iv: fromB64(stored.iv) },
+      key,
+      fromB64(stored.data),
+    );
+    return JSON.parse(new TextDecoder().decode(plain)) as VaultPayload;
+  } catch {
+    return null;
+  }
+}
+
+export function clearVault(): void {
+  localStorage.removeItem(VAULT_KEY);
+}
+
+export async function rekeyVault(oldPin: string, newPin: string): Promise<boolean> {
+  const payload = await unlockVault(oldPin);
+  if (!payload) return false;
+  await lockVault(newPin, payload);
+  return true;
+}
@@ -0,0 +1,5 @@
+export { loadAllStores, persistSettings, persistLibrary, persistUpdates } from "./persist";
+export type { PersistedData } from "./persist";
+
+export { vaultExists, lockVault, unlockVault, clearVault, rekeyVault } from "./credentialVault";
+export type { VaultPayload } from "./credentialVault";
@@ -0,0 +1,166 @@
+import { LazyStore } from "@tauri-apps/plugin-store";
+
+const settingsStore = new LazyStore("settings.json", { autoSave: false });
+const libraryStore  = new LazyStore("library.json",  { autoSave: false });
+const updatesStore  = new LazyStore("updates.json",  { autoSave: false });
+const backupsStore  = new LazyStore("backups.json",  { autoSave: false });
+
+export interface PersistedData {
+  settings:             any;
+  storeVersion:         number | null;
+  history:              any[];
+  bookmarks:            any[];
+  markers:              any[];
+  readLog:              any[];
+  readingStats:         any | null;
+  dailyReadCounts:      Record<string, number>;
+  libraryUpdates:       any[];
+  lastLibraryRefresh:   number;
+  acknowledgedUpdateIds: number[];
+}
+
+export async function loadAllStores(): Promise<PersistedData> {
+  const migrated = await migrateFromLocalStorage();
+  if (migrated) return migrated;
+
+  const [sv, s, hist, bk, mk, rl, rs, dc, lu, llr, au] = await Promise.all([
+    settingsStore.get<number>("storeVersion"),
+    settingsStore.get<any>("settings"),
+    libraryStore.get<any[]>("history"),
+    libraryStore.get<any[]>("bookmarks"),
+    libraryStore.get<any[]>("markers"),
+    libraryStore.get<any[]>("readLog"),
+    libraryStore.get<any>("readingStats"),
+    libraryStore.get<Record<string, number>>("dailyReadCounts"),
+    updatesStore.get<any[]>("libraryUpdates"),
+    updatesStore.get<number>("lastLibraryRefresh"),
+    updatesStore.get<number[]>("acknowledgedUpdateIds"),
+  ]);
+
+  return {
+    storeVersion:          sv   ?? null,
+    settings:              s    ?? null,
+    history:               hist ?? [],
+    bookmarks:             bk   ?? [],
+    markers:               mk   ?? [],
+    readLog:               rl   ?? [],
+    readingStats:          rs   ?? null,
+    dailyReadCounts:       dc   ?? {},
+    libraryUpdates:        lu   ?? [],
+    lastLibraryRefresh:    llr  ?? 0,
+    acknowledgedUpdateIds: au   ?? [],
+  };
+}
+
+async function migrateFromLocalStorage(): Promise<PersistedData | null> {
+  try {
+    const raw = localStorage.getItem("moku-store");
+    if (!raw) return null;
+    const data = JSON.parse(raw);
+
+    await Promise.all([
+      persistSettings({ settings: data.settings ?? null, storeVersion: data.storeVersion ?? 1 }),
+      persistLibrary({
+        history:         data.history         ?? [],
+        bookmarks:       data.bookmarks       ?? [],
+        markers:         data.markers         ?? [],
+        readLog:         data.readLog         ?? [],
+        readingStats:    data.readingStats    ?? null,
+        dailyReadCounts: data.dailyReadCounts ?? {},
+      }),
+      persistUpdates({
+        libraryUpdates:        data.libraryUpdates        ?? [],
+        lastLibraryRefresh:    data.lastLibraryRefresh    ?? 0,
+        acknowledgedUpdateIds: data.acknowledgedUpdateIds ?? [],
+      }),
+    ]);
+
+    localStorage.removeItem("moku-store");
+
+    return {
+      storeVersion:          data.storeVersion          ?? null,
+      settings:              data.settings              ?? null,
+      history:               data.history               ?? [],
+      bookmarks:             data.bookmarks             ?? [],
+      markers:               data.markers               ?? [],
+      readLog:               data.readLog               ?? [],
+      readingStats:          data.readingStats          ?? null,
+      dailyReadCounts:       data.dailyReadCounts       ?? {},
+      libraryUpdates:        data.libraryUpdates        ?? [],
+      lastLibraryRefresh:    data.lastLibraryRefresh    ?? 0,
+      acknowledgedUpdateIds: data.acknowledgedUpdateIds ?? [],
+    };
+  } catch {
+    return null;
+  }
+}
+
+export async function persistSettings(data: { settings: any; storeVersion: number }) {
+  await Promise.all([
+    settingsStore.set("settings",     data.settings),
+    settingsStore.set("storeVersion", data.storeVersion),
+  ]);
+  await settingsStore.save();
+}
+
+export async function persistLibrary(data: {
+  history:         any[];
+  bookmarks:       any[];
+  markers:         any[];
+  readLog:         any[];
+  readingStats:    any;
+  dailyReadCounts: Record<string, number>;
+}) {
+  await Promise.all([
+    libraryStore.set("history",         data.history),
+    libraryStore.set("bookmarks",       data.bookmarks),
+    libraryStore.set("markers",         data.markers),
+    libraryStore.set("readLog",         data.readLog),
+    libraryStore.set("readingStats",    data.readingStats),
+    libraryStore.set("dailyReadCounts", data.dailyReadCounts),
+  ]);
+  await libraryStore.save();
+}
+
+export async function persistUpdates(data: {
+  libraryUpdates:        any[];
+  lastLibraryRefresh:    number;
+  acknowledgedUpdateIds: number[];
+}) {
+  await Promise.all([
+    updatesStore.set("libraryUpdates",        data.libraryUpdates),
+    updatesStore.set("lastLibraryRefresh",     data.lastLibraryRefresh),
+    updatesStore.set("acknowledgedUpdateIds",  data.acknowledgedUpdateIds),
+  ]);
+  await updatesStore.save();
+}
+
+export interface BackupEntry { url: string; name: string; }
+
+export async function loadBackups(): Promise<BackupEntry[]> {
+  const fromStore = await backupsStore.get<BackupEntry[]>("backupList");
+  if (fromStore) return fromStore;
+  try {
+    const raw = localStorage.getItem("moku_backups");
+    if (!raw) return [];
+    const migrated: BackupEntry[] = JSON.parse(raw);
+    await persistBackups(migrated);
+    localStorage.removeItem("moku_backups");
+    return migrated;
+  } catch { return []; }
+}
+
+export async function persistBackups(list: BackupEntry[]): Promise<void> {
+  await backupsStore.set("backupList", list);
+  await backupsStore.save();
+}
+
+export async function resetAuthSettings(): Promise<void> {
+  const current = await settingsStore.get<any>("settings") ?? {};
+  current.serverAuthMode = "NONE";
+  current.serverAuthUser = "";
+  current.serverAuthPass = "";
+  await settingsStore.set("settings", current);
+  await settingsStore.save();
+  localStorage.removeItem("moku-credential-vault");
+}
@@ -1,2 +1,3 @@
 export * from './idle';
 export * from './zoom';
+export * from './touchscreen';
@@ -0,0 +1,234 @@
+export interface LongPressOptions {
+  onLongPress: (e: PointerEvent) => void;
+  duration?:   number;
+  moveThreshold?: number;
+}
+
+export function longPress(node: HTMLElement, opts: LongPressOptions) {
+  const { onLongPress, duration = 500, moveThreshold = 8 } = opts;
+  let timer: ReturnType<typeof setTimeout> | null = null;
+  let startX = 0, startY = 0;
+  let fired = false;
+
+  function start(e: PointerEvent) {
+    if (e.button !== 0 && e.pointerType === "mouse") return;
+    startX = e.clientX; startY = e.clientY; fired = false;
+    timer = setTimeout(() => { timer = null; fired = true; onLongPress(e); }, duration);
+  }
+  function move(e: PointerEvent) {
+    if (!timer) return;
+    const dx = e.clientX - startX, dy = e.clientY - startY;
+    if (Math.sqrt(dx * dx + dy * dy) > moveThreshold) cancel();
+  }
+  function cancel() { if (timer) { clearTimeout(timer); timer = null; } }
+
+  node.addEventListener("pointerdown",  start);
+  node.addEventListener("pointermove",  move);
+  node.addEventListener("pointerup",    cancel);
+  node.addEventListener("pointerleave", cancel);
+  node.addEventListener("pointercancel",cancel);
+
+  return {
+    get fired() { return fired; },
+    destroy() {
+      cancel();
+      node.removeEventListener("pointerdown",  start);
+      node.removeEventListener("pointermove",  move);
+      node.removeEventListener("pointerup",    cancel);
+      node.removeEventListener("pointerleave", cancel);
+      node.removeEventListener("pointercancel",cancel);
+    },
+  };
+}
+
+export interface TapOptions {
+  onTap:       (e: PointerEvent) => void;
+  onDoubleTap?: (e: PointerEvent) => void;
+  doubleTapGap?: number;
+}
+
+export function tap(node: HTMLElement, opts: TapOptions) {
+  const { onTap, onDoubleTap, doubleTapGap = 300 } = opts;
+  let lastTap = 0;
+  let pending: ReturnType<typeof setTimeout> | null = null;
+  let startX = 0, startY = 0;
+  const SLOP = 8;
+
+  function down(e: PointerEvent) { startX = e.clientX; startY = e.clientY; }
+  function up(e: PointerEvent) {
+    const dx = e.clientX - startX, dy = e.clientY - startY;
+    if (Math.sqrt(dx * dx + dy * dy) > SLOP) return;
+    const now = Date.now();
+    if (onDoubleTap && now - lastTap < doubleTapGap) {
+      if (pending) { clearTimeout(pending); pending = null; }
+      onDoubleTap(e);
+      lastTap = 0;
+    } else {
+      lastTap = now;
+      if (onDoubleTap) {
+        pending = setTimeout(() => { pending = null; onTap(e); }, doubleTapGap);
+      } else {
+        onTap(e);
+      }
+    }
+  }
+
+  node.addEventListener("pointerdown", down);
+  node.addEventListener("pointerup",   up);
+  return { destroy() {
+    node.removeEventListener("pointerdown", down);
+    node.removeEventListener("pointerup",   up);
+  }};
+}
+
+export interface SwipeOptions {
+  onSwipeLeft?:  (e: PointerEvent) => void;
+  onSwipeRight?: (e: PointerEvent) => void;
+  onSwipeUp?:    (e: PointerEvent) => void;
+  onSwipeDown?:  (e: PointerEvent) => void;
+  threshold?:    number;
+  lockAxis?:     boolean;
+}
+
+export function swipe(node: HTMLElement, opts: SwipeOptions) {
+  const { onSwipeLeft, onSwipeRight, onSwipeUp, onSwipeDown, threshold = 40, lockAxis = true } = opts;
+  let startX = 0, startY = 0, active = false;
+
+  function down(e: PointerEvent) {
+    if (e.pointerType === "mouse") return;
+    startX = e.clientX; startY = e.clientY; active = true;
+    node.setPointerCapture(e.pointerId);
+  }
+  function up(e: PointerEvent) {
+    if (!active) return; active = false;
+    const dx = e.clientX - startX, dy = e.clientY - startY;
+    const ax = Math.abs(dx), ay = Math.abs(dy);
+    if (Math.max(ax, ay) < threshold) return;
+    if (lockAxis && ax > ay) {
+      if (dx < 0) onSwipeLeft?.(e); else onSwipeRight?.(e);
+    } else if (lockAxis && ay >= ax) {
+      if (dy < 0) onSwipeUp?.(e); else onSwipeDown?.(e);
+    } else {
+      if (ax >= ay) { if (dx < 0) onSwipeLeft?.(e); else onSwipeRight?.(e); }
+      else          { if (dy < 0) onSwipeUp?.(e);   else onSwipeDown?.(e); }
+    }
+  }
+  function cancel() { active = false; }
+
+  node.addEventListener("pointerdown",   down);
+  node.addEventListener("pointerup",     up);
+  node.addEventListener("pointercancel", cancel);
+  return { destroy() {
+    node.removeEventListener("pointerdown",   down);
+    node.removeEventListener("pointerup",     up);
+    node.removeEventListener("pointercancel", cancel);
+  }};
+}
+
+export interface PinchOptions {
+  onPinch:    (scale: number, origin: { x: number; y: number }) => void;
+  onPinchEnd?: (scale: number) => void;
+}
+
+export interface PinchGestureOptions {
+  onPinch:     (scale: number, origin: { x: number; y: number }) => void;
+  onPinchEnd?: (scale: number) => void;
+}
+
+export interface PinchGesture {
+  onPointerDown: (e: PointerEvent) => void;
+  onPointerMove: (e: PointerEvent) => void;
+  onPointerUp:   (e: PointerEvent) => void;
+  isPinching:    () => boolean;
+}
+
+export function createPinchGesture(opts: PinchGestureOptions): PinchGesture {
+  const { onPinch, onPinchEnd } = opts;
+  const pointers = new Map<number, PointerEvent>();
+  let initDist = 0;
+
+  function pdist(a: PointerEvent, b: PointerEvent) {
+    const dx = a.clientX - b.clientX, dy = a.clientY - b.clientY;
+    return Math.sqrt(dx * dx + dy * dy);
+  }
+  function pmid(a: PointerEvent, b: PointerEvent) {
+    return { x: (a.clientX + b.clientX) / 2, y: (a.clientY + b.clientY) / 2 };
+  }
+
+  function onPointerDown(e: PointerEvent) {
+    pointers.set(e.pointerId, e);
+    if (pointers.size === 2) {
+      const [a, b] = [...pointers.values()];
+      initDist = pdist(a, b);
+    }
+  }
+  function onPointerMove(e: PointerEvent) {
+    if (!pointers.has(e.pointerId)) return;
+    pointers.set(e.pointerId, e);
+    if (pointers.size !== 2 || initDist === 0) return;
+    const [a, b] = [...pointers.values()];
+    onPinch(pdist(a, b) / initDist, pmid(a, b));
+  }
+  function onPointerUp(e: PointerEvent) {
+    if (pointers.size === 2 && onPinchEnd) {
+      const [a, b] = [...pointers.values()];
+      onPinchEnd(pdist(a, b) / initDist);
+    }
+    pointers.delete(e.pointerId);
+    initDist = 0;
+  }
+
+  return { onPointerDown, onPointerMove, onPointerUp, isPinching: () => pointers.size >= 2 };
+}
+
+export function pinch(node: HTMLElement, opts: PinchOptions) {
+  const gesture = createPinchGesture(opts);
+  function down(e: PointerEvent) { node.setPointerCapture(e.pointerId); gesture.onPointerDown(e); }
+  node.addEventListener("pointerdown",   down);
+  node.addEventListener("pointermove",   gesture.onPointerMove);
+  node.addEventListener("pointerup",     gesture.onPointerUp);
+  node.addEventListener("pointercancel", gesture.onPointerUp);
+  return { destroy() {
+    node.removeEventListener("pointerdown",   down);
+    node.removeEventListener("pointermove",   gesture.onPointerMove);
+    node.removeEventListener("pointerup",     gesture.onPointerUp);
+    node.removeEventListener("pointercancel", gesture.onPointerUp);
+  }};
+}
+
+export interface DragScrollOptions {
+  direction?: "x" | "y" | "both";
+  onDragStart?: () => void;
+  onDragEnd?:   () => void;
+}
+
+export function dragScroll(node: HTMLElement, opts: DragScrollOptions = {}) {
+  const { direction = "both", onDragStart, onDragEnd } = opts;
+  let active = false, startX = 0, startY = 0, scrollX = 0, scrollY = 0;
+
+  function down(e: PointerEvent) {
+    if (e.pointerType === "mouse") return;
+    active = true;
+    startX = e.clientX; startY = e.clientY;
+    scrollX = node.scrollLeft; scrollY = node.scrollTop;
+    node.setPointerCapture(e.pointerId);
+    onDragStart?.();
+  }
+  function move(e: PointerEvent) {
+    if (!active) return;
+    if (direction !== "x") node.scrollTop  = scrollY - (e.clientY - startY);
+    if (direction !== "y") node.scrollLeft = scrollX - (e.clientX - startX);
+  }
+  function up() { if (active) { active = false; onDragEnd?.(); } }
+
+  node.addEventListener("pointerdown",   down);
+  node.addEventListener("pointermove",   move);
+  node.addEventListener("pointerup",     up);
+  node.addEventListener("pointercancel", up);
+  return { destroy() {
+    node.removeEventListener("pointerdown",   down);
+    node.removeEventListener("pointermove",   move);
+    node.removeEventListener("pointerup",     up);
+    node.removeEventListener("pointercancel", up);
+  }};
+}
@@ -1,12 +1,8 @@
 import type { Manga, Source } from "@types";
 import type { Settings }      from "@types";

-// ── Class utility ─────────────────────────────────────────────────────────────
-
 export { clsx as cn } from "clsx";

-// ── Time / formatting ─────────────────────────────────────────────────────────
-
 export function timeAgo(ts: number): string {
  const diff = Date.now() - ts, m = Math.floor(diff / 60000);
  if (m < 1)  return "Just now";
@@ -33,85 +29,86 @@ export function formatReadTime(m: number): string {
  return r === 0 ? `${h}h` : `${h}h ${r}m`;
 }

-// ── NSFW filtering ────────────────────────────────────────────────────────────
-
-/**
- * Default genre substrings used when no user-configured list is available.
- * Stored as settings.nsfwFilteredTags; editable in Settings > Content.
- */
-export const DEFAULT_NSFW_TAGS = [
-  "adult",
-  "mature",
-  "hentai",
-  "ecchi",
-  "erotic",       // catches "erotica", "erotic content", "erotic manga"
-  "pornograph",   // catches "pornographic", "pornography"
-  "18+",
-  "smut",
-  "lemon",
-  "explicit",
-  "sexual violence",
+const STRICT_TAGS: string[] = [
+  "adult", "mature", "hentai", "ecchi", "erotic", "pornograph",
+  "18+", "smut", "lemon", "explicit", "sexual violence",
+  "gore", "guro", "graphic violence", "torture", "body horror",
 ];

-/**
- * Returns true if the manga's genre list contains any of the given substrings.
- * Falls back to DEFAULT_NSFW_TAGS if no tag list is provided.
- */
-export function isNsfwManga(
-  manga: { genre?: string[] | null },
-  tags: string[] = DEFAULT_NSFW_TAGS,
-): boolean {
-  return (manga.genre ?? []).some(g =>
-    tags.some(sub => g.toLowerCase().trim().includes(sub))
-  );
+const MODERATE_TAGS: string[] = [
+  "adult", "mature", "hentai", "ecchi", "erotic", "pornograph",
+  "18+", "smut", "lemon", "explicit", "sexual violence",
+];
+
+type ContentFilterSettings = Pick<
+  Settings,
+  "contentLevel" | "sourceOverridesEnabled" | "nsfwAllowedSourceIds" | "nsfwBlockedSourceIds"
+>;
+
+function blockedTagsForSettings(settings: ContentFilterSettings): string[] {
+  if (settings.contentLevel === "strict")   return STRICT_TAGS;
+  if (settings.contentLevel === "moderate") return MODERATE_TAGS;
+  return [];
+}
+
+function genreMatchesBlocklist(genre: string[], blockedTags: string[]): boolean {
+  if (!blockedTags.length) return false;
+  return genre.some(g => blockedTags.some(tag => g.toLowerCase().trim().includes(tag)));
 }

-/**
- * Single authoritative NSFW gate used by all views.
- * Returns true when the manga should be HIDDEN. Priority order:
- *   1. Source in blockedSourceIds → always hidden, even when showNsfw is on.
- *   2. showNsfw globally enabled → only blocked sources are hidden.
- *   3. Source in allowedSourceIds → skip isNsfw flag, but genre tags still apply.
- *   4. source.isNsfw flag → hidden.
- *   5. Genre tag match → hidden.
- *
- * Usage: items.filter(m => !shouldHideNsfw(m, settings))
- */
 export function shouldHideNsfw(
  manga: Pick<Manga, "genre" | "source">,
-  settings: Pick<Settings, "showNsfw" | "nsfwFilteredTags" | "nsfwAllowedSourceIds" | "nsfwBlockedSourceIds">,
+  settings: ContentFilterSettings,
 ): boolean {
+  if (settings.contentLevel === "unrestricted") return false;
+
  const srcId   = manga.source?.id;
+  const blocked = settings.sourceOverridesEnabled ? (settings.nsfwBlockedSourceIds ?? []) : [];
+  const allowed = settings.sourceOverridesEnabled ? (settings.nsfwAllowedSourceIds ?? []) : [];

-  if (srcId && settings.nsfwBlockedSourceIds.includes(srcId)) return true;
-  if (settings.showNsfw) return false;
+  if (srcId && blocked.includes(srcId)) return true;

-  const sourceAllowed = !!(srcId && settings.nsfwAllowedSourceIds.includes(srcId));
-  if (!sourceAllowed && manga.source?.isNsfw) return true;
+  const sourceAllowed = !!(srcId && allowed.includes(srcId));
+  const blockedTags   = blockedTagsForSettings(settings);

-  return isNsfwManga(manga, settings.nsfwFilteredTags);
+  if (!sourceAllowed && manga.source?.isNsfw && settings.contentLevel === "strict") return true;
+  return genreMatchesBlocklist(manga.genre ?? [], blockedTags);
 }

-/**
- * Gate for Source objects — parallel to shouldHideNsfw for manga.
- * Usage: sources.filter(s => !shouldHideSource(s, settings))
- */
 export function shouldHideSource(
  source: Pick<Source, "id" | "isNsfw">,
-  settings: Pick<Settings, "showNsfw" | "nsfwAllowedSourceIds" | "nsfwBlockedSourceIds">,
+  settings: ContentFilterSettings,
 ): boolean {
-  if (settings.nsfwBlockedSourceIds.includes(source.id)) return true;
-  if (settings.nsfwAllowedSourceIds.includes(source.id)) return false;
-  return !settings.showNsfw && source.isNsfw;
+  if (settings.contentLevel === "unrestricted") return false;
+
+  if (settings.sourceOverridesEnabled) {
+    if ((settings.nsfwBlockedSourceIds ?? []).includes(source.id)) return true;
+    if ((settings.nsfwAllowedSourceIds ?? []).includes(source.id)) return settings.contentLevel === "strict";
+  }
+
+  return source.isNsfw && settings.contentLevel === "strict";
 }

-// ── Source deduplication ──────────────────────────────────────────────────────
+export function dedupeSourcesByLang(
+  sources:       Source[],
+  preferredLang: string,
+  settings:      ContentFilterSettings,
+  applyHide      = false,
+): Source[] {
+  const map = new Map<string, Source>();
+  for (const s of sources) {
+    if (s.id === "0") continue;
+    if (applyHide && shouldHideSource(s, settings)) continue;
+    const existing = map.get(s.name);
+    if (!existing) { map.set(s.name, s); continue; }
+    const existingPref = existing.lang === preferredLang;
+    const newPref      = s.lang === preferredLang;
+    if (newPref && !existingPref) map.set(s.name, s);
+    else if (!existingPref && !newPref && s.lang < existing.lang) map.set(s.name, s);
+  }
+  return Array.from(map.values());
+}

-/**
- * Deduplicates sources by name. When multiple sources share a name,
- * the preferred language wins; otherwise falls back to alphabetical by lang.
- * The local source (id "0") is always excluded.
- */
 export function dedupeSources(sources: Source[], preferredLang: string): Source[] {
  const byName = new Map<string, Source[]>();
  for (const src of sources) {
@@ -127,9 +124,6 @@ export function dedupeSources(sources: Source[], preferredLang: string): Source[
  return picked;
 }

-// ── Manga deduplication ───────────────────────────────────────────────────────
-
-/** Strips punctuation, articles, and source suffixes for fuzzy title matching. */
 export function normalizeTitle(title: string): string {
  return title
    .toLowerCase()
@@ -140,39 +134,21 @@ export function normalizeTitle(title: string): string {
    .trim();
 }

-/** Strips all non-alphanumeric chars and collapses whitespace. */
 function norm(s: string): string {
  return s.toLowerCase().replace(/[^a-z0-9]/g, " ").replace(/\s+/g, " ").trim();
 }

-/**
- * First 200 normalized chars of a description — reliable cross-source fingerprint.
- * Returns null if too short (< 60 chars) to be a trustworthy signal.
- */
 function descFingerprint(desc: string | null | undefined): string | null {
  if (!desc) return null;
  const n = norm(desc);
  return n.length >= 60 ? n.slice(0, 200) : null;
 }

-/**
- * Normalized author + artist concatenation for tie-breaking.
- * Returns null if no author info available.
- */
 function authorFingerprint(author?: string | null, artist?: string | null): string | null {
  const parts = [author, artist].filter(Boolean).map(s => norm(s!));
  return parts.length ? parts.sort().join("|") : null;
 }

-/**
- * Deduplicates manga across sources using title, description, and author signals,
- * plus explicit user-defined links (settings.mangaLinks).
- *
- * When two entries match, the better one is kept:
- *   - Library membership wins over non-library.
- *   - Otherwise higher downloadCount wins.
- *   - Otherwise first occurrence wins.
- */
 export function dedupeMangaByTitle<T extends {
  id:             number;
  title:          string;
@@ -228,9 +204,6 @@ export function dedupeMangaByTitle<T extends {
  return out;
 }

-/**
- * Lossless deduplication by ID only. Preserves first occurrence.
- */
 export function dedupeMangaById<T extends { id: number }>(items: T[]): T[] {
  const seen = new Set<number>();
  const out: T[] = [];
@@ -32,6 +32,4 @@

  --dot-active:   var(--accent);
  --dot-inactive: var(--text-faint);
-
-  --bg-image: none;
 }
@@ -9,4 +9,5 @@
  --sp-10: 40px;

  --sidebar-width:  52px;
+  --titlebar-height: 36px;
 }
@@ -5,8 +5,10 @@
  import { runConcurrent }      from "@core/async/batchRequests";
  import { shouldHideNsfw, shouldHideSource, dedupeMangaById, dedupeMangaByTitle } from "@core/util";
  import { store }              from "@store/state.svelte";
+  import { preloadBlobUrls }    from "@core/cache/imageCache";
  import Thumbnail              from "@shared/manga/Thumbnail.svelte";
  import type { Manga, Source } from "@types";
+  import type { CachedManga }   from "@features/discover/lib/searchFilter";

  interface Props {
    allSources:      Source[];
@@ -16,12 +18,14 @@
    pendingPrefill:  string;
    popularResults:  (Manga & { _priority: number })[];
    popularLoading:  boolean;
+    sourceCache:     Map<number, CachedManga>;
    onPrefillConsumed: () => void;
    onPreview:       (m: Manga) => void;
  }
  let {
    allSources, availableLangs, hasMultipleLangs, loadingSources,
    pendingPrefill, popularResults, popularLoading,
+    sourceCache,
    onPrefillConsumed, onPreview,
  }: Props = $props();

@@ -99,6 +103,10 @@
        );
        if (ctrl.signal.aborted) return;
        const mangas = d.fetchSourceManga.mangas.filter((m) => !shouldHideNsfw(m, store.settings));
+        preloadBlobUrls(
+          mangas.map((m) => sourceCache.get(m.id)?.thumbnailUrl ?? m.thumbnailUrl),
+          12,
+        );
        const next = [...kw_results];
        next[idx] = { ...next[idx], mangas, loading: false };
        kw_results = next;
@@ -276,7 +284,6 @@
 </script>

 <style>
-  
  .keywordBar    { padding: var(--sp-3) var(--sp-4) var(--sp-2); flex-shrink: 0; display: flex; flex-direction: column; gap: var(--sp-2); }
  .searchBar     { display: flex; align-items: center; gap: var(--sp-2); background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-lg); padding: var(--sp-2) var(--sp-3); transition: border-color var(--t-base); }
  .searchBar:focus-within { border-color: var(--border-strong); }
@@ -308,12 +315,12 @@

  .srchCard      { background: none; border: none; padding: 0; cursor: pointer; text-align: left; }
  .srchCard:hover .srchCoverWrap { filter: brightness(1.08) saturate(1.05); }
-  .srchCoverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); transition: filter var(--t-base); contain: layout style; }
-  .srchGradient  { position: absolute; inset: 0; background: linear-gradient(to top, rgba(0,0,0,0.82) 0%, rgba(0,0,0,0.15) 50%, transparent 72%); pointer-events: none; }
-  .srchFooter    { position: absolute; bottom: 0; left: 0; right: 0; padding: var(--sp-2); pointer-events: none; }
+  .srchCoverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); transition: filter var(--t-base); }
+  .srchGradient  { position: absolute; inset: 0; z-index: 1; background: linear-gradient(to top, rgba(0,0,0,0.82) 0%, rgba(0,0,0,0.15) 50%, transparent 72%); pointer-events: none; }
+  .srchFooter    { position: absolute; bottom: 0; left: 0; right: 0; z-index: 2; padding: var(--sp-2); pointer-events: none; }
  .srchTitle     { font-size: var(--text-xs); font-weight: var(--weight-medium); color: rgba(255,255,255,0.92); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-shadow: 0 1px 4px rgba(0,0,0,0.7); }
  .srchSource    { font-family: var(--font-ui); font-size: 9px; color: rgba(255,255,255,0.45); letter-spacing: var(--tracking-wide); margin-top: 1px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-  .inLibBadge    { position: absolute; top: var(--sp-2); left: var(--sp-2); font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; }
+  .inLibBadge    { position: absolute; top: var(--sp-2); left: var(--sp-2); z-index: 2; font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; }

  .skCard        { display: flex; flex-direction: column; gap: var(--sp-2); flex-shrink: 0; width: 100%; }
  @keyframes shimmer { from { background-position: -200% 0 } to { background-position: 200% 0 } }
@@ -287,6 +287,7 @@
      {pendingPrefill}
      popularResults={popular_results}
      popularLoading={popular_loading}
+      {sourceCache}
      onPrefillConsumed={() => (pendingPrefill = "")}
      onPreview={setPreviewManga}
    />
@@ -49,7 +49,6 @@ export interface CachedManga {
  genreEnriched: boolean;
 }

-
 export const COMMON_GENRES = [
  "Action", "Adventure", "Comedy", "Drama", "Fantasy", "Romance",
  "Sci-Fi", "Slice of Life", "Horror", "Mystery", "Thriller", "Sports",
@@ -66,7 +65,6 @@ export const MANGA_STATUSES: { value: string; label: string }[] = [
  { value: "UNKNOWN",   label: "Unknown"   },
 ];

-
 export function buildTagFilter(
  tags:     string[],
  mode:     TagMode,
@@ -90,13 +88,12 @@ export function buildTagFilter(
  return { and: [genrePart, statusPart] };
 }

-
 export function filterSourceCache(
  sourceCache: Map<number, CachedManga>,
  tags:        string[],
  mode:        TagMode,
  statuses:    string[],
-  settings:    Pick<Settings, "showNsfw" | "nsfwFilteredTags" | "nsfwAllowedSourceIds" | "nsfwBlockedSourceIds">,
+  settings:    Pick<Settings, "contentLevel" | "sourceOverridesEnabled" | "nsfwAllowedSourceIds" | "nsfwBlockedSourceIds">,
 ): CachedManga[] {
  return [...sourceCache.values()].filter((m) => {
    if (shouldHideNsfw(m as any, settings)) return false;
@@ -118,7 +115,6 @@ export function filterSourceCache(
  });
 }

-
 export function toCachedManga(
  m:      { id: number; title: string; thumbnailUrl: string; inLibrary: boolean; genre?: string[]; status?: string },
  srcId:  string,
@@ -1,6 +1,7 @@
 <script lang="ts">
  import { CircleNotch, ArrowClockwise, X } from "phosphor-svelte";
  import Thumbnail from "@shared/manga/Thumbnail.svelte";
+  import { longPress } from "@core/ui/touchscreen";
  import type { DownloadQueueItem } from "@types/index";
  import { pageProgress } from "../lib/downloadQueue";

@@ -24,6 +25,12 @@
  const prog    = $derived(pageProgress(item.progress, pages));
  const isError = $derived(item.state === "ERROR");
  const pct     = $derived(Math.round(item.progress * 100));
+
+  function rowLongPress(node: HTMLElement) {
+    return longPress(node, {
+      onLongPress() { onSelect(item.chapter.id, { shiftKey: false, ctrlKey: true, metaKey: false } as MouseEvent); },
+    });
+  }
 </script>

 <div
@@ -32,7 +39,12 @@
  class:row-error={isError}
  class:row-selected={isSelected}
  class:row-removing={isRemoving}
+  role="option"
+  aria-selected={isSelected}
+  tabindex="0"
+  use:rowLongPress
  onclick={(e) => { e.stopPropagation(); onSelect(item.chapter.id, e); }}
+  onkeydown={(e) => { if (e.key === ' ' || e.key === 'Enter') { e.preventDefault(); onSelect(item.chapter.id, e as unknown as MouseEvent); } }}
 >
  {#if manga?.thumbnailUrl}
    <div class="thumb">
@@ -115,7 +115,7 @@
  </div>

  <div class="bar-wrap">
-    <div class="status-bar" onclick={handleClickOff} role="presentation">
+    <div class="status-bar" role="none">
      <div class="status-dot" class:active={downloadStore.isRunning}></div>
      <span class="status-text">
        {downloadStore.togglingPlay
@@ -127,7 +127,7 @@
          <button class="sel-action-btn" disabled={downloadStore.batchWorking} onclick={(e) => { e.stopPropagation(); downloadStore.reorderSelectedToEdge("top"); }} title="Move to top">
            <ArrowLineUp size={12} weight="bold" />
          </button>
-          <div class="move-step" onclick={(e) => e.stopPropagation()} role="presentation">
+          <div class="move-step" onclick={(e) => e.stopPropagation()} onkeydown={(e) => e.stopPropagation()} role="none">
            <button class="sel-action-btn" disabled={downloadStore.batchWorking} onclick={(e) => { e.stopPropagation(); downloadStore.reorderSelected("up", moveBy); }} title="Move up">
              <CaretUp size={12} weight="bold" />
            </button>
@@ -168,7 +168,7 @@
    </div>
  </div>

-  <div class="content" onclick={handleClickOff}>
+  <div class="content" role="none" onclick={handleClickOff} onkeydown={(e) => e.key === 'Escape' && handleClickOff()}>
    <DownloadQueue
      queue={downloadStore.queue}
      loading={downloadStore.loading}
@@ -204,9 +204,6 @@
  .sel-controls { display: flex; align-items: center; gap: var(--sp-2); }
  .status-bar { cursor: default; }
  .bar-sep { width: 1px; height: 12px; background: var(--border-dim); flex-shrink: 0; }
-  .sel-count { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-secondary); letter-spacing: var(--tracking-wide); white-space: nowrap; }
-  .sel-text-btn { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); background: none; border: none; cursor: pointer; padding: 2px 4px; border-radius: var(--radius-sm); transition: color var(--t-base); white-space: nowrap; }
-  .sel-text-btn:hover { color: var(--text-primary); }
  .sel-action-btn { display: flex; align-items: center; gap: 4px; font-family: var(--font-ui); font-size: var(--text-xs); padding: 3px 8px; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); background: var(--bg-overlay); color: var(--text-muted); cursor: pointer; transition: color var(--t-base), border-color var(--t-base), background var(--t-base); white-space: nowrap; }
  .sel-action-btn:hover:not(:disabled) { color: var(--text-primary); border-color: var(--border-strong); }
  .sel-action-btn:disabled { opacity: 0.35; cursor: not-allowed; }
@@ -6,6 +6,7 @@ import {
  ENQUEUE_DOWNLOAD, REORDER_DOWNLOAD,
 } from "@api/mutations";
 import { addToast, setActiveDownloads } from "@store/state.svelte";
+import { boot } from "@store/boot.svelte";
 import type { DownloadStatus, DownloadQueueItem } from "@types/index";
 import {
  toActiveDownloads, optimisticRemove, optimisticRemoveMany,
@@ -104,6 +105,7 @@ class DownloadStore {
  }

  async poll() {
+    if (boot.sessionExpired) return;
    gql<{ downloadStatus: DownloadStatus }>(GET_DOWNLOAD_STATUS)
      .then((d) => this.applyStatus(d.downloadStatus))
      .catch(console.error)
@@ -323,8 +323,8 @@
  .root { display: flex; flex-direction: column; height: 100%; overflow: hidden; }
  .list { flex: 1; overflow-y: auto; padding: 0 var(--sp-4) var(--sp-4); display: flex; flex-direction: column; gap: 1px; }
  .empty { display: flex; align-items: center; justify-content: center; flex: 1; color: var(--text-faint); font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); }
-  .icon-btn { display: flex; align-items: center; justify-content: center; width: 28px; height: 28px; border-radius: var(--radius-md); color: var(--text-muted); transition: color var(--t-base), background var(--t-base); }
-  .icon-btn:hover:not(:disabled) { color: var(--text-primary); background: var(--bg-raised); }
+  :global(.icon-btn) { display: flex; align-items: center; justify-content: center; width: 28px; height: 28px; border-radius: var(--radius-md); color: var(--text-muted); transition: color var(--t-base), background var(--t-base); }
+  :global(.icon-btn:hover:not(:disabled)) { color: var(--text-primary); background: var(--bg-raised); }
  .ext-panel { display: flex; flex-direction: column; gap: var(--sp-2); padding: var(--sp-3) var(--sp-6); flex-shrink: 0; border-bottom: 1px solid var(--border-dim); background: var(--bg-raised); opacity: 1; }
  .ext-panel-anim { animation: panelSlide 0.18s cubic-bezier(0.16,1,0.3,1) both; }
  .panel-header { display: flex; align-items: center; padding-bottom: var(--sp-1); }
@@ -29,6 +29,10 @@
    return new Date(d + "T00:00:00").toLocaleDateString("en-US", { month: "short", day: "numeric" });
  }

+  function localDateStr(d: Date): string {
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+  }
+
  let wrapEl: HTMLElement;
  let cellSize = $state(12);
  let numWeeks = $state(26);
@@ -55,7 +59,7 @@
  const visibleWeeks = $derived((() => {
    const today    = new Date();
    today.setHours(0, 0, 0, 0);
-    const todayStr = today.toISOString().slice(0, 10);
+    const todayStr = localDateStr(today);
    const endDow   = today.getDay(); // 0=Sun ... 6=Sat
    const weekEnd  = new Date(today);
    weekEnd.setDate(weekEnd.getDate() + (6 - endDow)); // advance to Saturday
@@ -66,7 +70,7 @@
      for (let di = 0; di < 7; di++) {
        const d = new Date(weekEnd);
        d.setDate(d.getDate() - wi * 7 - (6 - di));
-        const dateStr = d.toISOString().slice(0, 10);
+        const dateStr = localDateStr(d);
        week.push({ dateStr, count: dailyReadCounts[dateStr] ?? 0, isToday: dateStr === todayStr, isFuture: d > today });
      }
      weeks.push(week);
@@ -21,6 +21,7 @@
    heroEntry,
    heroMangaId,
    heroChapters,
+    heroNewChapter,
    loadingHeroChapters,
    resuming,
    onresume,
@@ -40,6 +41,7 @@
    heroEntry: HistoryEntry | null;
    heroMangaId: number | null;
    heroChapters: Chapter[];
+    heroNewChapter: Chapter | null;
    loadingHeroChapters: boolean;
    resuming: boolean;
    onresume: () => void;
@@ -102,6 +104,9 @@
        {:else}
          <span class="hero-tag hero-tag-pinned"><PushPin size={8} weight="fill" /> Pinned</span>
        {/if}
+        {#if heroNewChapter && !heroNewChapter.isRead}
+          <span class="hero-tag hero-tag-new">New ch.{Math.floor(heroNewChapter.chapterNumber)}</span>
+        {/if}
        {#each (heroManga?.genre ?? []).slice(0, 3) as g}
          <button
            class="hero-tag hero-tag-genre"
@@ -326,6 +331,7 @@
  }
  .hero-tag-reading { background: var(--accent-muted); color: var(--accent-fg); border-color: var(--accent-dim); }
  .hero-tag-pinned  { background: rgba(168, 132, 232, 0.18); color: #c4a8f0; border-color: rgba(168, 132, 232, 0.28); }
+  .hero-tag-new     { background: rgba(74, 222, 128, 0.15); color: #86efac; border-color: rgba(74, 222, 128, 0.25); }
  .hero-tag-genre   { cursor: pointer; transition: background 0.15s, color 0.15s; }
  .hero-tag-genre:hover { background: rgba(255, 255, 255, 0.18); color: rgba(255, 255, 255, 0.9); }

@@ -114,6 +114,12 @@
  const heroEntry   = $derived(activeSlot?.kind === "continue" ? activeSlot.entry : null);
  const heroMangaId = $derived(heroEntry?.mangaId ?? heroManga?.id ?? null);

+  const heroNewChapter = $derived(
+    heroManga
+      ? (libraryManga.find(m => m.id === heroManga!.id) as any)?.latestUploadedChapter ?? null
+      : null
+  );
+
  function cycleNext() { activeIdx = (activeIdx + 1) % TOTAL_SLOTS; heroChapters = []; heroAllChapters = []; }
  function cyclePrev() { activeIdx = (activeIdx - 1 + TOTAL_SLOTS) % TOTAL_SLOTS; heroChapters = []; heroAllChapters = []; }
  function goToSlot(i: number) { if (i !== activeIdx) { activeIdx = i; heroChapters = []; heroAllChapters = []; } }
@@ -234,6 +240,7 @@
        {heroEntry}
        {heroMangaId}
        {heroChapters}
+        {heroNewChapter}
        {loadingHeroChapters}
        {resuming}
        onresume={resumeActive}
@@ -328,7 +335,6 @@
    min-width: 0;
    overflow: hidden;
  }
-  /* suppress ActivityFeed's own border-top — mid-row provides it */
  .mid-left :global(.section) { border-top: none; }
  .mid-divider { background: var(--border-dim); align-self: stretch; }
  .mid-right {
@@ -11,7 +11,9 @@ export interface RecommendedManga {

 const TOP_GENRES        = 6;
 const PAGE_SIZE         = 100;
-const MAX_PAGES    = 5;
+const MAX_PAGES         = 10;
+const TARGET_PER_GENRE  = 20;
+const EXCLUDED_STATUSES = ["CANCELLED", "ABANDONED"];

 export function topGenres(history: HistoryEntry[], libraryManga: Manga[]): string[] {
  const byId  = new Map(libraryManga.map(m => [m.id, m]));
@@ -36,7 +38,11 @@ export function topGenres(history: HistoryEntry[], libraryManga: Manga[]): strin

 type Result = { mangas: { nodes: Manga[] } };

-async function fetchGenrePages(genre: string, signal?: AbortSignal): Promise<Manga[]> {
+async function fetchGenrePages(
+  genre:      string,
+  globalSeen: Set<number>,
+  signal?:    AbortSignal,
+): Promise<Manga[]> {
  const filter = {
    and: [
      buildTagFilter([genre], "OR", []),
@@ -44,23 +50,33 @@ async function fetchGenrePages(genre: string, signal?: AbortSignal): Promise<Man
    ],
  };

-  const pages = await Promise.all(
-    Array.from({ length: MAX_PAGES }, (_, i) =>
-      gql<Result>(MANGAS_BY_GENRE, { filter, first: PAGE_SIZE, offset: i * PAGE_SIZE }, signal)
-        .then(d => d.mangas.nodes)
-        .catch(() => [] as Manga[])
-    )
-  );
-
-  const seen  = new Set<number>();
+  const localSeen = new Set<number>();
  const nodes: Manga[] = [];
-  for (const page of pages) {
-    if (!page.length) break;
-    for (const m of page) {
-      if (!seen.has(m.id)) { seen.add(m.id); nodes.push(m); }
+
+  for (let page = 0; page < MAX_PAGES; page++) {
+    if (signal?.aborted) break;
+
+    let batch: Manga[];
+    try {
+      const d = await gql<Result>(MANGAS_BY_GENRE, { filter, first: PAGE_SIZE, offset: page * PAGE_SIZE }, signal);
+      batch = d.mangas.nodes;
+    } catch {
+      break;
    }
-    if (page.length < PAGE_SIZE) break;
+
+    if (!batch.length) break;
+
+    for (const m of batch) {
+      if (localSeen.has(m.id) || globalSeen.has(m.id)) continue;
+      if (EXCLUDED_STATUSES.includes(m.status ?? "")) continue;
+      localSeen.add(m.id);
+      nodes.push(m);
    }
+
+    if (nodes.length >= TARGET_PER_GENRE) break;
+    if (batch.length < PAGE_SIZE) break;
+  }
+
  return nodes;
 }

@@ -74,13 +90,14 @@ export async function fetchRecommendations(
  const genres = topGenres(history, libraryManga);
  if (!genres.length) return [];

-  const perGenre = await Promise.all(genres.map(g => fetchGenrePages(g, signal)));
-
-  const seen   = new Set<number>();
+  const globalSeen = new Set<number>();
  const merged: Manga[] = [];
-  for (const page of perGenre) {
-    for (const m of page) {
-      if (!seen.has(m.id)) { seen.add(m.id); merged.push(m); }
+
+  for (const genre of genres) {
+    const results = await fetchGenrePages(genre, globalSeen, signal);
+    for (const m of results) {
+      globalSeen.add(m.id);
+      merged.push(m);
    }
  }

@@ -6,20 +6,21 @@
    GET_CATEGORIES, GET_LIBRARY, UPDATE_MANGA, UPDATE_MANGAS,
    GET_CHAPTERS, DELETE_DOWNLOADED_CHAPTERS, DEQUEUE_DOWNLOAD,
    CREATE_CATEGORY, UPDATE_MANGA_CATEGORIES,
-    UPDATE_CATEGORY_ORDER,
+    UPDATE_CATEGORY_ORDER, UPDATE_STOP, UPDATE_LIBRARY_MANGA, UPDATE_CATEGORY_MANGA,
  } from "@api";
  import { cache, CACHE_KEYS, CACHE_GROUPS, DEFAULT_TTL_MS } from "@core/cache/queryCache";
  import { dedupeMangaById, dedupeMangaByTitle, shouldHideNsfw } from "@core/util";
  import { sortLibrary }    from "../lib/librarySort";
  import { startLibraryUpdate } from "../lib/libraryUpdater";
  import { createPaginator } from "@core/algorithms/paginate";
+  import { longPress }       from "@core/ui/touchscreen";
  import {
    store, setCategories, setLibraryUpdates, addToast,
    setTabSort, toggleTabSortDir, setTabStatus, toggleTabFilter, clearTabFilters,
  } from "../store/libraryState.svelte";
  import type { LibrarySortMode, LibrarySortDir, LibraryStatusFilter, LibraryContentFilter, LibraryUpdateEntry } from "@store/state.svelte";
  import type { Manga, Category, Chapter } from "@types";
-  import { checkAndMarkCompleted as storeCheckAndMarkCompleted } from "@store/state.svelte";
+  import { checkAndMarkCompleted as storeCheckAndMarkCompleted, updateSettings } from "@store/state.svelte";

  import LibraryToolbar       from "./LibraryToolbar.svelte";
  import LibraryGrid          from "./LibraryGrid.svelte";
@@ -27,11 +28,12 @@
  import BulkAutomationPanel  from "../panels/BulkAutomationPanel.svelte";
  import ContextMenu, { type MenuEntry } from "@shared/ui/ContextMenu.svelte";

-  import { Books, DownloadSimple, Folder, FolderSimple, FolderSimplePlus, Trash, Star, CheckSquare, ArrowSquareOut } from "phosphor-svelte";
+  import { Books, DownloadSimple, Folder, FolderSimple, FolderSimplePlus, Trash, Star, CheckSquare, ArrowSquareOut, ArrowsClockwise } from "phosphor-svelte";

  const CARD_MIN_W     = 130;
  const CARD_GAP       = 16;
  const COMPLETED_NAME = "Completed";
+  const CTX_FOLDER_CAP = 4;

  const paginator = createPaginator<Manga>(store.settings.renderLimit ?? 48);

@@ -42,7 +44,7 @@
  let search:         string      = $state("");
  let renderVisible:  number      = $state(store.settings.renderLimit ?? 48);
  let scrollEl:       HTMLDivElement;
-  let tabsEl:         HTMLDivElement;
+  let tabsEl         = $state<HTMLDivElement>(null!);
  let containerWidth: number      = $state(800);
  let ctx:      { x: number; y: number; manga: Manga } | null = $state(null);
  let emptyCtx: { x: number; y: number } | null              = $state(null);
@@ -63,12 +65,14 @@
  let refreshDone:      boolean = $state(false);
  let refreshDoneTimer: ReturnType<typeof setTimeout> | null = null;

+  let refreshingMangaId: number | null = $state(null);
+  let refreshingCatId:   number | null = $state(null);
+
  let activeDragKind:   "tab" | null = $state(null);
  let dragInsertIdx:    number       = $state(-1);
  let dragTabId:        number | null = $state(null);
  let dragOverTabId:    number | null = $state(null);

-
  const DT_TAB = "application/x-moku-tab";
  const anims  = $derived(store.settings.qolAnimations ?? true);

@@ -134,9 +138,9 @@

    const f = store.settings.libraryTabFilters?.[tab] ?? {};
    if (f.unread)     items = items.filter(m => (m.unreadCount ?? 0) > 0);
-    if (f.started)    items = items.filter(m => (m.unreadCount ?? 0) > 0 && (m.chapterCount ?? 0) > (m.unreadCount ?? 0));
+    if (f.started)    items = items.filter(m => (m.unreadCount ?? 0) > 0 && (m.chapters?.totalCount ?? 0) > (m.unreadCount ?? 0));
    if (f.downloaded) items = items.filter(m => (m.downloadCount ?? 0) > 0);
-    if (f.bookmarked) items = items.filter(m => !!(m as any).hasBookmark);
+    if (f.bookmarked) items = items.filter(m => (m.bookmarkCount ?? 0) > 0);

    const recentlyReadMap = new Map<number, number>();
    if (tabSortMode === "recentlyRead") {
@@ -197,15 +201,28 @@
  function selectAll()                  { selectedIds = new Set(visibleManga.map(m => m.id)); }
  function loadMore()                   { renderVisible = paginator.nextVisible(renderVisible); }

-  let longPressTimer: ReturnType<typeof setTimeout> | null = null;
-  function onCardPointerDown(e: PointerEvent, m: Manga) {
-    if (e.button !== 0) return;
-    longPressTimer = setTimeout(() => { longPressTimer = null; enterSelectMode(m.id); }, 500);
+  let cardLongPressFired = false;
+
+  function rootLongPressAction(node: HTMLElement) {
+    return longPress(node, {
+      onLongPress(e) {
+        if ((e.target as HTMLElement).closest("button, .card")) return;
+        emptyCtx = { x: e.clientX - SIDEBAR_W, y: e.clientY - TITLEBAR_H };
+      },
+    });
+  }
+
+  function cardLongPress(node: HTMLElement, m: Manga) {
+    return longPress(node, {
+      onLongPress(e) {
+        cardLongPressFired = true;
+        ctx = { x: e.clientX - SIDEBAR_W, y: e.clientY - TITLEBAR_H, manga: m };
+      },
+    });
  }
-  function onCardPointerUp()    { if (longPressTimer) { clearTimeout(longPressTimer); longPressTimer = null; } }
-  function onCardPointerLeave() { if (longPressTimer) { clearTimeout(longPressTimer); longPressTimer = null; } }

  function onCardClick(e: MouseEvent, m: Manga) {
+    if (cardLongPressFired) { cardLongPressFired = false; return; }
    if (selectMode) { toggleSelect(m.id); return; }
    if (e.metaKey || e.ctrlKey || e.shiftKey) { e.preventDefault(); enterSelectMode(m.id); return; }
    store.activeManga = m;
@@ -233,7 +250,7 @@
        cache.get(CACHE_KEYS.LIBRARY, () => gql<{ mangas: { nodes: Manga[] } }>(GET_LIBRARY).then(d => d.mangas.nodes), DEFAULT_TTL_MS, CACHE_GROUPS.LIBRARY),
        reloadCategories(),
      ]);
-      const mapped = nodes.map((m: any) => ({ ...m, chapterCount: m.chapters?.totalCount ?? m.chapterCount ?? 0 }));
+      const mapped = nodes.map((m: any) => ({ ...m }));
      allManga = dedupeMangaByTitle(dedupeMangaById(mapped), store.settings.mangaLinks);
      error    = null;
      await migrateCategorizedToLibrary();
@@ -271,6 +288,36 @@
    } catch (e) { console.error(e); }
  }

+  async function refreshManga(manga: Manga) {
+    if (refreshingMangaId !== null) return;
+    refreshingMangaId = manga.id;
+    try {
+      await gql(UPDATE_LIBRARY_MANGA, { id: manga.id });
+      cache.clearGroup(CACHE_GROUPS.LIBRARY);
+      await loadData();
+      addToast({ kind: "success", title: "Manga refreshed", body: manga.title, duration: 2500 });
+    } catch (e) { console.error(e); }
+    finally { refreshingMangaId = null; }
+  }
+
+  async function refreshCategory(catId: number) {
+    if (refreshingCatId !== null || refreshing) return;
+    refreshingCatId = catId;
+    try {
+      await gql(UPDATE_CATEGORY_MANGA, { categoryId: catId });
+      cache.clearGroup(CACHE_GROUPS.LIBRARY);
+      await loadData();
+      const cat = store.categories.find(c => c.id === catId);
+      addToast({ kind: "success", title: "Folder refreshed", body: cat?.name ?? "", duration: 2500 });
+    } catch (e) { console.error(e); }
+    finally { refreshingCatId = null; }
+  }
+
+  function bumpCategoryFrecency(catId: number) {
+    const prev = (store.settings as any).categoryFrecency ?? {};
+    updateSettings({ categoryFrecency: { ...prev, [catId]: (prev[catId] ?? 0) + 1 } } as any);
+  }
+
  async function toggleMangaCategory(manga: Manga, cat: Category) {
    const inCat = (categoryMangaMap.get(cat.id) ?? []).some(m => m.id === manga.id);
    setCategories(store.categories.map(c => {
@@ -278,6 +325,7 @@
      const nodes = inCat ? c.mangas.nodes.filter(m => m.id !== manga.id) : [...c.mangas.nodes, manga];
      return { ...c, mangas: { nodes } };
    }));
+    if (!inCat) bumpCategoryFrecency(cat.id);
    try {
      await gql(UPDATE_MANGA_CATEGORIES, { mangaId: manga.id, addTo: inCat ? [] : [cat.id], removeFrom: inCat ? [cat.id] : [] });
      if (!inCat && !manga.inLibrary) {
@@ -296,6 +344,7 @@
      const res = await gql<{ createCategory: { category: Category } }>(CREATE_CATEGORY, { name: name.trim() });
      const cat = res.createCategory.category;
      await gql(UPDATE_MANGA_CATEGORIES, { mangaId: manga.id, addTo: [cat.id], removeFrom: [] });
+      bumpCategoryFrecency(cat.id);
      if (!manga.inLibrary) {
        await gql(UPDATE_MANGA, { id: manga.id, inLibrary: true });
        allManga = allManga.map(m => m.id === manga.id ? { ...m, inLibrary: true } : m);
@@ -342,24 +391,38 @@
    catch (e: any) { addToast({ kind: "error", title: "Could not open folder", body: e?.toString?.() ?? path }); }
  }

+  const SIDEBAR_W  = 52;
+  const TITLEBAR_H = 36;
+
  function openCtx(e: MouseEvent, m: Manga) {
    if (selectMode) { toggleSelect(m.id); return; }
    e.preventDefault();
-    ctx = { x: e.clientX, y: e.clientY, manga: m };
+    ctx = { x: e.clientX - SIDEBAR_W, y: e.clientY - TITLEBAR_H, manga: m };
  }

  function buildCtxItems(m: Manga): MenuEntry[] {
-    const catEntries: MenuEntry[] = visibleCategories.map(cat => {
+    const frecency: Record<number, number> = (store.settings as any).categoryFrecency ?? {};
+    const sorted = [...visibleCategories].sort((a, b) => (frecency[b.id] ?? 0) - (frecency[a.id] ?? 0));
+    const pinned   = sorted.slice(0, CTX_FOLDER_CAP);
+    const overflow = sorted.slice(CTX_FOLDER_CAP);
+
+    const makeCatEntry = (cat: Category): MenuEntry => {
      const inCat = (categoryMangaMap.get(cat.id) ?? []).some(x => x.id === m.id);
-      return { label: inCat ? `Remove from ${cat.name}` : `Add to ${cat.name}`, icon: Folder, onClick: () => toggleMangaCategory(m, cat) };
-    });
+      return { label: inCat ? `Remove from ${cat.name}` : cat.name, icon: Folder, onClick: () => toggleMangaCategory(m, cat) };
+    };
+
+    const pinnedEntries    = pinned.map(makeCatEntry);
+    const overflowChildren = overflow.map(makeCatEntry);
+
    return [
      { label: m.inLibrary ? "Remove from library" : "Add to library", icon: Books, onClick: () => m.inLibrary ? removeFromLibrary(m) : gql(UPDATE_MANGA, { id: m.id, inLibrary: true }).then(() => { allManga = allManga.map(x => x.id === m.id ? { ...x, inLibrary: true } : x); cache.clear(CACHE_KEYS.LIBRARY); }).catch(console.error) },
+      { label: refreshingMangaId === m.id ? "Refreshing…" : "Refresh manga", icon: ArrowsClockwise, disabled: refreshingMangaId !== null, onClick: () => refreshManga(m) },
      { label: "Open in file manager", icon: ArrowSquareOut, disabled: !(m.downloadCount && m.downloadCount > 0), onClick: () => openMangaFolder(m) },
      { label: "Delete all downloads",  icon: Trash, danger: true, disabled: !(m.downloadCount && m.downloadCount > 0), onClick: () => deleteAllDownloads(m) },
      { separator: true },
-      { label: "Select this manga", icon: CheckSquare, onClick: () => enterSelectMode(m.id) },
-      ...(catEntries.length ? [{ separator: true } as MenuEntry, ...catEntries] : []),
+      { label: "Select", icon: CheckSquare, onClick: () => enterSelectMode(m.id) },
+      ...(pinnedEntries.length ? [{ separator: true } as MenuEntry, ...pinnedEntries] : []),
+      ...(overflowChildren.length ? [{ label: `More folders (${overflowChildren.length})`, icon: FolderSimple, onClick: () => {}, children: overflowChildren } as MenuEntry] : []),
      { separator: true },
      { label: "New folder", icon: FolderSimplePlus, onClick: () => createAndAssign(m) },
    ];
@@ -387,18 +450,24 @@
    }
  }

+  async function cancelLibraryRefresh() {
+    if (!refreshing) return;
+    try { await gql(UPDATE_STOP); } catch (e) { console.error(e); }
+    cancelUpdate?.();
+    cancelUpdate  = null;
+    refreshing    = false;
+    refreshProgress = { finished: 0, total: 0 };
+  }
+
  async function startLibraryRefresh() {
    if (refreshing) return;
    refreshing = true;
    refreshProgress = { finished: 0, total: 0 };

    cancelUpdate = startLibraryUpdate({
-      onProgress(p) {
-        refreshProgress = p;
-      },
+      onProgress(p) { refreshProgress = p; },
      async onDone({ entries, totalUpdated, newChapters }) {
-        refreshing = false;
-        cancelUpdate = null;
+        refreshing = false; cancelUpdate = null;
        setLibraryUpdates(entries);
        cache.clearGroup(CACHE_GROUPS.LIBRARY);
        await loadData();
@@ -407,10 +476,7 @@
        refreshDoneTimer = setTimeout(() => { refreshDone = false; }, 2500);
        showToast(newChapters, totalUpdated);
      },
-      onError() {
-        refreshing = false;
-        cancelUpdate = null;
-      },
+      onError() { refreshing = false; cancelUpdate = null; },
    });
  }

@@ -490,10 +556,11 @@
  class="root"
  role="presentation"
  bind:this={scrollEl}
+  use:rootLongPressAction
  oncontextmenu={(e) => {
    if ((e.target as HTMLElement).closest("button")) return;
    e.preventDefault();
-    emptyCtx = { x: e.clientX, y: e.clientY };
+    emptyCtx = { x: e.clientX - SIDEBAR_W, y: e.clientY - TITLEBAR_H };
  }}
 >
  {#if store.settings.libraryBranches ?? true}
@@ -540,6 +607,7 @@
      {refreshing}
      {refreshProgress}
      {refreshDone}
+      {refreshingCatId}
      {activeDragKind}
      {dragInsertIdx}
      {dragTabId}
@@ -557,6 +625,8 @@
      onSortPanelToggle={() => { sortPanelOpen = !sortPanelOpen; filterPanelOpen = false; }}
      onFilterPanelToggle={() => { filterPanelOpen = !filterPanelOpen; sortPanelOpen = false; }}
      onRefresh={startLibraryRefresh}
+      onCancelRefresh={cancelLibraryRefresh}
+      onRefreshCategory={refreshCategory}
      onOpenDownloadsFolder={openDownloadsFolder}
      onTabDragStart={onTabDragStart}
      onTabDragOver={onTabDragOver}
@@ -588,9 +658,7 @@
      libraryFilter={tab}
      onCardClick={onCardClick}
      onCardContextMenu={openCtx}
-      onCardPointerDown={onCardPointerDown}
-      onCardPointerUp={onCardPointerUp}
-      onCardPointerLeave={onCardPointerLeave}
+      onCardLongPress={cardLongPress}
      onLoadMore={loadMore}
      onRetry={() => retryCount++}
      onExitSelectMode={exitSelectMode}
@@ -1,6 +1,8 @@
 <script lang="ts">
  import { Folder, Trash, CheckSquare, Robot } from "phosphor-svelte";
  import Thumbnail from "@shared/manga/Thumbnail.svelte";
+  import { resolvedCover } from "@core/cover/coverResolver";
+  import { longPress }     from "@core/ui/touchscreen";
  import type { Manga, Category } from "@types";

  interface Props {
@@ -21,9 +23,7 @@
    visibleCategories: Category[];
    onCardClick:        (e: MouseEvent, m: Manga) => void;
    onCardContextMenu:  (e: MouseEvent, m: Manga) => void;
-    onCardPointerDown:  (e: PointerEvent, m: Manga) => void;
-    onCardPointerUp:    () => void;
-    onCardPointerLeave: () => void;
+    onCardLongPress:    (node: HTMLElement, m: Manga) => ReturnType<typeof longPress>;
    onLoadMore:         () => void;
    onRetry:            () => void;
    onExitSelectMode:   () => void;
@@ -37,7 +37,7 @@
    visibleManga, filtered, loading, cols, anims, selectMode, selectedIds,
    hasMore, remainingCount, renderLimit, cropCovers, statsAlways, libraryFilter,
    bulkWorking, visibleCategories,
-    onCardClick, onCardContextMenu, onCardPointerDown, onCardPointerUp, onCardPointerLeave,
+    onCardClick, onCardContextMenu, onCardLongPress,
    onLoadMore, onRetry, onExitSelectMode, onSelectAll, onBulkMove, onBulkRemove, onBulkAutomate,
  }: Props = $props();

@@ -95,7 +95,7 @@
  </div>
 {/if}

-<div class="content" onclick={(e) => { if (selectMode && !(e.target as HTMLElement).closest(".card")) onExitSelectMode(); }}>
+<div class="content" role="presentation" onclick={(e) => { if (selectMode && !(e.target as HTMLElement).closest(".card")) onExitSelectMode(); }}>
  {#if loading}
    <div class="grid">
      {#each Array(12) as _}
@@ -115,20 +115,18 @@
    <div class="grid" style="--cols:{cols}">
      {#each visibleManga as m (m.id)}
        {@const isSelected  = selectedIds.has(m.id)}
-        {@const isCompleted = !m.unreadCount && (m.chapterCount ?? 0) > 0}
+        {@const isCompleted = !m.unreadCount && (m.chapters?.totalCount ?? 0) > 0}
        <button
          class="card"
          class:card-selected={isSelected}
          class:select-mode={selectMode}
          class:anims={anims}
+          use:onCardLongPress={m}
          onclick={(e) => onCardClick(e, m)}
          oncontextmenu={(e) => onCardContextMenu(e, m)}
-          onpointerdown={(e) => onCardPointerDown(e, m)}
-          onpointerup={onCardPointerUp}
-          onpointerleave={onCardPointerLeave}
        >
          <div class="cover-wrap" class:completed={isCompleted}>
-            <Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" style="object-fit:{cropCovers ? 'cover' : 'contain'}" draggable="false" />
+            <Thumbnail src={resolvedCover(m.id, m.thumbnailUrl)} alt={m.title} class="cover" style="object-fit:{cropCovers ? 'cover' : 'contain'}" draggable="false" />
            <div class="card-info-overlay" class:anim={anims} class:instant={!anims} class:always={statsAlways}>
              <div class="overlay-badges">
                {#if isCompleted}
@@ -186,7 +184,6 @@
  .grid { position: relative; z-index: 1; isolation: isolate; display: grid; grid-template-columns: repeat(var(--cols, auto-fill), minmax(130px, 1fr)); gap: var(--sp-4); }
  .card { background: none; border: none; padding: 0; cursor: pointer; text-align: left; }
  .card.anims:not(.select-mode):hover .cover-wrap { transform: translateY(-3px); border-color: var(--border-strong); box-shadow: 0 6px 20px rgba(0,0,0,0.35); }
-  .card.anims:not(.select-mode):hover .cover { filter: brightness(1.1); }
  .card:not(.select-mode):hover .title { color: var(--text-primary); }
  .card.select-mode { cursor: default; }
  .card.card-selected .cover-wrap { outline: 2px solid var(--accent); outline-offset: 2px; border-radius: var(--radius-md); }
@@ -194,8 +191,7 @@
  .cover-wrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); will-change: transform; }
  .card.anims .cover-wrap { transition: transform 0.18s cubic-bezier(0.16,1,0.3,1), border-color var(--t-base), box-shadow 0.18s cubic-bezier(0.16,1,0.3,1); }
  .cover-wrap.completed { box-shadow: inset 0 -2px 0 0 var(--accent); }
-  .card.anims .cover { transition: filter var(--t-base); }
-  .card-info-overlay { position: absolute; bottom: -4px; left: 0; right: 0; padding: 32px 6px 10px; background: linear-gradient(to top, rgba(0,0,0,0.88) 0%, rgba(0,0,0,0.5) 50%, transparent 100%); opacity: 0; pointer-events: none; }
+  .card-info-overlay { position: absolute; bottom: -4px; left: 0; right: 0; z-index: 2; padding: 32px 6px 10px; background: linear-gradient(to top, rgba(0,0,0,0.88) 0%, rgba(0,0,0,0.5) 50%, transparent 100%); opacity: 0; pointer-events: none; }
  .card-info-overlay.anim { transition: opacity 0.18s ease; }
  .card-info-overlay.instant { transition: none; }
  .card-info-overlay.always { opacity: 1; }
@@ -205,7 +201,7 @@
  .badge-unread { background: var(--accent); color: #fff; box-shadow: 0 1px 8px rgba(0,0,0,0.5); }
  .badge-done { background: rgba(255,255,255,0.18); color: rgba(255,255,255,0.9); border: 1px solid rgba(255,255,255,0.25); }
  .badge-dl { background: rgba(0,0,0,0.55); color: rgba(255,255,255,0.8); border: 1px solid rgba(255,255,255,0.18); margin-left: auto; }
-  .select-overlay { position: absolute; inset: 0; background: rgba(0,0,0,0.18); display: flex; align-items: flex-start; justify-content: flex-end; padding: 6px; pointer-events: none; }
+  .select-overlay { position: absolute; inset: 0; z-index: 3; background: rgba(0,0,0,0.18); display: flex; align-items: flex-start; justify-content: flex-end; padding: 6px; pointer-events: none; }
  .select-check { color: var(--text-faint); opacity: 0.7; transition: color var(--t-base), opacity var(--t-base); }
  .select-check.checked { color: var(--accent-fg); opacity: 1; }
  .select-check-empty { width: 20px; height: 20px; border-radius: 4px; border: 2px solid var(--text-faint); background: rgba(0,0,0,0.3); }
@@ -1,7 +1,7 @@
 <script lang="ts">
  import {
    MagnifyingGlass, Books, DownloadSimple, Folder, FolderSimple,
-    SortAscending, CaretUp, CaretDown, ArrowsClockwise, Star,
+    SortAscending, CaretUp, CaretDown, ArrowsClockwise, Star, X,
  } from "phosphor-svelte";
  import LibraryFilters from "./LibraryFilters.svelte";
  import type { Category } from "@types";
@@ -22,6 +22,7 @@
    refreshing:       boolean;
    refreshProgress:  { finished: number; total: number };
    refreshDone:      boolean;
+    refreshingCatId:  number | null;
    activeDragKind:   "tab" | null;
    dragInsertIdx:    number;
    dragTabId:        number | null;
@@ -39,6 +40,8 @@
    onSortPanelToggle:   () => void;
    onFilterPanelToggle: () => void;
    onRefresh:           () => void;
+    onCancelRefresh:     () => void;
+    onRefreshCategory:   (catId: number) => void;
    onOpenDownloadsFolder: () => void;
    onTabDragStart:      (e: DragEvent, cat: Category) => void;
    onTabDragOver:       (e: DragEvent, cat: Category, idx: number) => void;
@@ -50,12 +53,12 @@
  let {
    tab, tabSortMode, tabSortDir, tabStatus, tabFilters, hasActiveFilters,
    anims, tabIndicator, visibleCategories, counts, search, refreshing,
-    refreshProgress, refreshDone, activeDragKind, dragInsertIdx, dragTabId,
-    dragOverTabId, sortPanelOpen, filterPanelOpen,
+    refreshProgress, refreshDone, refreshingCatId, activeDragKind, dragInsertIdx,
+    dragTabId, dragOverTabId, sortPanelOpen, filterPanelOpen,
    tabsEl = $bindable(),
    onSearchChange, onTabChange, onSortChange, onSortDirToggle, onStatusChange,
    onFilterToggle, onFiltersClear, onSortPanelToggle, onFilterPanelToggle,
-    onRefresh, onOpenDownloadsFolder,
+    onRefresh, onCancelRefresh, onRefreshCategory, onOpenDownloadsFolder,
    onTabDragStart, onTabDragOver, onTabDragLeave, onTabDrop, onTabDragEnd,
  }: Props = $props();

@@ -73,7 +76,9 @@
    "az", "unreadCount", "totalChapters", "recentlyAdded", "recentlyRead", "latestFetched", "latestUploaded",
  ];

-
+  const activeCatId = $derived(
+    tab !== "library" && tab !== "downloaded" ? Number(tab) : null
+  );
 </script>

 <div class="header">
@@ -113,6 +118,20 @@
            <Folder size={11} weight="bold" />
            {cat.name}
            <span class="tab-count">{counts[String(cat.id)] ?? 0}</span>
+            {#if tab === String(cat.id) && !refreshing}
+              <span
+                class="tab-refresh"
+                role="button"
+                tabindex="-1"
+                title="Refresh {cat.name}"
+                aria-label="Refresh {cat.name}"
+                class:tab-refresh-spinning={refreshingCatId === cat.id}
+                onclick={(e) => { e.stopPropagation(); onRefreshCategory(cat.id); }}
+                onkeydown={(e) => { if (e.key === "Enter") { e.stopPropagation(); onRefreshCategory(cat.id); } }}
+              >
+                <ArrowsClockwise size={10} weight="bold" class={refreshingCatId === cat.id ? "anim-spin" : ""} />
+              </span>
+            {/if}
          </button>
          {#if dragInsertIdx === idx + 1 && activeDragKind === "tab" && idx === visibleCategories.length - 1}
            <div class="tab-insert-bar" aria-hidden="true"></div>
@@ -128,19 +147,27 @@
      <input class="search" placeholder="Search" value={search} oninput={(e) => onSearchChange((e.target as HTMLInputElement).value)} />
    </div>

+    {#if refreshing}
      <button
-      class="icon-btn refresh-btn"
-      class:icon-btn-active={refreshing}
-      class:refresh-btn-done={refreshDone}
-      title={refreshing ? `Checking… ${refreshProgress.finished}/${refreshProgress.total}` : refreshDone ? "Library updated" : "Check for updates"}
-      disabled={refreshing}
-      onclick={onRefresh}
+        class="icon-btn refresh-btn icon-btn-active"
+        title="Cancel update"
+        onclick={onCancelRefresh}
      >
-      <ArrowsClockwise size={15} weight="bold" class={refreshing ? "anim-spin" : ""} />
-      {#if refreshing && refreshProgress.total > 0}
+        <X size={15} weight="bold" />
+        {#if refreshProgress.total > 0}
          <span class="refresh-progress">{refreshProgress.finished}/{refreshProgress.total}</span>
        {/if}
      </button>
+    {:else}
+      <button
+        class="icon-btn refresh-btn"
+        class:refresh-btn-done={refreshDone}
+        title={refreshDone ? "Library updated" : "Check for updates"}
+        onclick={onRefresh}
+      >
+        <ArrowsClockwise size={15} weight="bold" />
+      </button>
+    {/if}

    <button class="icon-btn" title="Open downloads folder" onclick={onOpenDownloadsFolder}>
      <FolderSimple size={15} weight="bold" />
@@ -214,6 +241,10 @@
  .tab-dragging { opacity: 0.4; cursor: grabbing; }
  .tab-insert-bar { width: 2px; height: 22px; background: var(--accent); border-radius: 2px; flex-shrink: 0; box-shadow: 0 0 6px var(--accent); pointer-events: none; }
  .tab-count { font-size: var(--text-2xs); opacity: 0.6; }
+  .tab-refresh { display: flex; align-items: center; justify-content: center; width: 14px; height: 14px; border-radius: 2px; opacity: 0; color: var(--accent-fg); cursor: pointer; transition: opacity var(--t-base), background var(--t-base); flex-shrink: 0; }
+  .tab.active:hover .tab-refresh { opacity: 0.6; }
+  .tab.active:hover .tab-refresh:hover { opacity: 1; background: var(--accent-dim); }
+  .tab-refresh-spinning { opacity: 1 !important; }
  .search-wrap { position: relative; display: flex; align-items: center; }
  .search-wrap :global(.search-icon) { position: absolute; left: 10px; color: var(--text-faint); pointer-events: none; }
  .search { background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-md); padding: 5px 10px 5px 28px; color: var(--text-primary); font-size: var(--text-sm); width: 180px; outline: none; transition: border-color var(--t-base); }
@@ -223,7 +254,6 @@
  .icon-btn:hover { color: var(--text-primary); border-color: var(--border-strong); }
  .icon-btn-active { color: var(--accent-fg); border-color: var(--accent-dim); background: var(--accent-muted); }
  .refresh-btn { gap: var(--sp-1); width: auto; padding: 0 8px; }
-  .refresh-btn:disabled { cursor: default; }
  .refresh-progress { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--accent-fg); }
  .refresh-btn-done { color: var(--color-success, #5cae6e) !important; border-color: color-mix(in srgb, var(--color-success, #5cae6e) 40%, transparent) !important; background: color-mix(in srgb, var(--color-success, #5cae6e) 10%, transparent) !important; }
  .sort-panel-wrap { position: relative; }
@@ -236,11 +266,6 @@
  .panel-divider { height: 1px; background: var(--border-dim); margin: 4px 2px; }
  .panel-header { display: flex; align-items: center; justify-content: space-between; padding: 6px 10px 4px; }
  .panel-heading { font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); color: var(--text-secondary); font-weight: var(--weight-medium, 500); }
-  .panel-clear-btn { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); color: var(--text-faint); background: none; border: none; cursor: pointer; padding: 0; transition: color var(--t-base); }
-  .panel-clear-btn:hover { color: var(--color-error); }
-  .panel-item-check { justify-content: flex-start; gap: var(--sp-2); }
-  .panel-check { width: 13px; height: 13px; border-radius: 2px; border: 1px solid var(--border-strong); background: transparent; flex-shrink: 0; transition: background var(--t-base), border-color var(--t-base); display: flex; align-items: center; justify-content: center; color: var(--bg-base); }
-  .panel-check-on { background: var(--accent); border-color: var(--accent); }
  .dir-toggle { color: var(--text-secondary); justify-content: flex-start; gap: var(--sp-2); border-top: 1px solid var(--border-dim); border-radius: 0 0 var(--radius-sm) var(--radius-sm); margin-top: 2px; padding-top: 9px; }
  :global(.sort-caret) { flex-shrink: 0; }
 </style>
@@ -16,11 +16,11 @@ export const librarySorter = createSorter<Manga>({
    },
    {
      key: "totalChapters",
-      comparator: (a, b) => (a.chapterCount ?? 0) - (b.chapterCount ?? 0),
+      comparator: (a, b) => (a.chapters?.totalCount ?? 0) - (b.chapters?.totalCount ?? 0),
    },
    {
      key: "recentlyAdded",
-      comparator: (a, b) => a.id - b.id,
+      comparator: (a, b) => Number(a.inLibraryAt ?? 0) - Number(b.inLibraryAt ?? 0),
    },
    {
      key: "recentlyRead",
@@ -33,11 +33,11 @@ export const librarySorter = createSorter<Manga>({
    },
    {
      key: "latestFetched",
-      comparator: (a, b) => a.id - b.id,
+      comparator: (a, b) => Number(a.latestFetchedChapter?.uploadDate ?? 0) - Number(b.latestFetchedChapter?.uploadDate ?? 0),
    },
    {
      key: "latestUploaded",
-      comparator: (a, b) => a.id - b.id,
+      comparator: (a, b) => Number(a.latestUploadedChapter?.uploadDate ?? 0) - Number(b.latestUploadedChapter?.uploadDate ?? 0),
    },
  ],
 });
@@ -1,15 +1,17 @@
 import { gql } from "@api/client";
 import { LIBRARY_UPDATE_STATUS } from "@api/queries/manga";
-import { UPDATE_LIBRARY } from "@api/mutations/manga";
-import { GET_RECENTLY_UPDATED } from "@api/queries/chapters";
+import { UPDATE_LIBRARY, FETCH_MANGA } from "@api/mutations/manga";
+import { GET_LIBRARY } from "@api/queries/manga";
 import type { LibraryUpdateEntry } from "@store/state.svelte";

-const POLL_INTERVAL_MS = 3000;
-const POLL_INITIAL_MS  = 2000;
+const POLL_INTERVAL_MS = 2000;
+const POLL_INITIAL_MS  = 500;

 export interface UpdateProgress {
  finished:      number;
  total:         number;
+  skippedManga:  number;
+  skippedCategories: number;
 }

 export interface UpdateResult {
@@ -21,89 +23,138 @@ export interface UpdateResult {
 export interface LibraryUpdaterCallbacks {
  onProgress: (p: UpdateProgress) => void;
  onDone:     (r: UpdateResult)   => void;
-  onError:    ()                  => void;
+  onError:    (e?: unknown)       => void;
+}
+
+export async function refreshLibraryMetadata(
+  onProgress?: (done: number, total: number) => void,
+): Promise<void> {
+  const data = await gql<{ mangas: { nodes: { id: number }[] } }>(GET_LIBRARY, {});
+  const ids = data.mangas.nodes.map(m => m.id);
+  let done = 0;
+  for (const id of ids) {
+    try {
+      await gql(FETCH_MANGA, { id });
+    } catch {}
+    onProgress?.(++done, ids.length);
+  }
 }

 export function startLibraryUpdate(callbacks: LibraryUpdaterCallbacks): () => void {
  let timer:    ReturnType<typeof setTimeout> | null = null;
  let cancelled = false;
-  const startedAt = Math.floor(Date.now() / 1000);

  function cancel() {
    cancelled = true;
    if (timer) { clearTimeout(timer); timer = null; }
  }

+  function buildEntries(
+    mangaUpdates: { status: string; manga: { id: number; title: string; thumbnailUrl: string; unreadCount: number } }[]
+  ): LibraryUpdateEntry[] {
+    const byManga = new Map<number, LibraryUpdateEntry>();
+    for (const u of mangaUpdates) {
+      if (u.status !== "UPDATED") continue;
+      const existing = byManga.get(u.manga.id);
+      if (existing) {
+        existing.newChapters++;
+      } else {
+        byManga.set(u.manga.id, {
+          mangaId:      u.manga.id,
+          mangaTitle:   u.manga.title,
+          thumbnailUrl: u.manga.thumbnailUrl,
+          newChapters:  1,
+          checkedAt:    Date.now(),
+        });
+      }
+    }
+    return [...byManga.values()];
+  }
+
  async function run() {
-    let seenWork = false;
+    let jobsStarted = false;

    try {
      const res = await gql<{
-        updateLibrary: { updateStatus: { jobsInfo: { isRunning: boolean; totalJobs: number } } }
+        updateLibrary: {
+          updateStatus: {
+            jobsInfo: {
+              isRunning:             boolean;
+              totalJobs:             number;
+              finishedJobs:          number;
+              skippedMangasCount:    number;
+              skippedCategoriesCount: number;
+            }
+          }
+        }
      }>(UPDATE_LIBRARY, {});
      if (cancelled) return;
-      seenWork = res.updateLibrary.updateStatus.jobsInfo.totalJobs > 0;
-    } catch {
-      if (!cancelled) callbacks.onError();
+
+      const { jobsInfo } = res.updateLibrary.updateStatus;
+      jobsStarted = jobsInfo.totalJobs > 0;
+
+      callbacks.onProgress({
+        finished:          jobsInfo.finishedJobs,
+        total:             jobsInfo.totalJobs,
+        skippedManga:      jobsInfo.skippedMangasCount,
+        skippedCategories: jobsInfo.skippedCategoriesCount,
+      });
+
+      if (!jobsStarted) {
+        callbacks.onDone({ entries: [], totalUpdated: 0, newChapters: 0 });
+        return;
+      }
+
+      if (jobsStarted && !jobsInfo.isRunning) {
+        callbacks.onDone({ entries: [], totalUpdated: 0, newChapters: 0 });
+        return;
+      }
+    } catch (e) {
+      console.error("[libraryUpdater] failed to start update", e);
+      if (!cancelled) callbacks.onError(e);
      return;
    }

    function poll() {
      gql<{
        libraryUpdateStatus: {
-          jobsInfo:     { isRunning: boolean; finishedJobs: number; totalJobs: number };
-          mangaUpdates: { status: string; manga: { id: number } }[];
+          jobsInfo: {
+            isRunning:             boolean;
+            finishedJobs:          number;
+            totalJobs:             number;
+            skippedMangasCount:    number;
+            skippedCategoriesCount: number;
+          };
+          mangaUpdates: {
+            status: string;
+            manga: { id: number; title: string; thumbnailUrl: string; unreadCount: number };
+          }[];
        }
      }>(LIBRARY_UPDATE_STATUS, {})
        .then(async d => {
          if (cancelled) return;
-          const { jobsInfo } = d.libraryUpdateStatus;
+          const { jobsInfo, mangaUpdates } = d.libraryUpdateStatus;

-          if (jobsInfo.totalJobs > 0) seenWork = true;
-          callbacks.onProgress({ finished: jobsInfo.finishedJobs, total: jobsInfo.totalJobs });
-
-          if (!jobsInfo.isRunning && seenWork) {
-            const recent = await gql<{
-              chapters: {
-                nodes: {
-                  mangaId:  number;
-                  fetchedAt: string;
-                  manga: { id: number; title: string; thumbnailUrl: string; inLibrary: boolean };
-                }[]
-              }
-            }>(GET_RECENTLY_UPDATED, {}).catch(() => ({ chapters: { nodes: [] } }));
-
-            if (cancelled) return;
-
-            const byManga = new Map<number, LibraryUpdateEntry>();
-            for (const ch of recent.chapters.nodes) {
-              if (!ch.manga.inLibrary) continue;
-              if (Number(ch.fetchedAt) < startedAt) continue;
-              const existing = byManga.get(ch.mangaId);
-              if (existing) {
-                existing.newChapters++;
-              } else {
-                byManga.set(ch.mangaId, {
-                  mangaId:      ch.mangaId,
-                  mangaTitle:   ch.manga.title,
-                  thumbnailUrl: ch.manga.thumbnailUrl,
-                  newChapters:  1,
-                  checkedAt:    Date.now(),
+          if (jobsInfo.totalJobs > 0) jobsStarted = true;
+          callbacks.onProgress({
+            finished:          jobsInfo.finishedJobs,
+            total:             jobsInfo.totalJobs,
+            skippedManga:      jobsInfo.skippedMangasCount,
+            skippedCategories: jobsInfo.skippedCategoriesCount,
          });
-              }
-            }

-            const entries     = [...byManga.values()];
+          if (!jobsInfo.isRunning && jobsStarted) {
+            const entries     = buildEntries(mangaUpdates);
            const newChapters = entries.reduce((s, e) => s + e.newChapters, 0);
-
            callbacks.onDone({ entries, totalUpdated: entries.length, newChapters });
            return;
          }

          timer = setTimeout(poll, POLL_INTERVAL_MS);
        })
-        .catch(() => {
-          if (!cancelled) callbacks.onError();
+        .catch((e) => {
+          console.error("[libraryUpdater] poll error", e);
+          if (!cancelled) callbacks.onError(e);
        });
    }

@@ -63,7 +63,7 @@
  let inspectPanStartX  = 0;
  let inspectPanStartY  = 0;

-  let stripDragging    = false;
+  let stripDragging    = $state(false);
  let stripDragMoved   = false;
  let stripDragStartY  = 0;
  let stripScrollStart = 0;
@@ -139,7 +139,7 @@
  let containerEl: HTMLDivElement | null = null;
  let pageViewRef: PageView;
  let zoomAnchor = { el: null as HTMLElement | null, offset: 0 };
-  let hideTimer: ReturnType<typeof setTimeout> | null = null;
+  let hideTimer = $state<ReturnType<typeof setTimeout> | null>(null);
  let markedRead  = new Set<number>();
  let appending   = false;
  let abortCtrl   = { current: null as AbortController | null };
@@ -306,6 +306,7 @@
      {#if readerState.winOpen}
        <div
          class="wc-clip wc-clip-{popoverSide}"
+          role="presentation"
          onmouseenter={wcResetTimer}
          onmousemove={wcResetTimer}
        >
@@ -108,7 +108,7 @@
  ];
 </script>

-<div class="backdrop" role="presentation" onclick={close} transition:fade={{ duration: 150 }}></div>
+<div class="backdrop" role="button" tabindex="-1" aria-label="Close settings" onclick={close} onkeydown={(e) => e.key === 'Escape' && close()} transition:fade={{ duration: 150 }}></div>

 <div
  class="panel"
@@ -130,12 +130,13 @@
      <p class="section-label">Page Style</p>
      <div class="option-grid">
        {#each styleOptions as o}
+          {@const Icon = o.icon}
          <button
            class="option-tile"
            class:active={style === o.value}
            onclick={() => onApplySettings({ pageStyle: o.value as typeof PAGE_STYLES[number] })}
          >
-            <div class="tile-icon"><svelte:component this={o.icon} size={18} weight={style === o.value ? "fill" : "light"} /></div>
+            <div class="tile-icon"><Icon size={18} weight={style === o.value ? "fill" : "light"} /></div>
            <span class="tile-label">{o.label}</span>
          </button>
        {/each}
@@ -149,6 +150,7 @@
            class:on={effectiveSettings.offsetDoubleSpreads}
            onclick={() => onApplySettings({ offsetDoubleSpreads: !effectiveSettings.offsetDoubleSpreads })}
            role="switch"
+            aria-label="Offset double spreads"
            aria-checked={effectiveSettings.offsetDoubleSpreads}
          ><span class="toggle-knob"></span></button>
        </label>
@@ -161,6 +163,7 @@
            class:on={effectiveSettings.pageGap ?? true}
            onclick={() => onApplySettings({ pageGap: !(effectiveSettings.pageGap ?? true) })}
            role="switch"
+            aria-label="Gap between pages"
            aria-checked={effectiveSettings.pageGap ?? true}
          ><span class="toggle-knob"></span></button>
        </label>
@@ -171,6 +174,7 @@
            class:on={store.settings.autoNextChapter ?? false}
            onclick={() => updateSettings({ autoNextChapter: !(store.settings.autoNextChapter ?? false) })}
            role="switch"
+            aria-label="Auto next chapter"
            aria-checked={store.settings.autoNextChapter ?? false}
          ><span class="toggle-knob"></span></button>
        </label>
@@ -181,12 +185,13 @@
      <p class="section-label">Fit Mode</p>
      <div class="option-grid">
        {#each fitOptions as o}
+          {@const Icon = o.icon}
          <button
            class="option-tile"
            class:active={fit === o.value}
            onclick={() => onApplySettings({ fitMode: o.value })}
          >
-            <div class="tile-icon"><svelte:component this={o.icon} size={18} weight={fit === o.value ? "fill" : "light"} /></div>
+            <div class="tile-icon"><Icon size={18} weight={fit === o.value ? "fill" : "light"} /></div>
            <span class="tile-label">{o.label}</span>
          </button>
        {/each}
@@ -240,7 +245,7 @@
        <span class="zoom-readout">{zoomPct}%</span>
      </div>
      <div class="zoom-row">
-        <button class="zoom-step" onclick={() => setZoom(zoom - 0.1)} disabled={zoom <= ZOOM_MIN}>−</button>
+        <button class="zoom-step" aria-label="Zoom out" onclick={() => setZoom(zoom - 0.1)} disabled={zoom <= ZOOM_MIN}>−</button>
        <input
          type="range"
          class="zoom-slider"
@@ -250,7 +255,7 @@
          value={zoomPct}
          oninput={(e) => setZoom(Number(e.currentTarget.value) / 100)}
        />
-        <button class="zoom-step" onclick={() => setZoom(zoom + 0.1)} disabled={zoom >= ZOOM_MAX}>+</button>
+        <button class="zoom-step" aria-label="Zoom in" onclick={() => setZoom(zoom + 0.1)} disabled={zoom >= ZOOM_MAX}>+</button>
      </div>
    </section>

@@ -263,6 +268,7 @@
          class:on={effectiveSettings.optimizeContrast}
          onclick={() => onApplySettings({ optimizeContrast: !effectiveSettings.optimizeContrast })}
          role="switch"
+          aria-label="Optimize contrast"
          aria-checked={effectiveSettings.optimizeContrast}
        ><span class="toggle-knob"></span></button>
      </label>
@@ -273,6 +279,7 @@
          class:on={store.settings.pinchZoom ?? false}
          onclick={() => updateSettings({ pinchZoom: !(store.settings.pinchZoom ?? false) })}
          role="switch"
+          aria-label="Pinch to zoom"
          aria-checked={store.settings.pinchZoom ?? false}
        ><span class="toggle-knob"></span></button>
      </label>
@@ -283,6 +290,7 @@
          class:on={store.settings.markReadOnNext ?? true}
          onclick={() => updateSettings({ markReadOnNext: !(store.settings.markReadOnNext ?? true) })}
          role="switch"
+          aria-label="Mark read on chapter advance"
          aria-checked={store.settings.markReadOnNext ?? true}
        ><span class="toggle-knob"></span></button>
      </label>
@@ -297,6 +305,7 @@
            class:on={perMangaEnabled}
            onclick={onTogglePerManga}
            role="switch"
+            aria-label="Per-manga settings"
            aria-checked={perMangaEnabled}
          ><span class="toggle-knob"></span></button>
        </label>
@@ -319,8 +328,8 @@
            bind:value={presetNameInput}
            onkeydown={(e) => { if (e.key === "Enter") commitSavePreset(); if (e.key === "Escape") presetSaving = false; }}
          />
-          <button class="small-btn" disabled={!presetNameInput.trim()} onclick={commitSavePreset}><Check size={12} weight="bold" /></button>
-          <button class="small-btn" onclick={() => presetSaving = false}><X size={12} weight="light" /></button>
+          <button class="small-btn" aria-label="Confirm" disabled={!presetNameInput.trim()} onclick={commitSavePreset}><Check size={12} weight="bold" /></button>
+          <button class="small-btn" aria-label="Cancel" onclick={() => presetSaving = false}><X size={12} weight="light" /></button>
        </div>
      {/if}

@@ -336,8 +345,8 @@
                  bind:value={presetEditName}
                  onkeydown={(e) => { if (e.key === "Enter") commitRenamePreset(); if (e.key === "Escape") presetEditId = null; }}
                />
-                <button class="small-btn" disabled={!presetEditName.trim()} onclick={commitRenamePreset}><Check size={12} weight="bold" /></button>
-                <button class="small-btn" onclick={() => presetEditId = null}><X size={12} weight="light" /></button>
+                <button class="small-btn" aria-label="Confirm" disabled={!presetEditName.trim()} onclick={commitRenamePreset}><Check size={12} weight="bold" /></button>
+                <button class="small-btn" aria-label="Cancel" onclick={() => presetEditId = null}><X size={12} weight="light" /></button>
              </div>
            {:else}
              <div class="preset-row">
@@ -1,3 +1,4 @@
+import { createPinchGesture } from "@core/ui/touchscreen";
 import { clampZoom } from "./zoomHelpers";
 import { ZOOM_MIN, ZOOM_MAX } from "../store/readerState.svelte";

@@ -10,69 +11,33 @@ export interface PinchTrackerOptions {
  isLongstrip:     () => boolean;
 }

-export interface PinchTracker {
-  onPointerDown: (e: PointerEvent) => void;
-  onPointerMove: (e: PointerEvent) => void;
-  onPointerUp:   (e: PointerEvent) => void;
-  isPinching:    () => boolean;
-}
+export type { PinchGesture as PinchTracker } from "@core/ui/touchscreen";

 const INSPECT_ZOOM_MAX = 8;

-export function createPinchTracker(opts: PinchTrackerOptions): PinchTracker {
-  const pointers = new Map<number, { x: number; y: number }>();
-  let startDist    = 0;
+export function createPinchTracker(opts: PinchTrackerOptions) {
  let startZoom    = 0;
  let startInspect = 0;
-  let pinching     = false;

-  function dist(a: { x: number; y: number }, b: { x: number; y: number }): number {
-    return Math.hypot(b.x - a.x, b.y - a.y);
-  }
-
-  function onPointerDown(e: PointerEvent) {
-    pointers.set(e.pointerId, { x: e.clientX, y: e.clientY });
-    if (pointers.size === 2) {
-      const [a, b] = [...pointers.values()];
-      startDist    = dist(a, b);
+  return createPinchGesture({
+    onPinch(scale) {
+      if (startZoom === 0) {
        startZoom    = opts.getZoom();
        startInspect = opts.getInspectScale();
-      pinching     = true;
      }
-  }
-
-  function onPointerMove(e: PointerEvent) {
-    if (!pinching || !pointers.has(e.pointerId)) return;
-    pointers.set(e.pointerId, { x: e.clientX, y: e.clientY });
-    if (pointers.size < 2) return;
-
-    const [a, b]   = [...pointers.values()];
-    const current  = dist(a, b);
-    if (startDist === 0) return;
-    const ratio    = current / startDist;
-
      if (opts.isLongstrip()) {
-      opts.setZoom(clampZoom(startZoom * ratio));
+        opts.setZoom(clampZoom(startZoom * scale));
      } else {
-      const next = Math.max(1, Math.min(INSPECT_ZOOM_MAX, startInspect * ratio));
+        const next = Math.max(1, Math.min(INSPECT_ZOOM_MAX, startInspect * scale));
        if (next !== opts.getInspectScale()) {
          if (next === 1) opts.resetInspectPan();
          opts.setInspectScale(next);
        }
      }
-  }
-
-  function onPointerUp(e: PointerEvent) {
-    pointers.delete(e.pointerId);
-    if (pointers.size < 2) {
-      pinching     = false;
-      startDist    = 0;
+    },
+    onPinchEnd() {
      startZoom    = 0;
      startInspect = 0;
-    }
-  }
-
-  function isPinching() { return pinching; }
-
-  return { onPointerDown, onPointerMove, onPointerUp, isPinching };
+    },
+  });
 }
@@ -2,6 +2,7 @@
  import { Download, CheckCircle, Circle, CircleNotch, Trash } from "phosphor-svelte";
  import ContextMenu from "@shared/ui/ContextMenu.svelte";
  import type { MenuEntry } from "@shared/ui/ContextMenu.svelte";
+  import { longPress } from "@core/ui/touchscreen";
  import type { Chapter } from "@types";

  interface Props {
@@ -32,6 +33,13 @@

  const hasSelection = $derived(selectedIds.size > 0);

+  function chapterLongPress(node: HTMLElement, param: [Chapter, number]) {
+    const [ch, idx] = param;
+    return longPress(node, {
+      onLongPress(e) { ctx = { x: e.clientX, y: e.clientY, chapter: ch, idx }; },
+    });
+  }
+
  function formatDate(ts: string | null | undefined): string {
    if (!ts) return "";
    const n = Number(ts);
@@ -58,9 +66,11 @@
      {@const inProgress     = !ch.isRead && (ch.lastPageRead ?? 0) > 0}
      {@const isGridSelected = selectedIds.has(ch.id)}
      <button class="grid-cell" class:read={ch.isRead} class:in-progress={inProgress} class:grid-selected={isGridSelected}
+        use:chapterLongPress={[ch, i]}
        onclick={(e) => hasSelection ? onToggleSelect(ch.id, e) : onOpen(ch, inProgress)}
        oncontextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, chapter: ch, idx: i }; }}
-        title={ch.name}>
+        title={ch.name}
+        >{#if isGridSelected}<span class="grid-cell-check">✓</span>{/if}
        <span class="grid-cell-num">{ch.chapterNumber % 1 === 0 ? ch.chapterNumber.toFixed(0) : ch.chapterNumber}</span>
        {#if ch.isDownloaded}<span class="grid-cell-dl" title="Downloaded"></span>{/if}
        {#if ch.isRead}<span class="grid-cell-dot"></span>{/if}
@@ -74,6 +84,7 @@
      {@const isSelected   = selectedIds.has(ch.id)}
      {@const chInProgress = !ch.isRead && (ch.lastPageRead ?? 0) > 0}
      <div role="button" tabindex="0" class="ch-row" class:read={ch.isRead} class:ch-selected={isSelected}
+        use:chapterLongPress={[ch, idxInSorted]}
        onclick={(e) => hasSelection ? onToggleSelect(ch.id, e) : onOpen(ch, chInProgress)}
        onkeydown={(e) => e.key === "Enter" && (hasSelection ? onToggleSelect(ch.id, e) : onOpen(ch, chInProgress))}
        oncontextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, chapter: ch, idx: idxInSorted }; }}>
@@ -164,6 +175,7 @@
  .grid-cell-spinner { position: absolute; top: 2px; right: 2px; }
  .grid-cell-skeleton { aspect-ratio: 1; border-radius: var(--radius-sm); }
  .grid-selected { background: var(--accent-muted) !important; border-color: var(--accent-dim) !important; }
+  .grid-cell-check { position: absolute; inset: 0; display: flex; align-items: center; justify-content: center; font-size: 14px; color: var(--accent-fg); pointer-events: none; }

  .pagination-bottom { display: flex; align-items: center; justify-content: center; gap: var(--sp-2); padding: var(--sp-3); border-top: 1px solid var(--border-dim); flex-shrink: 0; }
  .page-btn { font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); padding: 4px 10px; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); color: var(--text-faint); background: none; cursor: pointer; transition: color var(--t-base), border-color var(--t-base); }
@@ -3,8 +3,8 @@
  import { gql }               from "@api/client";
  import Thumbnail       from "@shared/manga/Thumbnail.svelte";
  import {
-    X, CheckCircle, Circle, ArrowFatLinesUp, ArrowFatLinesDown,
-    ArrowFatLineUp, ArrowFatLineDown, Download, Trash, DownloadSimple,
+    CheckCircle, Circle, ArrowFatLinesUp, ArrowFatLinesDown,
+    ArrowFatLineUp, ArrowFatLineDown, Download, Trash, DownloadSimple, CheckSquare,
  } from "phosphor-svelte";
  import { GET_MANGA, GET_ALL_MANGA, GET_CATEGORIES } from "@api/queries/manga";
  import { GET_CHAPTERS } from "@api/queries/chapters";
@@ -13,7 +13,7 @@
  import { ENQUEUE_DOWNLOAD, ENQUEUE_CHAPTERS_DOWNLOAD } from "@api/mutations/downloads";
  import { cache, CACHE_KEYS, recordSourceAccess } from "@core/cache";
  import {
-    store, addToast, openReader, setActiveManga, linkManga, unlinkManga,
+    store, addToast, openReader, setActiveManga,
    addBookmark, acknowledgeUpdate,
    checkAndMarkCompleted as storeCheckAndMarkCompleted,
    clearMarkersForManga,
@@ -28,11 +28,14 @@
  import TrackingPanel   from "../panels/TrackingPanel.svelte";
  import AutomationPanel from "../panels/AutomationPanel.svelte";
  import MarkersPanel    from "../panels/MarkersPanel.svelte";
+  import CoverPickerPanel  from "../panels/CoverPickerPanel.svelte";
+  import SeriesLinkPanel   from "../panels/SeriesLinkPanel.svelte";
  import SeriesHeader    from "./SeriesHeader.svelte";
  import SeriesActions   from "./SeriesActions.svelte";
  import ChapterList     from "./ChapterList.svelte";
  import { buildChapterList, chaptersAscending } from "../lib/chapterList";
  import { getPref, setPref } from "../lib/mangaPrefs";
+  import { autoLinkLibrary } from "@core/cover/autoLink";

  const CHAPTERS_PER_PAGE = 25;
  const MANGA_TTL_MS      = 5 * 60 * 1000;
@@ -57,7 +60,7 @@
  let trackingOpen:    boolean      = $state(false);
  let markersOpen:     boolean      = $state(false);
  let linkPickerOpen:  boolean      = $state(false);
-  let linkSearch:      string       = $state("");
+  let coverPickerOpen: boolean      = $state(false);
  let allMangaForLink: Manga[]      = $state([]);
  let loadingLinkList: boolean      = $state(false);
  let mangaCategories: Category[]   = $state([]);
@@ -138,16 +141,6 @@
    store.activeManga ? (store.settings.mangaLinks?.[store.activeManga.id] ?? []) : []
  );

-  const linkPickerResults = $derived.by(() => {
-    const id       = store.activeManga?.id;
-    const others   = allMangaForLink.filter(m => m.id !== id);
-    const q        = linkSearch.trim().toLowerCase();
-    const filtered = q ? others.filter(m => m.title.toLowerCase().includes(q)) : others;
-    const linked   = filtered.filter(m => linkedIds.includes(m.id));
-    const rest     = filtered.filter(m => !linkedIds.includes(m.id)).slice(0, 30);
-    return [...linked, ...rest];
-  });
-
  function focusOnMount(node: HTMLElement) { node.focus(); }

  function clearSelection() { selectedIds = new Set(); }
@@ -269,6 +262,7 @@

  $effect(() => {
    const m = store.activeManga;
+    const shouldAutoLink = store.settings.autoLinkOnOpen;
    if (m) untrack(() => {
      acknowledgeUpdate(m.id);
      loadManga(m.id);
@@ -277,6 +271,22 @@
      trackingState.loadForManga(m.id).then(() => {
        syncTrackersIntoChapters(m.id, chapters);
      });
+      if (shouldAutoLink) {
+        if (allMangaForLink.length) {
+          autoLinkLibrary(m, allMangaForLink)
+            .then(n => { if (n > 0) addToast({ kind: "success", title: "Series linked", body: `${n} new link${n === 1 ? "" : "s"} found` }); });
+        } else {
+          loadingLinkList = true;
+          gql<{ mangas: { nodes: Manga[] } }>(GET_ALL_MANGA)
+            .then(d => {
+              allMangaForLink = d.mangas.nodes;
+              return autoLinkLibrary(m, d.mangas.nodes);
+            })
+            .then(n => { if (n > 0) addToast({ kind: "success", title: "Series linked", body: `${n} new link${n === 1 ? "" : "s"} found` }); })
+            .catch(console.error)
+            .finally(() => { loadingLinkList = false; });
+        }
+      }
    });
  });

@@ -442,6 +452,7 @@
    const above = sortedChapters.slice(0, idx + 1), below = sortedChapters.slice(idx), last = sortedChapters.length - 1;
    return [
      { label: ch.isRead ? "Mark as unread" : "Mark as read", icon: ch.isRead ? Circle : CheckCircle, onClick: () => markRead(ch.id, !ch.isRead) },
+      { label: "Select", icon: CheckSquare, onClick: () => { const next = new Set(selectedIds); next.add(ch.id); selectedIds = next; } },
      { separator: true },
      { label: "Mark above as read",   icon: ArrowFatLinesUp,   onClick: () => markAboveRead(idx),   disabled: above.filter(c => !c.isRead).length === 0 },
      { label: "Mark above as unread", icon: ArrowFatLineUp,    onClick: () => markAboveUnread(idx), disabled: above.filter(c => c.isRead).length === 0 },
@@ -519,7 +530,7 @@
  }

  async function openLinkPicker() {
-    linkPickerOpen = true; linkSearch = "";
+    linkPickerOpen = true;
    if (allMangaForLink.length) return;
    loadingLinkList = true;
    gql<{ mangas: { nodes: Manga[] } }>(GET_ALL_MANGA)
@@ -528,12 +539,16 @@
      .finally(() => { loadingLinkList = false; });
  }

-  function closeLinkPicker() { linkPickerOpen = false; linkSearch = ""; }
+  function closeLinkPicker() { linkPickerOpen = false; }

-  function handleLink(other: Manga) {
-    if (!store.activeManga) return;
-    if (linkedIds.includes(other.id)) unlinkManga(store.activeManga.id, other.id);
-    else linkManga(store.activeManga.id, other.id);
+  async function openCoverPicker() {
+    coverPickerOpen = true;
+    if (allMangaForLink.length) return;
+    loadingLinkList = true;
+    gql<{ mangas: { nodes: Manga[] } }>(GET_ALL_MANGA)
+      .then(d => { allMangaForLink = d.mangas.nodes; })
+      .catch(console.error)
+      .finally(() => { loadingLinkList = false; });
  }

  async function toggleCategory(cat: Category) {
@@ -598,6 +613,7 @@
    onAutoOpen={() => autoOpen = true}
    onMarkersToggle={() => markersOpen = !markersOpen}
    onLinkPickerOpen={openLinkPicker}
+    onCoverPickerOpen={openCoverPicker}
  />

  <div class="list-wrap">
@@ -684,40 +700,20 @@
  </div>
 {/if}

-{#if linkPickerOpen}
-  <div class="link-backdrop" role="presentation"
-    onclick={(e) => { if (e.target === e.currentTarget) closeLinkPicker(); }}
-    onkeydown={(e) => e.key === "Escape" && closeLinkPicker()}>
-    <div class="link-modal">
-      <div class="link-header">
-        <span class="link-title">Link as same series</span>
-        <button class="link-close" onclick={closeLinkPicker}><X size={14} weight="light" /></button>
-      </div>
-      <p class="link-hint">Mark two manga as the same series so duplicates are merged in search. Click a linked entry again to unlink.</p>
-      <div class="link-search-wrap">
-        <input class="link-search" placeholder="Search your library…" bind:value={linkSearch} use:focusOnMount />
-      </div>
-      <div class="link-list">
-        {#if loadingLinkList}
-          <p class="link-empty">Loading…</p>
-        {:else if linkPickerResults.length === 0}
-          <p class="link-empty">No results</p>
-        {:else}
-          {#each linkPickerResults as m (m.id)}
-            {@const isLinked = linkedIds.includes(m.id)}
-            <button class="link-row" class:link-row-linked={isLinked} onclick={() => handleLink(m)}>
-              <Thumbnail src={m.thumbnailUrl} alt={m.title} class="link-thumb" />
-              <div class="link-info">
-                <span class="link-manga-title">{m.title}</span>
-                {#if m.source?.displayName}<span class="link-source">{m.source.displayName}</span>{/if}
-              </div>
-              <span class="link-status">{isLinked ? "✓ Linked" : "Link"}</span>
-            </button>
-          {/each}
-        {/if}
-      </div>
-    </div>
-  </div>
+{#if coverPickerOpen && store.activeManga}
+  <CoverPickerPanel
+    manga={manga ?? store.activeManga}
+    allManga={allMangaForLink}
+    onClose={() => coverPickerOpen = false}
+  />
+{/if}
+
+{#if linkPickerOpen && store.activeManga}
+  <SeriesLinkPanel
+    manga={manga ?? store.activeManga}
+    allManga={allMangaForLink}
+    onClose={closeLinkPicker}
+  />
 {/if}
 {/if}

@@ -731,82 +727,6 @@

  .list-wrap { flex: 1; display: flex; flex-direction: column; overflow: hidden; }

-  .link-backdrop {
-    position: fixed;
-    inset: 0;
-    background: rgba(0,0,0,0.72);
-    z-index: var(--z-settings);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    backdrop-filter: blur(4px);
-    -webkit-backdrop-filter: blur(4px);
-    animation: fadeIn 0.12s ease both;
-  }
-  .link-modal {
-    width: min(460px, calc(100vw - 48px));
-    max-height: 70vh;
-    display: flex;
-    flex-direction: column;
-    background: var(--bg-surface);
-    border: 1px solid var(--border-base);
-    border-radius: var(--radius-xl);
-    overflow: hidden;
-    box-shadow: 0 24px 64px rgba(0,0,0,0.6);
-    animation: scaleIn 0.14s ease both;
-  }
-  .link-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: var(--sp-4) var(--sp-5);
-    border-bottom: 1px solid var(--border-dim);
-    flex-shrink: 0;
-  }
-  .link-title { font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-secondary); }
-  .link-close {
-    display: flex; align-items: center; justify-content: center;
-    width: 28px; height: 28px; border-radius: var(--radius-sm);
-    color: var(--text-faint); background: none; border: none; cursor: pointer;
-    transition: color var(--t-base), background var(--t-base);
-  }
-  .link-close:hover { color: var(--text-muted); background: var(--bg-raised); }
-  .link-hint {
-    font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint);
-    letter-spacing: var(--tracking-wide); line-height: var(--leading-snug);
-    padding: var(--sp-3) var(--sp-5) 0; flex-shrink: 0;
-  }
-  .link-search-wrap { padding: var(--sp-3) var(--sp-4); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; }
-  .link-search {
-    width: 100%; background: var(--bg-raised); border: 1px solid var(--border-dim);
-    border-radius: var(--radius-md); padding: 6px 10px; color: var(--text-primary);
-    font-size: var(--text-sm); outline: none; transition: border-color var(--t-base);
-  }
-  .link-search:focus { border-color: var(--border-strong); }
-  .link-list { flex: 1; overflow-y: auto; padding: var(--sp-2); scrollbar-width: none; }
-  .link-list::-webkit-scrollbar { display: none; }
-  .link-empty {
-    font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint);
-    padding: var(--sp-4) var(--sp-3); text-align: center; letter-spacing: var(--tracking-wide);
-  }
-  .link-row {
-    display: flex; align-items: center; gap: var(--sp-3); width: 100%;
-    padding: 8px var(--sp-3); border-radius: var(--radius-md); border: none;
-    background: none; text-align: left; cursor: pointer; transition: background var(--t-fast);
-  }
-  .link-row:hover { background: var(--bg-raised); }
-  .link-row-linked { background: var(--accent-muted) !important; }
-  :global(.link-thumb) { width: 34px; height: 48px; border-radius: var(--radius-sm); object-fit: cover; flex-shrink: 0; border: 1px solid var(--border-dim); }
-  .link-info { flex: 1; display: flex; flex-direction: column; gap: 2px; overflow: hidden; min-width: 0; }
-  .link-manga-title { font-size: var(--text-sm); color: var(--text-secondary); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-  .link-source { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
-  .link-status {
-    font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide);
-    color: var(--text-faint); flex-shrink: 0; padding: 2px 8px;
-    border-radius: var(--radius-sm); border: 1px solid var(--border-dim);
-  }
-  .link-row-linked .link-status { color: var(--accent-fg); border-color: var(--accent-dim); background: var(--accent-muted); }
-
  .markers-panel-overlay {
    position: fixed; inset: 0; z-index: var(--z-settings);
    display: flex; align-items: stretch; justify-content: flex-start;
@@ -2,9 +2,10 @@
  import {
    ArrowLeft, BookmarkSimple, ArrowSquareOut, Play, CaretDown,
    Eye, ArrowsClockwise, LinkSimpleHorizontalBreak, ChartLineUp,
-    MapPin, Gear, Trash, X,
+    MapPin, Gear, Trash, Image,
  } from "phosphor-svelte";
  import Thumbnail   from "@shared/manga/Thumbnail.svelte";
+  import { resolvedCover } from "@core/cover/coverResolver";
  import type { Manga, Chapter, Category } from "@types";
  import type { MangaPrefs } from "@store/state.svelte";
  import { store, setActiveManga, setGenreFilter, setNavPage, setPreviewManga, linkManga, unlinkManga } from "@store/state.svelte";
@@ -38,6 +39,7 @@
    onAutoOpen:       () => void;
    onMarkersToggle:  () => void;
    onLinkPickerOpen: () => void;
+    onCoverPickerOpen: () => void;
    togglingLibrary:  boolean;
  }

@@ -48,7 +50,7 @@
    mangaCategories,
    onRead, onToggleLibrary, onDeleteAll, onMigrateOpen,
    onTrackingOpen, onAutoOpen, onMarkersToggle, onLinkPickerOpen,
-    togglingLibrary,
+    onCoverPickerOpen, togglingLibrary,
  }: Props = $props();

  let manageOpen:     boolean = $state(false);
@@ -62,6 +64,10 @@
    store.activeManga ? store.getMarkersForManga(store.activeManga.id).length : 0
  );

+  const hasCoverOverride = $derived(
+    !!store.settings.mangaPrefs?.[store.activeManga!.id]?.coverUrl
+  );
+
  function focusOnMount(node: HTMLElement) { node.focus(); }
 </script>

@@ -71,7 +77,7 @@
  </button>

  <div class="cover-wrap">
-    <Thumbnail src={store.activeManga!.thumbnailUrl} alt={store.activeManga!.title} class="cover" />
+    <Thumbnail src={resolvedCover(store.activeManga!.id, store.activeManga!.thumbnailUrl)} alt={store.activeManga!.title} class="cover" />
  </div>

  {#if loadingManga}
@@ -157,6 +163,9 @@
              <LinkSimpleHorizontalBreak size={12} weight={linkedIds.length > 0 ? "fill" : "light"} />
              Series Link{linkedIds.length > 0 ? ` (${linkedIds.length})` : ""}
            </button>
+            <button class="detail-action-btn" class:detail-action-active={hasCoverOverride} onclick={onCoverPickerOpen}>
+              <Image size={12} weight={hasCoverOverride ? "fill" : "light"} /> Cover Image
+            </button>
            <button class="detail-action-btn" onclick={onTrackingOpen}>
              <ChartLineUp size={12} weight="light" /> Tracking
            </button>
@@ -0,0 +1,212 @@
+<script lang="ts">
+  import { X, CaretLeft, CaretRight, CircleNotch } from "phosphor-svelte";
+  import { setPref }                  from "@features/series/lib/mangaPrefs";
+  import { coverCandidatesSync, dedupeByImage } from "@core/cover/coverResolver";
+  import Thumbnail                    from "@shared/manga/Thumbnail.svelte";
+  import type { Manga }               from "@types";
+
+  interface Props {
+    manga:    Manga;
+    allManga: Manga[];
+    onClose:  () => void;
+  }
+
+  let { manga, allManga, onClose }: Props = $props();
+
+  type MangaWithTitle = Manga & { title: string };
+
+  const mangaById = $derived(new Map(allManga.map(m => [m.id, m as MangaWithTitle])));
+
+  const syncCandidates = $derived(
+    coverCandidatesSync(manga.id, manga.title, manga.thumbnailUrl, mangaById)
+  );
+
+  let candidates  = $state<typeof syncCandidates>([]);
+  let hashingDone = $state(false);
+  let index       = $state(0);
+
+  $effect(() => {
+    const snap = syncCandidates;
+    candidates  = [];
+    hashingDone = false;
+    index       = 0;
+
+    dedupeByImage(snap).then(merged => {
+      candidates  = merged;
+      index       = Math.max(0, merged.findIndex(c => c.isActive));
+      hashingDone = true;
+    });
+  });
+
+  const current = $derived(candidates[index]);
+
+  function prev() { index = (index - 1 + candidates.length) % candidates.length; }
+  function next() { index = (index + 1) % candidates.length; }
+
+  function confirm() {
+    if (!current) return;
+    if (current.mangaId === manga.id) setPref(manga.id, "coverUrl", undefined as any);
+    else                               setPref(manga.id, "coverUrl", current.url);
+    onClose();
+  }
+
+  function onKeydown(e: KeyboardEvent) {
+    if (e.key === "ArrowLeft")  { e.preventDefault(); prev(); }
+    if (e.key === "ArrowRight") { e.preventDefault(); next(); }
+    if (e.key === "Enter")      { e.preventDefault(); confirm(); }
+    if (e.key === "Escape")     onClose();
+  }
+</script>
+
+<div
+  class="backdrop"
+  role="button"
+  tabindex="-1"
+  aria-label="Close cover picker"
+  onclick={(e) => { if (e.target === e.currentTarget) onClose(); }}
+  onkeydown={(e) => e.key === "Escape" && onClose()}
+>
+  <div class="modal" role="dialog" aria-label="Choose cover image" tabindex="-1" onkeydown={onKeydown}>
+    <div class="header">
+      <span class="title">Cover Image</span>
+<button class="close-btn" onclick={onClose}><X size={14} weight="light" /></button>
+    </div>
+
+    {#if !hashingDone}
+      <div class="loading">
+        <CircleNotch size={24} weight="light" class="anim-spin" style="color:var(--text-faint)" />
+      </div>
+    {:else}
+      <div class="stage">
+        <button class="arrow" onclick={prev} disabled={candidates.length <= 1} aria-label="Previous">
+          <CaretLeft size={18} weight="bold" />
+        </button>
+
+        <div class="cover-wrap">
+          {#if current}
+            <Thumbnail src={current.url} alt="" class="cover-img" />
+          {/if}
+        </div>
+
+        <button class="arrow" onclick={next} disabled={candidates.length <= 1} aria-label="Next">
+          <CaretRight size={18} weight="bold" />
+        </button>
+      </div>
+
+      {#if candidates.length > 1}
+        <div class="filmstrip">
+          {#each candidates as c, i (c.url)}
+            <button
+              class="film-thumb"
+              class:film-active={i === index}
+              onclick={() => index = i}
+              aria-label="Cover {i + 1}"
+            >
+              <Thumbnail src={c.url} alt="" class="film-img" />
+            </button>
+          {/each}
+        </div>
+      {/if}
+    {/if}
+
+    <div class="footer">
+      <button class="confirm-btn" onclick={confirm}>Use this cover</button>
+    </div>
+  </div>
+</div>
+
+<style>
+  .backdrop {
+    position: fixed; inset: 0;
+    background: rgba(0,0,0,0.72);
+    z-index: calc(var(--z-settings) + 2);
+    display: flex; align-items: center; justify-content: center;
+    backdrop-filter: blur(4px); -webkit-backdrop-filter: blur(4px);
+    animation: fadeIn 0.1s ease both;
+  }
+  .modal {
+    width: min(380px, calc(100vw - 48px));
+    display: flex; flex-direction: column;
+    background: var(--bg-surface);
+    border: 1px solid var(--border-base); border-radius: var(--radius-xl);
+    overflow: hidden;
+    box-shadow: 0 24px 64px rgba(0,0,0,0.6);
+    animation: scaleIn 0.14s ease both;
+    outline: none;
+  }
+  .header {
+    display: flex; align-items: center; justify-content: space-between;
+    padding: var(--sp-4) var(--sp-5);
+    border-bottom: 1px solid var(--border-dim);
+    flex-shrink: 0; gap: var(--sp-2);
+  }
+  .title {
+    font-size: var(--text-sm); font-weight: var(--weight-medium);
+    color: var(--text-secondary); flex: 1;
+  }
+  .close-btn {
+    display: flex; align-items: center; justify-content: center;
+    width: 26px; height: 26px; border-radius: var(--radius-sm);
+    color: var(--text-faint); background: none; border: none; cursor: pointer;
+    transition: color var(--t-base), background var(--t-base);
+  }
+  .close-btn:hover { color: var(--text-muted); background: var(--bg-raised); }
+  .stage {
+    display: flex; align-items: center; justify-content: center;
+    gap: var(--sp-3);
+    padding: var(--sp-5) var(--sp-4) var(--sp-4);
+  }
+  .cover-wrap {
+    flex: 1; max-width: 200px; aspect-ratio: 2/3;
+    border-radius: var(--radius-md); overflow: hidden;
+    border: 1px solid var(--border-dim);
+    background: var(--bg-raised);
+    box-shadow: 0 8px 32px rgba(0,0,0,0.5);
+  }
+  :global(.cover-img) { width: 100%; height: 100%; object-fit: cover; display: block; }
+  .arrow {
+    display: flex; align-items: center; justify-content: center;
+    width: 36px; height: 36px; flex-shrink: 0;
+    border-radius: var(--radius-full);
+    border: 1px solid var(--border-dim);
+    background: var(--bg-raised);
+    color: var(--text-muted);
+    cursor: pointer;
+    transition: color var(--t-base), border-color var(--t-base), background var(--t-base);
+  }
+  .arrow:hover:not(:disabled) { color: var(--text-primary); border-color: var(--border-strong); background: var(--bg-overlay); }
+  .arrow:disabled { opacity: 0.2; cursor: default; }
+  .filmstrip {
+    display: flex; gap: var(--sp-2); align-items: center; justify-content: center;
+    padding: 0 var(--sp-4) var(--sp-4);
+    overflow-x: auto; scrollbar-width: none;
+  }
+  .filmstrip::-webkit-scrollbar { display: none; }
+  .film-thumb {
+    flex-shrink: 0; width: 44px; aspect-ratio: 2/3;
+    border-radius: var(--radius-sm); overflow: hidden;
+    border: 2px solid transparent;
+    background: var(--bg-raised);
+    cursor: pointer; padding: 0;
+    opacity: 0.5;
+    transition: border-color var(--t-base), opacity var(--t-base);
+  }
+  .film-thumb:hover { opacity: 0.8; }
+  .film-active { border-color: var(--accent); opacity: 1; }
+  :global(.film-img) { width: 100%; height: 100%; object-fit: cover; display: block; }
+  .footer { padding: 0 var(--sp-4) var(--sp-4); flex-shrink: 0; }
+  .confirm-btn {
+    width: 100%; padding: 9px;
+    border-radius: var(--radius-md);
+    background: var(--accent); border: 1px solid var(--accent);
+    color: var(--accent-contrast, #fff);
+    font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide);
+    cursor: pointer;
+    transition: opacity var(--t-base);
+  }
+  .confirm-btn:hover { opacity: 0.88; }
+  .loading { display: flex; align-items: center; justify-content: center; padding: var(--sp-10) 0; }
+  @keyframes fadeIn  { from { opacity: 0 }                         to { opacity: 1 } }
+  @keyframes scaleIn { from { opacity: 0; transform: scale(0.97) } to { opacity: 1; transform: scale(1) } }
+  @keyframes pulse   { 0%, 100% { opacity: 0.4 }                  50% { opacity: 1 } }
+</style>
@@ -0,0 +1,237 @@
+<script lang="ts">
+  import { X, LinkSimple, LinkBreak, Sparkle } from "phosphor-svelte";
+  import Thumbnail  from "@shared/manga/Thumbnail.svelte";
+  import { store, linkManga, unlinkManga } from "@store/state.svelte";
+  import type { Manga } from "@types";
+
+  interface Props {
+    manga:    Manga;
+    allManga: Manga[];
+    onClose:  () => void;
+  }
+
+  let { manga, allManga, onClose }: Props = $props();
+
+  let query = $state("");
+
+  function titleSimilarity(a: string, b: string): number {
+    const norm = (s: string) =>
+      s.toLowerCase().replace(/[^a-z0-9\s]/g, "").split(/\s+/).filter(Boolean);
+    const wa = new Set(norm(a));
+    const wb = new Set(norm(b));
+    if (!wa.size || !wb.size) return 0;
+    const intersection = [...wa].filter(w => wb.has(w)).length;
+    return intersection / new Set([...wa, ...wb]).size;
+  }
+
+  const linkedIds = $derived(store.settings.mangaLinks?.[manga.id] ?? []);
+
+  const others = $derived(allManga.filter(m => m.id !== manga.id));
+
+  const suggestions = $derived.by(() => {
+    if (linkedIds.length === others.length) return [];
+    return others
+      .filter(m => !linkedIds.includes(m.id))
+      .map(m => ({ manga: m, score: titleSimilarity(manga.title, m.title) }))
+      .filter(r => r.score >= 0.65)
+      .sort((a, b) => b.score - a.score)
+      .slice(0, 8);
+  });
+
+  const searchResults = $derived.by(() => {
+    const q = query.trim().toLowerCase();
+    if (!q) return [];
+    return others
+      .filter(m => m.title.toLowerCase().includes(q))
+      .slice(0, 30);
+  });
+
+  const linked = $derived(
+    others.filter(m => linkedIds.includes(m.id))
+  );
+
+  function toggle(other: Manga) {
+    if (linkedIds.includes(other.id)) unlinkManga(manga.id, other.id);
+    else linkManga(manga.id, other.id);
+  }
+</script>
+
+<div
+  class="backdrop"
+  role="presentation"
+  onclick={(e) => { if (e.target === e.currentTarget) onClose(); }}
+  onkeydown={(e) => e.key === "Escape" && onClose()}
+>
+  <div class="modal" role="dialog" aria-label="Link as same series">
+    <div class="header">
+      <span class="title">Link as same series</span>
+      <button class="close-btn" onclick={onClose}><X size={14} weight="light" /></button>
+    </div>
+
+    <p class="hint">Linked entries share covers and are merged in search. Click a linked entry to unlink.</p>
+
+    <div class="search-wrap">
+      <input class="search" placeholder="Search your library…" bind:value={query} />
+    </div>
+
+    <div class="list">
+      {#if query.trim()}
+        {#if searchResults.length === 0}
+          <p class="empty">No results</p>
+        {:else}
+          {#each searchResults as m (m.id)}
+            {@const isLinked = linkedIds.includes(m.id)}
+            <button class="row" class:row-linked={isLinked} onclick={() => toggle(m)}>
+              <Thumbnail src={m.thumbnailUrl} alt={m.title} class="thumb" />
+              <div class="info">
+                <span class="manga-title">{m.title}</span>
+                {#if m.source?.displayName}<span class="source">{m.source.displayName}</span>{/if}
+              </div>
+              <span class="row-icon">{#if isLinked}<LinkBreak size={14} />{:else}<LinkSimple size={14} />{/if}</span>
+            </button>
+          {/each}
+        {/if}
+
+      {:else}
+        {#if linked.length > 0}
+          <p class="section-label">Linked</p>
+          {#each linked as m (m.id)}
+            <button class="row row-linked" onclick={() => toggle(m)}>
+              <Thumbnail src={m.thumbnailUrl} alt={m.title} class="thumb" />
+              <div class="info">
+                <span class="manga-title">{m.title}</span>
+                {#if m.source?.displayName}<span class="source">{m.source.displayName}</span>{/if}
+              </div>
+              <span class="row-icon"><LinkBreak size={14} /></span>
+            </button>
+          {/each}
+        {/if}
+
+        {#if suggestions.length > 0}
+          <p class="section-label">
+            <Sparkle size={10} weight="fill" style="color:var(--accent)" />
+            Suggested
+          </p>
+          {#each suggestions as { manga: m, score } (m.id)}
+            <button class="row" onclick={() => toggle(m)}>
+              <Thumbnail src={m.thumbnailUrl} alt={m.title} class="thumb" />
+              <div class="info">
+                <span class="manga-title">{m.title}</span>
+                {#if m.source?.displayName}<span class="source">{m.source.displayName}</span>{/if}
+              </div>
+              <span class="sim-bar">
+                <span class="sim-fill" style="width:{Math.round(score * 100)}%"></span>
+              </span>
+              <span class="row-icon"><LinkSimple size={14} /></span>
+            </button>
+          {/each}
+        {/if}
+
+        {#if linked.length === 0 && suggestions.length === 0}
+          <p class="empty">No suggestions — search your library above.</p>
+        {/if}
+      {/if}
+    </div>
+  </div>
+</div>
+
+<style>
+  .backdrop {
+    position: fixed; inset: 0;
+    background: rgba(0,0,0,0.72);
+    z-index: var(--z-settings);
+    display: flex; align-items: center; justify-content: center;
+    backdrop-filter: blur(4px); -webkit-backdrop-filter: blur(4px);
+    animation: fadeIn 0.12s ease both;
+  }
+  .modal {
+    width: min(460px, calc(100vw - 48px));
+    max-height: 70vh;
+    display: flex; flex-direction: column;
+    background: var(--bg-surface);
+    border: 1px solid var(--border-base); border-radius: var(--radius-xl);
+    overflow: hidden;
+    box-shadow: 0 24px 64px rgba(0,0,0,0.6);
+    animation: scaleIn 0.14s ease both;
+  }
+  .header {
+    display: flex; align-items: center; justify-content: space-between;
+    padding: var(--sp-4) var(--sp-5);
+    border-bottom: 1px solid var(--border-dim);
+    flex-shrink: 0;
+  }
+  .title {
+    font-size: var(--text-sm); font-weight: var(--weight-medium);
+    color: var(--text-secondary);
+  }
+  .close-btn {
+    display: flex; align-items: center; justify-content: center;
+    width: 28px; height: 28px; border-radius: var(--radius-sm);
+    color: var(--text-faint); background: none; border: none; cursor: pointer;
+    transition: color var(--t-base), background var(--t-base);
+  }
+  .close-btn:hover { color: var(--text-muted); background: var(--bg-raised); }
+  .hint {
+    font-family: var(--font-ui); font-size: var(--text-xs);
+    color: var(--text-faint); letter-spacing: var(--tracking-wide);
+    line-height: var(--leading-snug);
+    padding: var(--sp-3) var(--sp-5) 0;
+    flex-shrink: 0;
+  }
+  .search-wrap {
+    padding: var(--sp-3) var(--sp-4);
+    border-bottom: 1px solid var(--border-dim);
+    flex-shrink: 0;
+  }
+  .search {
+    width: 100%; background: var(--bg-raised);
+    border: 1px solid var(--border-dim); border-radius: var(--radius-md);
+    padding: 6px 10px; color: var(--text-primary);
+    font-size: var(--text-sm); outline: none;
+    transition: border-color var(--t-base);
+  }
+  .search:focus { border-color: var(--border-strong); }
+  .list {
+    flex: 1; overflow-y: auto;
+    padding: var(--sp-2);
+    scrollbar-width: none;
+  }
+  .list::-webkit-scrollbar { display: none; }
+  .section-label {
+    display: flex; align-items: center; gap: var(--sp-1);
+    font-family: var(--font-ui); font-size: 9px;
+    color: var(--text-faint); letter-spacing: var(--tracking-wider);
+    text-transform: uppercase;
+    padding: var(--sp-3) var(--sp-3) var(--sp-1);
+  }
+  .empty {
+    font-family: var(--font-ui); font-size: var(--text-xs);
+    color: var(--text-faint); padding: var(--sp-4) var(--sp-3);
+    text-align: center; letter-spacing: var(--tracking-wide);
+  }
+  .row {
+    display: flex; align-items: center; gap: var(--sp-3);
+    width: 100%; padding: 8px var(--sp-3);
+    border-radius: var(--radius-md); border: none;
+    background: none; text-align: left; cursor: pointer;
+    transition: background var(--t-fast);
+  }
+  .row:hover { background: var(--bg-raised); }
+  .row-linked { background: var(--accent-muted) !important; }
+  :global(.thumb) { width: 34px; height: 48px; border-radius: var(--radius-sm); object-fit: cover; flex-shrink: 0; border: 1px solid var(--border-dim); }
+  .info { flex: 1; display: flex; flex-direction: column; gap: 2px; overflow: hidden; min-width: 0; }
+  .manga-title { font-size: var(--text-sm); color: var(--text-secondary); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+  .source { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
+  .sim-bar {
+    width: 36px; height: 3px;
+    background: var(--bg-overlay); border-radius: var(--radius-full);
+    overflow: hidden; flex-shrink: 0;
+  }
+  .sim-fill { display: block; height: 100%; background: var(--accent); border-radius: var(--radius-full); }
+  .row-icon { display: flex; align-items: center; color: var(--text-faint); flex-shrink: 0; opacity: 0.6; transition: opacity var(--t-base); }
+  .row:hover .row-icon { opacity: 1; }
+  .row-linked .row-icon { color: var(--accent-fg); opacity: 1; }
+
+  @keyframes fadeIn  { from { opacity: 0 }                         to { opacity: 1 } }
+  @keyframes scaleIn { from { opacity: 0; transform: scale(0.97) } to { opacity: 1; transform: scale(1) } }
+</style>
@@ -1,12 +1,11 @@
 <script lang="ts">
-  import { CircleNotch, X, MagnifyingGlass, ArrowSquareOut, Lock, LockOpen, ArrowsClockwise, ArrowLineDown } from "phosphor-svelte";
+  import { CircleNotch, X, MagnifyingGlass, ArrowSquareOut, Lock, LockOpen, ArrowsClockwise, ArrowLineDown, CalendarBlank } from "phosphor-svelte";
  import { gql }        from "@api/client";
  import Thumbnail      from "@shared/manga/Thumbnail.svelte";
-  import { GET_TRACKERS, SEARCH_TRACKER } from "@api/queries/tracking";
-  import { BIND_TRACK, UPDATE_TRACK, UNBIND_TRACK } from "@api/mutations/tracking";
+  import { GET_TRACKERS, GET_MANGA_TRACK_RECORDS, SEARCH_TRACKER } from "@api/queries/tracking";
+  import { BIND_TRACK, UPDATE_TRACK, UNBIND_TRACK, FETCH_TRACK } from "@api/mutations/tracking";
  import { GET_CHAPTERS } from "@api/queries/chapters";
  import { addToast, store } from "@store/state.svelte";
-  import { trackingState }               from "@features/tracking/store/trackingState.svelte";
  import { syncBackFromTracker } from "@features/tracking/lib/trackingSync";
  import type { Tracker, TrackRecord, TrackSearch } from "@types";
  import type { Chapter } from "@types/index";
@@ -20,7 +19,8 @@
  type TabId = "records" | number;

  let trackers:    Tracker[]     = $state([]);
-  let loadingTrackers: boolean   = $state(true);
+  let records:     TrackRecord[] = $state([]);
+  let loading:     boolean       = $state(true);
  let activeTab:   TabId         = $state("records");

  let searchQuery:   string        = $state("");
@@ -31,24 +31,38 @@
  let binding:        boolean       = $state(false);
  let updatingRecord: number | null = $state(null);
  let syncing:        number | null = $state(null);
-  let editingChapter: number | null = $state(null);
-  let chapterDraft:   number        = $state(0);
  let applyingRecord: number | null = $state(null);

-  const records        = $derived(trackingState.records);
-  const loading        = $derived(trackingState.loading || loadingTrackers);
+  let editingId:    number | null = $state(null);
+  let chapterDraft: number        = $state(0);
+  let startDraft:   string        = $state("");
+  let finishDraft:  string        = $state("");
+  let confirmUnbindId: number | null = $state(null);
+
  const loggedInTrackers = $derived(trackers.filter(t => t.isLoggedIn));

  function autoFocus(node: HTMLElement) { setTimeout(() => node.focus(), 50); }

-  $effect(() => {
-    loadingTrackers = true;
-    gql<{ trackers: { nodes: Tracker[] } }>(GET_TRACKERS)
-      .then(r => { trackers = r.trackers.nodes; })
-      .catch(e => addToast({ kind: "error", title: "Failed to load trackers", body: e?.message }))
-      .finally(() => { loadingTrackers = false; });
-    trackingState.loadForManga(mangaId);
-  });
+  async function load() {
+    loading = true;
+    try {
+      const [tRes, rRes] = await Promise.all([
+        gql<{ trackers: { nodes: Tracker[] } }>(GET_TRACKERS),
+        gql<{ manga: { trackRecords: { nodes: TrackRecord[] } } }>(GET_MANGA_TRACK_RECORDS, { mangaId }),
+      ]);
+      trackers = tRes.trackers.nodes;
+      records  = rRes.manga.trackRecords.nodes;
+      if (store.settings.trackerSyncBack && records.length > 0) {
+        await Promise.all(records.map(r => applyToLibrary(r, true)));
+      }
+    } catch (e: any) {
+      addToast({ kind: "error", title: "Failed to load tracking", body: e?.message });
+    } finally {
+      loading = false;
+    }
+  }
+
+  $effect(() => { load(); });

  $effect(() => {
    const tab = activeTab;
@@ -91,12 +105,19 @@
    if (typeof activeTab !== "number") return;
    binding = true;
    try {
+      const existing = recordFor(activeTab);
+      if (existing) {
+        await gql(UNBIND_TRACK, { recordId: existing.id });
+        records = records.filter(r => r.id !== existing.id);
+      }
      const res = await gql<{ bindTrack: { trackRecord: TrackRecord } }>(
        BIND_TRACK, { mangaId, trackerId: activeTab, remoteId: result.remoteId }
      );
-      trackingState.patchRecord(res.bindTrack.trackRecord);
+      const newRecord = res.bindTrack.trackRecord;
+      records   = [...records, newRecord];
      activeTab = "records";
      addToast({ kind: "success", title: "Now tracking", body: result.title });
+      if (store.settings.trackerSyncBack) await applyToLibrary(newRecord, true);
    } catch (e: any) {
      addToast({ kind: "error", title: "Failed to bind", body: e?.message });
    } finally {
@@ -106,9 +127,10 @@

  async function unbind(record: TrackRecord) {
    updatingRecord = record.id;
+    confirmUnbindId = null;
    try {
      await gql(UNBIND_TRACK, { recordId: record.id });
-      trackingState.removeRecord(record.id);
+      records = records.filter(r => r.id !== record.id);
      addToast({ kind: "info", title: "Unlinked from " + trackerFor(record.trackerId)?.name });
    } catch (e: any) {
      addToast({ kind: "error", title: "Failed to unlink", body: e?.message });
@@ -117,69 +139,67 @@
    }
  }

+  function patchRecord(updated: Partial<TrackRecord> & { id: number }) {
+    records = records.map(r => r.id === updated.id ? { ...r, ...updated } : r);
+  }
+
  async function updateStatus(record: TrackRecord, status: number) {
    updatingRecord = record.id;
    try {
      const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, status });
-      trackingState.patchRecord(res.updateTrack.trackRecord);
+      patchRecord(res.updateTrack.trackRecord);
    } catch (e: any) {
      addToast({ kind: "error", title: "Update failed", body: e?.message });
-    } finally {
-      updatingRecord = null;
-    }
+    } finally { updatingRecord = null; }
  }

  async function updateScore(record: TrackRecord, scoreString: string) {
    updatingRecord = record.id;
    try {
      const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, scoreString });
-      trackingState.patchRecord(res.updateTrack.trackRecord);
+      patchRecord(res.updateTrack.trackRecord);
    } catch (e: any) {
      addToast({ kind: "error", title: "Update failed", body: e?.message });
-    } finally {
-      updatingRecord = null;
-    }
+    } finally { updatingRecord = null; }
  }

  async function togglePrivate(record: TrackRecord) {
    updatingRecord = record.id;
    try {
      const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, private: !record.private });
-      trackingState.patchRecord(res.updateTrack.trackRecord);
+      patchRecord(res.updateTrack.trackRecord);
    } catch (e: any) {
      addToast({ kind: "error", title: "Update failed", body: e?.message });
-    } finally {
-      updatingRecord = null;
-    }
+    } finally { updatingRecord = null; }
  }

  async function syncRecord(record: TrackRecord) {
    syncing = record.id;
    try {
-      const fresh = await trackingState.syncRecordFromRemote(record.id);
-      if (fresh) addToast({ kind: "success", title: "Synced from tracker" });
+      const res = await gql<{ fetchTrack: { trackRecord: TrackRecord } }>(FETCH_TRACK, { recordId: record.id });
+      patchRecord(res.fetchTrack.trackRecord);
+      addToast({ kind: "success", title: "Synced from tracker" });
    } catch (e: any) {
      addToast({ kind: "error", title: "Sync failed", body: e?.message });
-    } finally {
-      syncing = null;
-    }
+    } finally { syncing = null; }
  }

  function openChapterEditor(record: TrackRecord) {
-    editingChapter = record.id;
+    editingId    = record.id;
    chapterDraft = record.lastChapterRead;
+    startDraft   = record.startDate  ?? "";
+    finishDraft  = record.finishDate ?? "";
  }

-  function cancelChapterEditor() { editingChapter = null; }
+  function cancelEditor() { editingId = null; }

-  async function applyToLibrary(record: TrackRecord) {
+  async function applyToLibrary(record: TrackRecord, silent = false) {
    applyingRecord = record.id;
    try {
      const chapRes = await gql<{ chapters: { nodes: Chapter[] } }>(GET_CHAPTERS, { mangaId });
      const prefs   = store.settings.mangaPrefs?.[mangaId] ?? {};
      const marked  = await syncBackFromTracker(
-        [record],
-        chapRes.chapters.nodes,
+        [record], chapRes.chapters.nodes,
        {
          threshold:              store.settings.trackerSyncBackThreshold ?? null,
          respectScanlatorFilter: store.settings.trackerRespectScanlatorFilter ?? true,
@@ -187,35 +207,44 @@
        },
        (query, vars) => gql(query, vars),
      );
-      if (marked.length > 0) {
-        addToast({ kind: "success", title: `${marked.length} chapter${marked.length !== 1 ? "s" : ""} marked read` });
-      } else {
-        addToast({ kind: "info", title: "Already up to date" });
+      if (!silent) {
+        if (marked.length > 0) addToast({ kind: "success", title: `${marked.length} chapter${marked.length !== 1 ? "s" : ""} marked read` });
+        else addToast({ kind: "info", title: "Already up to date" });
      }
    } catch (e: any) {
      addToast({ kind: "error", title: "Apply failed", body: e?.message });
-    } finally {
-      applyingRecord = null;
-    }
+    } finally { applyingRecord = null; }
  }

  async function submitChapter(record: TrackRecord) {
+    const tracker = trackerFor(record.trackerId);
    const val     = Math.max(0, chapterDraft);
-    editingChapter = null;
-    if (val === record.lastChapterRead) return;
+    const sd      = tracker?.supportsReadingDates ? (startDraft.trim()  || undefined) : undefined;
+    const fd      = tracker?.supportsReadingDates ? (finishDraft.trim() || undefined) : undefined;
+
+    editingId = null;
+
+    const chapterChanged = val !== record.lastChapterRead;
+    const startChanged   = sd !== (record.startDate  ?? undefined);
+    const finishChanged  = fd !== (record.finishDate ?? undefined);
+    if (!chapterChanged && !startChanged && !finishChanged) return;
+
    updatingRecord = record.id;
    try {
-      const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, { recordId: record.id, lastChapterRead: val });
-      trackingState.patchRecord(res.updateTrack.trackRecord);
+      const res = await gql<{ updateTrack: { trackRecord: TrackRecord } }>(UPDATE_TRACK, {
+        recordId:        record.id,
+        lastChapterRead: chapterChanged ? val : undefined,
+        startDate:       sd,
+        finishDate:      fd,
+      });
+      patchRecord(res.updateTrack.trackRecord);
    } catch (e: any) {
      addToast({ kind: "error", title: "Update failed", body: e?.message });
-    } finally {
-      updatingRecord = null;
-    }
+    } finally { updatingRecord = null; }
  }
 </script>

-<svelte:window onkeydown={(e) => e.key === "Escape" && onClose()} />
+<svelte:window onkeydown={(e) => { if (e.key === "Escape") { if (confirmUnbindId !== null) { confirmUnbindId = null; } else if (editingId !== null) { editingId = null; } else { onClose(); } } }} />

 <div class="backdrop" role="presentation" onclick={(e) => { if (e.target === e.currentTarget) onClose(); }}>
  <div class="modal" role="dialog" aria-label="Tracking">
@@ -225,13 +254,12 @@
        <span class="modal-title">Tracking</span>
        <span class="modal-subtitle">{mangaTitle}</span>
      </div>
-      <button class="close-btn" onclick={onClose}><X size={15} weight="light" /></button>
+      <button class="close-btn" onclick={onClose}><X size={14} weight="light" /></button>
    </div>

    {#if loading}
      <div class="state-body">
-        <CircleNotch size={20} weight="light" class="anim-spin" style="color:var(--text-faint)" />
-        <span class="state-label">Loading…</span>
+        <CircleNotch size={18} weight="light" class="anim-spin" style="color:var(--text-faint)" />
      </div>

    {:else if loggedInTrackers.length === 0}
@@ -260,119 +288,140 @@
        <div class="tab-body">
          {#if records.length === 0}
            <div class="state-body">
-              <p class="state-text">Not tracking this manga yet.</p>
-              <p class="state-hint">Click a tracker tab above to search and add it.</p>
+              <p class="state-text">Not tracking yet.</p>
+              <p class="state-hint">Click a tracker tab above to search and link it.</p>
            </div>
          {:else}
            {#each records as record (record.id)}
              {@const tracker = trackerFor(record.trackerId)}
              {@const isBusy  = updatingRecord === record.id}
+              {@const isEdit  = editingId === record.id}
+              {@const pct     = record.totalChapters > 0 ? Math.min(100, (record.lastChapterRead / record.totalChapters) * 100) : null}
+              {@const canUnlink = !tracker || tracker.supportsTrackDeletion !== false}
+
              <div class="record-card" class:record-busy={isBusy}>

                <div class="record-head">
                  <div class="record-source">
-                    {#if tracker}<Thumbnail src={tracker.icon} alt={tracker.name} class="record-tracker-icon" />{/if}
+                    {#if tracker}<Thumbnail src={tracker.icon} alt={tracker.name} class="record-icon" />{/if}
                    <span class="record-source-name">{tracker?.name ?? "Tracker"}</span>
+                    {#if record.remoteUrl}
+                      <a href={record.remoteUrl} target="_blank" rel="noreferrer" class="record-external" title="Open on {tracker?.name}">
+                        <ArrowSquareOut size={10} weight="light" />
+                      </a>
+                    {/if}
                  </div>
-                  <div class="record-head-actions">
+                  <div class="record-actions">
                    {#if tracker?.supportsPrivateTracking}
                      <button
-                        class="record-icon-btn"
-                        class:icon-active={record.private}
-                        title={record.private ? "Private — click to make public" : "Public"}
+                        class="pill-btn"
+                        class:pill-btn-on={record.private}
+                        title={record.private ? "Private" : "Public"}
                        disabled={isBusy}
                        onclick={() => togglePrivate(record)}
                      >
-                        {#if record.private}<Lock size={11} weight="fill" />{:else}<LockOpen size={11} weight="light" />{/if}
+                        {#if record.private}<Lock size={9} weight="fill" />{:else}<LockOpen size={9} weight="light" />{/if}
+                        {record.private ? "Private" : "Public"}
                      </button>
                    {/if}
-                    <button class="record-icon-btn" title="Sync from tracker" disabled={syncing === record.id} onclick={() => syncRecord(record)}>
-                      <ArrowsClockwise size={11} weight="light" class={syncing === record.id ? "anim-spin" : ""} />
+                    <button class="icon-action" title="Sync from tracker" disabled={syncing === record.id} onclick={() => syncRecord(record)}>
+                      <ArrowsClockwise size={12} weight="light" class={syncing === record.id ? "anim-spin" : ""} />
                    </button>
                    {#if store.settings.trackerSyncBack}
-                      <button class="record-icon-btn" title="Apply tracker progress to library" disabled={applyingRecord === record.id} onclick={() => applyToLibrary(record)}>
-                        <ArrowLineDown size={11} weight="light" class={applyingRecord === record.id ? "anim-spin" : ""} />
+                      <button class="icon-action" title="Apply to library" disabled={applyingRecord === record.id} onclick={() => applyToLibrary(record)}>
+                        <ArrowLineDown size={12} weight="light" class={applyingRecord === record.id ? "anim-spin" : ""} />
                      </button>
                    {/if}
-                    <button class="record-icon-btn icon-danger" title="Unlink" disabled={isBusy} onclick={() => unbind(record)}>
+                    {#if canUnlink}
+                      <button class="icon-action icon-action-danger" title="Unlink" disabled={isBusy} onclick={() => confirmUnbindId = record.id}>
                        <X size={11} weight="bold" />
                      </button>
-                  </div>
-                </div>
-
-                {#if record.remoteUrl}
-                  <a href={record.remoteUrl} target="_blank" rel="noreferrer" class="record-title">
-                    {record.title} <ArrowSquareOut size={10} weight="light" />
-                  </a>
-                {:else}
-                  <span class="record-title-plain">{record.title}</span>
                    {/if}
+                  </div>
+                </div>

+                <div class="record-body">
                  <div class="record-selects">
-                  <select class="record-select record-select-status" value={record.status} disabled={isBusy}
+                    <select class="field-select" value={record.status} disabled={isBusy}
                      onchange={(e) => updateStatus(record, parseInt((e.target as HTMLSelectElement).value))}>
                      {#each (tracker?.statuses ?? []) as s}
                        <option value={s.value}>{s.name}</option>
                      {/each}
                    </select>
-                  <select class="record-select record-select-score" value={record.displayScore} disabled={isBusy}
+                    {#if (tracker?.scores ?? []).length > 0}
+                      <select class="field-select score-select" value={record.displayScore} disabled={isBusy}
                        onchange={(e) => updateScore(record, (e.target as HTMLSelectElement).value)}>
                        {#each (tracker?.scores ?? []) as s}
                          <option value={s}>★ {s}</option>
                        {/each}
                      </select>
+                    {/if}
                  </div>

-                {#if editingChapter === record.id}
-                  <div class="chapter-editor">
-                    <div class="chapter-editor-top">
-                      <span class="chapter-editor-label">Chapter read</span>
-                      <div class="chapter-input-wrap">
+                  {#if isEdit}
+                    <div class="editor">
+                      <div class="editor-row">
+                        <span class="editor-label">Chapter read</span>
+                        <div class="editor-input-row">
                          <input
-                          type="number" class="chapter-input"
+                            type="number" class="editor-input"
                            min="0" max={record.totalChapters > 0 ? record.totalChapters : undefined}
                            step="0.5" bind:value={chapterDraft}
-                          onkeydown={(e) => { if (e.key === "Enter") submitChapter(record); if (e.key === "Escape") cancelChapterEditor(); }}
+                            onkeydown={(e) => { if (e.key === "Enter") submitChapter(record); if (e.key === "Escape") cancelEditor(); }}
                            use:autoFocus
                          />
                          {#if record.totalChapters > 0}
-                          <span class="chapter-total">/ {record.totalChapters}</span>
+                            <span class="editor-total">/ {record.totalChapters}</span>
                          {/if}
                        </div>
                      </div>
                      {#if record.totalChapters > 0}
                        <input type="range" class="chapter-slider" min="0" max={record.totalChapters} step="1" bind:value={chapterDraft} />
                      {/if}
-                    <div class="chapter-editor-actions">
-                      <button class="chapter-cancel-btn" onclick={cancelChapterEditor}>Cancel</button>
-                      <button class="chapter-save-btn" onclick={() => submitChapter(record)}>Save</button>
+                      {#if tracker?.supportsReadingDates}
+                        <div class="date-row">
+                          <div class="date-field">
+                            <CalendarBlank size={11} weight="light" class="date-icon" />
+                            <span class="editor-label">Started</span>
+                            <input type="date" class="date-input" bind:value={startDraft} />
+                          </div>
+                          <div class="date-field">
+                            <CalendarBlank size={11} weight="light" class="date-icon" />
+                            <span class="editor-label">Finished</span>
+                            <input type="date" class="date-input" bind:value={finishDraft} />
                          </div>
                        </div>
-                {:else}
-                  <div class="record-progress clickable" role="button" tabindex="0"
-                    onclick={() => openChapterEditor(record)}
-                    onkeydown={(e) => e.key === "Enter" && openChapterEditor(record)}
-                    title="Click to edit"
-                  >
-                    <div class="record-progress-header">
-                      <span class="record-progress-label">
-                        {#if record.totalChapters > 0}
-                          Ch. {record.lastChapterRead} / {record.totalChapters}
-                        {:else if record.lastChapterRead > 0}
-                          Ch. {record.lastChapterRead} read
-                        {:else}
-                          Set chapter…
                      {/if}
+                      <div class="editor-actions">
+                        <button class="editor-cancel" onclick={cancelEditor}>Cancel</button>
+                        <button class="editor-save" onclick={() => submitChapter(record)}>Save</button>
+                      </div>
+                    </div>
+                  {:else}
+                    <button class="progress-row" onclick={() => openChapterEditor(record)} disabled={isBusy}>
+                      <div class="progress-labels">
+                        <span class="progress-text">
+                          {#if record.totalChapters > 0}Ch. {record.lastChapterRead} / {record.totalChapters}
+                          {:else if record.lastChapterRead > 0}Ch. {record.lastChapterRead} read
+                          {:else}Set progress…{/if}
+                        </span>
+                        {#if record.startDate || record.finishDate}
+                          <span class="progress-dates">
+                            {#if record.startDate}{record.startDate}{/if}
+                            {#if record.startDate && record.finishDate} → {/if}
+                            {#if record.finishDate}{record.finishDate}{/if}
                          </span>
-                      <span class="edit-hint">Edit</span>
-                    </div>
-                    {#if record.totalChapters > 0}
-                      <div class="record-progress-track">
-                        <div class="record-progress-fill" style="width:{Math.min(100,(record.lastChapterRead/record.totalChapters)*100)}%"></div>
-                      </div>
                        {/if}
                      </div>
+                      <span class="progress-edit-hint">Edit</span>
+                    </button>
+                    {#if pct !== null}
+                      <div class="progress-track">
+                        <div class="progress-fill" style="width:{pct}%"></div>
+                      </div>
                    {/if}
+                  {/if}
+                </div>

              </div>
            {/each}
@@ -392,7 +441,7 @@
            onkeydown={(e) => e.key === "Enter" && doSearch(activeTab as number, searchQuery)}
            use:autoFocus
          />
-          {#if searching}<CircleNotch size={13} weight="light" class="anim-spin search-icon" />{/if}
+          {#if searching}<CircleNotch size={13} weight="light" class="anim-spin" style="color:var(--text-faint)" />{/if}
        </div>

        <div class="search-results">
@@ -429,7 +478,7 @@
                  {/if}
                </div>
                <span class="result-action" class:result-action-on={isBound}>
-                  {isBound ? "✓ Tracking" : "Track"}
+                  {isBound ? "✓ Linked" : "Link"}
                </span>
              </button>
            {/each}
@@ -441,39 +490,57 @@
  </div>
 </div>

+{#if confirmUnbindId !== null}
+  {@const rec = records.find(r => r.id === confirmUnbindId)}
+  {@const trk = rec ? trackerFor(rec.trackerId) : null}
+  <div class="confirm-backdrop" role="button" tabindex="-1" aria-label="Cancel" onclick={() => confirmUnbindId = null} onkeydown={(e) => { if (e.key === 'Escape') confirmUnbindId = null; }}>
+    <div class="confirm-modal" role="dialog" tabindex="-1" onclick={(e) => e.stopPropagation()} onkeydown={(e) => e.stopPropagation()}>
+      <p class="confirm-title">Unlink from {trk?.name ?? "tracker"}?</p>
+      <p class="confirm-body">Your progress on {trk?.name} is unaffected.</p>
+      <div class="confirm-row">
+        <button class="confirm-cancel" onclick={() => confirmUnbindId = null}>Cancel</button>
+        <button class="confirm-ok" onclick={() => rec && unbind(rec)}>Unlink</button>
+      </div>
+    </div>
+  </div>
+{/if}
+
 <style>
  .backdrop {
-    position: fixed; inset: 0; background: rgba(0,0,0,0.72);
+    position: fixed; inset: 0; background: rgba(0,0,0,0.68);
    z-index: var(--z-settings);
    display: flex; align-items: center; justify-content: center;
    backdrop-filter: blur(4px); -webkit-backdrop-filter: blur(4px);
    animation: fadeIn 0.12s ease both;
  }
  .modal {
-    width: min(560px, calc(100vw - 48px));
-    max-height: min(660px, calc(100vh - 80px));
+    width: min(520px, calc(100vw - 40px));
+    max-height: min(640px, calc(100vh - 72px));
    display: flex; flex-direction: column;
    background: var(--bg-surface); border: 1px solid var(--border-base);
    border-radius: var(--radius-xl); overflow: hidden;
-    box-shadow: 0 0 0 1px var(--border-dim), 0 24px 64px rgba(0,0,0,0.6);
+    box-shadow: 0 0 0 1px rgba(255,255,255,0.04) inset, 0 24px 64px rgba(0,0,0,0.6);
    animation: scaleIn 0.15s ease both;
  }

-  .modal-header { display: flex; align-items: center; justify-content: space-between; padding: var(--sp-4) var(--sp-5); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; }
-  .header-left { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
+  .modal-header {
+    display: flex; align-items: center; justify-content: space-between;
+    padding: var(--sp-4) var(--sp-4) var(--sp-4) var(--sp-5);
+    border-bottom: 1px solid var(--border-dim); flex-shrink: 0;
+  }
+  .header-left { display: flex; flex-direction: column; gap: 1px; min-width: 0; }
  .modal-title  { font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-primary); letter-spacing: var(--tracking-tight); }
  .modal-subtitle { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-  .close-btn { display: flex; align-items: center; justify-content: center; width: 26px; height: 26px; border-radius: var(--radius-sm); color: var(--text-faint); background: none; border: none; cursor: pointer; transition: color var(--t-base), background var(--t-base); flex-shrink: 0; }
+  .close-btn { display: flex; align-items: center; justify-content: center; width: 26px; height: 26px; border-radius: var(--radius-sm); color: var(--text-faint); background: none; border: none; cursor: pointer; flex-shrink: 0; transition: color var(--t-base), background var(--t-base); }
  .close-btn:hover { color: var(--text-muted); background: var(--bg-raised); }

  .state-body { display: flex; flex-direction: column; align-items: center; justify-content: center; gap: var(--sp-2); padding: var(--sp-10) var(--sp-5); flex: 1; }
-  .state-label { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
  .state-text  { font-size: var(--text-sm); color: var(--text-muted); }
  .state-hint  { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); text-align: center; }

  .tabs { display: flex; align-items: center; gap: 1px; padding: 0 var(--sp-4); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; overflow-x: auto; scrollbar-width: none; }
  .tabs::-webkit-scrollbar { display: none; }
-  .tab { display: flex; align-items: center; gap: var(--sp-2); position: relative; font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); padding: 10px 10px 9px; color: var(--text-faint); background: none; border: none; border-bottom: 2px solid transparent; cursor: pointer; white-space: nowrap; transition: color var(--t-base), border-color var(--t-base); margin-bottom: -1px; }
+  .tab { display: flex; align-items: center; gap: 6px; font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 10px 8px 9px; color: var(--text-faint); background: none; border: none; border-bottom: 2px solid transparent; cursor: pointer; white-space: nowrap; transition: color var(--t-base), border-color var(--t-base); margin-bottom: -1px; }
  .tab:hover { color: var(--text-muted); }
  .tab-active  { color: var(--text-secondary); border-bottom-color: var(--accent); }
  :global(.tab-icon) { width: 13px; height: 13px; border-radius: 2px; object-fit: contain; }
@@ -484,63 +551,75 @@
  .tab-body { flex: 1; overflow-y: auto; padding: var(--sp-3); scrollbar-width: none; display: flex; flex-direction: column; gap: var(--sp-2); }
  .tab-body::-webkit-scrollbar { display: none; }

-  .record-card { display: flex; flex-direction: column; gap: var(--sp-3); padding: var(--sp-4); border-radius: var(--radius-lg); border: 1px solid var(--border-dim); background: var(--bg-raised); transition: opacity var(--t-base), border-color var(--t-base); }
+  .record-card { display: flex; flex-direction: column; border-radius: var(--radius-lg); border: 1px solid var(--border-dim); background: var(--bg-raised); overflow: hidden; transition: border-color var(--t-base); }
  .record-card:hover { border-color: var(--border-strong); }
-  .record-busy { opacity: 0.4; pointer-events: none; }
+  .record-busy { opacity: 0.45; pointer-events: none; }

-  .record-head { display: flex; align-items: center; justify-content: space-between; gap: var(--sp-2); }
-  .record-source { display: flex; align-items: center; gap: var(--sp-2); }
-  :global(.record-tracker-icon) { width: 14px; height: 14px; border-radius: 2px; flex-shrink: 0; object-fit: contain; opacity: 0.75; }
+  .record-head { display: flex; align-items: center; justify-content: space-between; gap: var(--sp-2); padding: var(--sp-3) var(--sp-3) 0; }
+  .record-source { display: flex; align-items: center; gap: 6px; }
+  :global(.record-icon) { width: 14px; height: 14px; border-radius: 2px; flex-shrink: 0; object-fit: contain; opacity: 0.7; }
  .record-source-name { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wider); text-transform: uppercase; }
-  .record-head-actions { display: flex; align-items: center; gap: 2px; }
+  .record-external { display: flex; align-items: center; color: var(--text-faint); transition: color var(--t-base); }
+  .record-external:hover { color: var(--accent-fg); }
+  .record-actions { display: flex; align-items: center; gap: 2px; }

-  .record-title { display: inline-flex; align-items: center; gap: 4px; font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-secondary); text-decoration: none; line-height: var(--leading-snug); transition: color var(--t-base); }
-  .record-title:hover { color: var(--accent-fg); }
-  .record-title-plain { font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-secondary); line-height: var(--leading-snug); }
+  .pill-btn { display: flex; align-items: center; gap: 4px; font-family: var(--font-ui); font-size: 10px; letter-spacing: var(--tracking-wide); padding: 2px 7px; border-radius: var(--radius-full); border: 1px solid var(--border-dim); background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-base), background var(--t-base), border-color var(--t-base); }
+  .pill-btn:hover:not(:disabled) { color: var(--text-muted); border-color: var(--border-strong); }
+  .pill-btn-on { color: var(--accent-fg); background: var(--accent-muted); border-color: var(--accent-dim); }
+  .pill-btn:disabled { opacity: 0.35; cursor: default; }

-  .record-selects { display: flex; gap: var(--sp-2); flex-wrap: wrap; }
-  .record-select { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 5px 24px 5px 10px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: var(--bg-surface); color: var(--text-muted); outline: none; cursor: pointer; flex: 1; min-width: 0; appearance: none; -webkit-appearance: none; background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6' viewBox='0 0 10 6'%3E%3Cpath d='M1 1l4 4 4-4' stroke='%23555' stroke-width='1.5' fill='none' stroke-linecap='round'/%3E%3C/svg%3E"); background-repeat: no-repeat; background-position: right 8px center; transition: border-color var(--t-base), color var(--t-base); }
-  .record-select:hover:not(:disabled) { border-color: var(--border-strong); color: var(--text-secondary); }
-  .record-select:focus { border-color: var(--accent-dim); color: var(--text-secondary); }
-  .record-select:disabled { opacity: 0.35; cursor: default; }
-  .record-select option { background: var(--bg-surface); color: var(--text-secondary); }
-  .record-select-score { flex: 0 0 auto; min-width: 80px; }
-  .record-select-status { flex: 1; }
+  .icon-action { display: flex; align-items: center; justify-content: center; width: 24px; height: 24px; border-radius: var(--radius-sm); border: none; background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-base), background var(--t-base); flex-shrink: 0; }
+  .icon-action:hover:not(:disabled) { color: var(--text-muted); background: var(--bg-overlay); }
+  .icon-action-danger:hover:not(:disabled) { color: var(--color-error); background: color-mix(in srgb, var(--color-error) 10%, transparent); }
+  .icon-action:disabled { opacity: 0.3; cursor: default; }

-  .record-icon-btn { display: flex; align-items: center; justify-content: center; width: 22px; height: 22px; border-radius: var(--radius-sm); border: none; background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-base), background var(--t-base); flex-shrink: 0; }
-  .record-icon-btn:hover:not(:disabled) { color: var(--text-muted); background: var(--bg-overlay); }
-  .record-icon-btn.icon-active { color: var(--accent-fg); }
-  .record-icon-btn.icon-danger:hover:not(:disabled) { color: var(--color-error); background: var(--color-error-bg); }
-  .record-icon-btn:disabled { opacity: 0.3; cursor: default; }
+  .record-body { display: flex; flex-direction: column; gap: var(--sp-2); padding: var(--sp-2) var(--sp-3) var(--sp-3); }

-  .record-progress { display: flex; flex-direction: column; gap: 6px; }
-  .record-progress.clickable { cursor: pointer; border-radius: var(--radius-sm); padding: 4px 6px; margin: -4px -6px; transition: background var(--t-fast); }
-  .record-progress.clickable:hover { background: var(--bg-overlay); }
-  .record-progress-header { display: flex; align-items: center; justify-content: space-between; }
-  .record-progress-label { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
-  .edit-hint { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); opacity: 0; transition: opacity var(--t-fast); }
-  .record-progress.clickable:hover .edit-hint { opacity: 0.6; }
-  .record-progress-track { height: 2px; background: var(--border-strong); border-radius: var(--radius-full); overflow: hidden; }
-  .record-progress-fill { height: 100%; background: var(--accent); border-radius: var(--radius-full); transition: width 0.3s ease; }
+  .record-selects { display: flex; gap: var(--sp-2); }
+  .field-select { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 5px 22px 5px 9px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: var(--bg-surface); color: var(--text-muted); outline: none; cursor: pointer; flex: 1; min-width: 0; appearance: none; -webkit-appearance: none; background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='5' viewBox='0 0 8 5'%3E%3Cpath d='M1 1l3 3 3-3' stroke='%23555' stroke-width='1.3' fill='none' stroke-linecap='round'/%3E%3C/svg%3E"); background-repeat: no-repeat; background-position: right 7px center; transition: border-color var(--t-base), color var(--t-base); }
+  .field-select:hover:not(:disabled) { border-color: var(--border-strong); color: var(--text-secondary); }
+  .field-select:focus { border-color: var(--accent-dim); }
+  .field-select:disabled { opacity: 0.35; cursor: default; }
+  .field-select option { background: var(--bg-surface); color: var(--text-secondary); }
+  .score-select { flex: 0 0 auto; min-width: 76px; }

-  .chapter-editor { display: flex; flex-direction: column; gap: var(--sp-2); padding: var(--sp-3); border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: var(--bg-surface); }
-  .chapter-editor-top { display: flex; align-items: center; justify-content: space-between; gap: var(--sp-3); }
-  .chapter-editor-label { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
-  .chapter-input-wrap { display: flex; align-items: center; gap: var(--sp-2); }
-  .chapter-input { width: 64px; background: var(--bg-raised); border: 1px solid var(--border-strong); border-radius: var(--radius-sm); padding: 3px 6px; font-family: var(--font-ui); font-size: var(--text-sm); color: var(--text-primary); outline: none; text-align: center; }
-  .chapter-input:focus { border-color: var(--accent); }
-  .chapter-total { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
+  .progress-row { display: flex; align-items: center; justify-content: space-between; width: 100%; padding: 6px 8px; border-radius: var(--radius-sm); border: 1px solid transparent; background: none; cursor: pointer; text-align: left; transition: background var(--t-fast), border-color var(--t-fast); }
+  .progress-row:hover:not(:disabled) { background: var(--bg-overlay); border-color: var(--border-dim); }
+  .progress-row:disabled { cursor: default; }
+  .progress-labels { display: flex; flex-direction: column; gap: 1px; }
+  .progress-text { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
+  .progress-dates { font-family: var(--font-ui); font-size: 10px; color: var(--text-faint); opacity: 0.7; }
+  .progress-edit-hint { font-family: var(--font-ui); font-size: 10px; color: var(--text-faint); opacity: 0; letter-spacing: var(--tracking-wide); transition: opacity var(--t-fast); }
+  .progress-row:hover:not(:disabled) .progress-edit-hint { opacity: 0.5; }
+  .progress-track { height: 2px; background: var(--border-strong); border-radius: var(--radius-full); overflow: hidden; }
+  .progress-fill  { height: 100%; background: var(--accent); border-radius: var(--radius-full); transition: width 0.3s ease; }
+
+  .editor { display: flex; flex-direction: column; gap: var(--sp-2); padding: var(--sp-3); border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: var(--bg-surface); }
+  .editor-row { display: flex; align-items: center; justify-content: space-between; gap: var(--sp-3); }
+  .editor-label { font-family: var(--font-ui); font-size: 10px; color: var(--text-faint); letter-spacing: var(--tracking-wide); text-transform: uppercase; }
+  .editor-input-row { display: flex; align-items: center; gap: var(--sp-2); }
+  .editor-input { width: 60px; background: var(--bg-raised); border: 1px solid var(--border-strong); border-radius: var(--radius-sm); padding: 3px 6px; font-family: var(--font-ui); font-size: var(--text-sm); color: var(--text-primary); outline: none; text-align: center; transition: border-color var(--t-base); }
+  .editor-input:focus { border-color: var(--accent); }
+  .editor-total { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); }
  .chapter-slider { width: 100%; accent-color: var(--accent); cursor: pointer; height: 3px; }
-  .chapter-editor-actions { display: flex; gap: var(--sp-2); justify-content: flex-end; }
-  .chapter-save-btn { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 4px 12px; border-radius: var(--radius-sm); border: 1px solid var(--accent-dim); background: var(--accent-muted); color: var(--accent-fg); cursor: pointer; transition: filter var(--t-base); }
-  .chapter-save-btn:hover { filter: brightness(1.15); }
-  .chapter-cancel-btn { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 4px 8px; border-radius: var(--radius-sm); border: none; background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-base); }
-  .chapter-cancel-btn:hover { color: var(--text-muted); }

-  .search-bar { display: flex; align-items: center; gap: var(--sp-2); padding: var(--sp-3) var(--sp-4); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; background: var(--bg-surface); }
+  .date-row { display: flex; gap: var(--sp-3); padding-top: var(--sp-1); border-top: 1px solid var(--border-dim); }
+  .date-field { display: flex; align-items: center; gap: 5px; flex: 1; }
+  :global(.date-icon) { color: var(--text-faint); flex-shrink: 0; }
+  .date-input { flex: 1; min-width: 0; background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-sm); padding: 3px 6px; font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-muted); outline: none; transition: border-color var(--t-base); }
+  .date-input:focus { border-color: var(--accent-dim); }
+
+  .editor-actions { display: flex; gap: var(--sp-2); justify-content: flex-end; padding-top: var(--sp-1); }
+  .editor-save { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 4px 12px; border-radius: var(--radius-sm); border: 1px solid var(--accent-dim); background: var(--accent-muted); color: var(--accent-fg); cursor: pointer; transition: filter var(--t-base); }
+  .editor-save:hover { filter: brightness(1.15); }
+  .editor-cancel { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 4px 8px; border-radius: var(--radius-sm); border: none; background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-base); }
+  .editor-cancel:hover { color: var(--text-muted); }
+
+  .search-bar { display: flex; align-items: center; gap: var(--sp-2); padding: var(--sp-3) var(--sp-4); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; }
  :global(.search-icon) { color: var(--text-faint); flex-shrink: 0; }
  .search-input { flex: 1; background: none; border: none; outline: none; font-size: var(--text-sm); color: var(--text-primary); }
  .search-input::placeholder { color: var(--text-faint); }
+
  .search-results { flex: 1; overflow-y: auto; padding: var(--sp-2); scrollbar-width: none; }
  .search-results::-webkit-scrollbar { display: none; }

@@ -548,17 +627,27 @@
  .result-row:hover:not(:disabled) { background: var(--bg-raised); }
  .result-row:disabled { opacity: 0.4; cursor: default; }
  .result-bound { background: color-mix(in srgb, var(--accent) 8%, transparent) !important; }
-  .result-cover { width: 44px; height: 62px; object-fit: cover; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); flex-shrink: 0; }
+  .result-cover { width: 40px; height: 56px; object-fit: cover; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); flex-shrink: 0; }
  .result-cover-empty { background: var(--bg-raised); }
-  .result-info { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: var(--sp-1); padding-top: 2px; }
+  .result-info { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 4px; padding-top: 2px; }
  .result-title { font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); text-align: left; }
-  .result-meta { display: flex; flex-wrap: wrap; gap: var(--sp-1); }
-  .result-tag { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 1px 5px; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); background: var(--bg-raised); color: var(--text-faint); }
+  .result-meta { display: flex; flex-wrap: wrap; gap: 4px; }
+  .result-tag { font-family: var(--font-ui); font-size: 10px; letter-spacing: var(--tracking-wide); padding: 1px 5px; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); background: var(--bg-raised); color: var(--text-faint); }
  .result-summary { font-size: var(--text-xs); color: var(--text-faint); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-align: left; }
  .result-action { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); padding: 3px 10px; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); background: none; color: var(--text-faint); flex-shrink: 0; align-self: center; transition: color var(--t-base), border-color var(--t-base), background var(--t-base); }
  .result-row:hover:not(:disabled) .result-action { color: var(--accent-fg); border-color: var(--accent-dim); background: var(--accent-muted); }
  .result-action-on { color: var(--accent-fg) !important; border-color: var(--accent-dim) !important; background: var(--accent-muted) !important; }

+  .confirm-backdrop { position: fixed; inset: 0; z-index: calc(var(--z-settings) + 1); background: rgba(0,0,0,0.45); backdrop-filter: blur(2px); display: flex; align-items: center; justify-content: center; animation: fadeIn 0.1s ease both; }
+  .confirm-modal { background: var(--bg-surface); border: 1px solid var(--border-dim); border-radius: var(--radius-xl); padding: var(--sp-5); width: 260px; display: flex; flex-direction: column; gap: var(--sp-3); box-shadow: 0 16px 48px rgba(0,0,0,0.5); animation: scaleIn 0.15s ease both; }
+  .confirm-title { font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-primary); margin: 0; }
+  .confirm-body  { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); line-height: 1.5; margin: 0; letter-spacing: var(--tracking-wide); }
+  .confirm-row   { display: flex; gap: var(--sp-2); }
+  .confirm-cancel { flex: 1; font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); padding: 7px 0; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: none; color: var(--text-muted); cursor: pointer; transition: border-color var(--t-base), color var(--t-base); }
+  .confirm-cancel:hover { border-color: var(--border-strong); color: var(--text-primary); }
+  .confirm-ok { flex: 1; font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); padding: 7px 0; border-radius: var(--radius-md); border: 1px solid color-mix(in srgb, var(--color-error) 30%, transparent); background: color-mix(in srgb, var(--color-error) 8%, transparent); color: var(--color-error); cursor: pointer; transition: filter var(--t-base); }
+  .confirm-ok:hover { filter: brightness(1.2); }
+
  @keyframes fadeIn  { from { opacity: 0 }                         to { opacity: 1 } }
  @keyframes scaleIn { from { opacity: 0; transform: scale(0.97) } to { opacity: 1; transform: scale(1) } }
 </style>
@@ -139,8 +139,8 @@

 <svelte:window onkeydown={onKey} />

-<div class="backdrop" role="presentation" onclick={onClose} onkeydown={(e) => e.key === "Escape" && onClose()}>
-  <div class="shell" role="dialog" aria-label="Theme editor" tabindex="0" style={toCssVars(tokens)} onclick={(e) => e.stopPropagation()}>
+<div class="backdrop" role="button" tabindex="-1" aria-label="Close theme editor" onclick={onClose} onkeydown={(e) => e.key === "Escape" && onClose()}>
+  <div class="shell" role="dialog" aria-label="Theme editor" tabindex="0" style={toCssVars(tokens)} onclick={(e) => e.stopPropagation()} onkeydown={(e) => e.stopPropagation()}>

    <header class="header">
      <div class="header-left">
@@ -4,11 +4,16 @@
  import { getVersion } from "@tauri-apps/api/app";
  import { open as openUrl } from "@tauri-apps/plugin-shell";
  import { autoBackupAppData } from "@core/backup";
+  import { gql } from "@api/client";
+  import { GET_ABOUT_SERVER, GET_ABOUT_WEBUI } from "@api/queries/updater";

  interface ReleaseInfo { tag_name: string; name: string; body: string; published_at: string; html_url: string; }
  type UpdatePhase = "idle" | "downloading" | "launching" | "ready" | "error";
  const IS_WINDOWS = navigator.userAgent.includes("Windows");

+  interface AboutServer { name: string; version: string; buildType: string; buildTime: number; github: string; discord: string; }
+  interface AboutWebUI  { channel: string; tag: string; updateTimestamp: number; }
+
  let appVersion      = $state("…");
  let releases        = $state<ReleaseInfo[]>([]);
  let releasesLoading = $state(false);
@@ -21,9 +26,13 @@
  let targetTag       = $state<string | null>(null);
  let releasesLoaded  = false;

+  let serverInfo      = $state<AboutServer | null>(null);
+  let webuiInfo       = $state<AboutWebUI | null>(null);
+
  $effect(() => {
    getVersion().then(v => appVersion = v).catch(() => appVersion = "unknown");
    if (!releasesLoaded) { releasesLoaded = true; loadReleases(); }
+    loadServerInfo();
  });

  $effect(() => {
@@ -52,6 +61,17 @@
    } finally { releasesLoading = false; }
  }

+  async function loadServerInfo() {
+    try {
+      const [s, w] = await Promise.all([
+        gql<{ aboutServer: AboutServer }>(GET_ABOUT_SERVER),
+        gql<{ aboutWebUI: AboutWebUI }>(GET_ABOUT_WEBUI),
+      ]);
+      serverInfo = s.aboutServer;
+      webuiInfo  = w.aboutWebUI;
+    } catch {}
+  }
+
  function stripV(v: string) { return v.replace(/^v/, ""); }
  function isCurrentVersion(tag: string) { return stripV(tag) === appVersion; }
  function parseSemver(v: string) { return stripV(v).split(".").map(Number); }
@@ -72,6 +92,11 @@
    return new Date(iso).toLocaleDateString(undefined, { year: "numeric", month: "short", day: "numeric" });
  }

+  function fmtBuildTime(unix: number) {
+    if (!unix) return "";
+    return new Date(unix).toLocaleDateString(undefined, { year: "numeric", month: "short", day: "numeric" });
+  }
+
  function fmtBytes(bytes: number) {
    if (bytes === 0) return "0 B";
    const units = ["B","KB","MB","GB"];
@@ -164,6 +189,41 @@
    </div>
  </div>

+  {#if serverInfo}
+    <div class="s-section">
+      <p class="s-section-title">Server</p>
+      <div class="s-section-body">
+        <div class="s-row">
+          <div class="s-row-info">
+            <span class="s-label">Version</span>
+            <span class="s-desc">
+              {serverInfo.version}
+              {#if serverInfo.buildType}
+                <span class="s-release-badge">{serverInfo.buildType}</span>
+              {/if}
+            </span>
+          </div>
+        </div>
+        {#if serverInfo.buildTime}
+          <div class="s-row">
+            <div class="s-row-info">
+              <span class="s-label">Built</span>
+              <span class="s-desc">{fmtBuildTime(serverInfo.buildTime)}</span>
+            </div>
+          </div>
+        {/if}
+        {#if webuiInfo?.channel}
+          <div class="s-row">
+            <div class="s-row-info">
+              <span class="s-label">Channel</span>
+              <span class="s-desc">{webuiInfo.channel}</span>
+            </div>
+          </div>
+        {/if}
+      </div>
+    </div>
+  {/if}
+
  <div class="s-section">
    <p class="s-section-title">Releases</p>
    <div class="s-section-body">
@@ -223,6 +283,12 @@
      <div class="s-row" style="flex-direction:column;align-items:flex-start;gap:var(--sp-2)">
        <a href="https://github.com/moku-project/Moku" target="_blank" class="s-label" style="color:var(--accent-fg);text-decoration:none">GitHub →</a>
        <a href="https://discord.gg/Jq3pwuNqPp" target="_blank" class="s-label" style="color:var(--accent-fg);text-decoration:none">Discord →</a>
+        {#if serverInfo?.github && serverInfo.github !== "https://github.com/moku-project/Moku"}
+          <a href={serverInfo.github} target="_blank" class="s-label" style="color:var(--accent-fg);text-decoration:none">Suwayomi GitHub →</a>
+        {/if}
+        {#if serverInfo?.discord && serverInfo.discord !== "https://discord.gg/Jq3pwuNqPp"}
+          <a href={serverInfo.discord} target="_blank" class="s-label" style="color:var(--accent-fg);text-decoration:none">Suwayomi Discord →</a>
+        {/if}
      </div>
    </div>
  </div>
@@ -32,8 +32,8 @@
    mountSystemThemeSync();
  }

-  let triggerDark:  HTMLButtonElement;
-  let triggerLight: HTMLButtonElement;
+  let triggerDark  = $state<HTMLButtonElement>(null!);
+  let triggerLight = $state<HTMLButtonElement>(null!);
 </script>

 <div class="s-panel">
@@ -49,6 +49,7 @@
        class:on={store.settings.systemThemeSync}
        onclick={toggleSync}
        role="switch"
+        aria-label="Match system theme"
        aria-checked={store.settings.systemThemeSync}
      ><span class="s-toggle-thumb"></span></button>
    </div>
@@ -1,18 +1,17 @@
 <script lang="ts">
-  import { Plus, Tag } from "phosphor-svelte";
-  import { store, updateSettings } from "@store/state.svelte";
-  import { gql, thumbUrl } from "@api/client";
+  import { thumbUrl, gql } from "@api/client";
  import { GET_SOURCES }   from "@api/queries/index";
-  import type { Source } from "../../lib/types";
+  import { store, updateSettings } from "@store/state.svelte";
+  import type { ContentLevel } from "@types/settings";
+  import type { Source } from "@types";

  let contentSources:        Source[] = $state([]);
  let contentSourcesLoading: boolean  = $state(false);
-  let newTagInput                     = $state("");
-  let tagsRevealed                    = $state(false);
  let sourceSearch                    = $state("");

  $effect(() => {
-    if (contentSources.length === 0 && !contentSourcesLoading) loadContentSources();
+    if (store.settings.sourceOverridesEnabled && contentSources.length === 0 && !contentSourcesLoading)
+      loadContentSources();
  });

  async function loadContentSources() {
@@ -24,22 +23,6 @@
    finally { contentSourcesLoading = false; }
  }

-  function addTag() {
-    const t = newTagInput.trim().toLowerCase();
-    if (!t) return;
-    const tags = store.settings.nsfwFilteredTags ?? [];
-    if (!tags.includes(t)) updateSettings({ nsfwFilteredTags: [...tags, t] });
-    newTagInput = "";
-  }
-
-  function removeTag(tag: string) {
-    updateSettings({ nsfwFilteredTags: (store.settings.nsfwFilteredTags ?? []).filter(t => t !== tag) });
-  }
-
-  function resetTags() {
-    updateSettings({ nsfwFilteredTags: ["adult","mature","hentai","ecchi","erotic","pornograph","18+","smut","lemon","explicit","sexual violence"] });
-  }
-
  function toggleSourceAllowed(ids: string[]) {
    const allowed = store.settings.nsfwAllowedSourceIds ?? [];
    const blocked = store.settings.nsfwBlockedSourceIds ?? [];
@@ -72,69 +55,66 @@

  const contentSourcesFiltered = $derived.by(() => {
    const q = sourceSearch.trim().toLowerCase();
-    const filtered = q ? contentSources.filter(s => s.displayName.toLowerCase().includes(q) || s.lang.toLowerCase().includes(q)) : contentSources;
+    const filtered = q
+      ? contentSources.filter(s => s.displayName.toLowerCase().includes(q) || s.lang.toLowerCase().includes(q))
+      : contentSources;
    const map = new Map<string, ContentSourceGroup>();
    for (const s of filtered) {
-      const key = s.name;
-      if (!map.has(key)) map.set(key, { name: s.name, iconUrl: s.iconUrl, isNsfw: s.isNsfw, sources: [] });
-      map.get(key)!.sources.push(s);
+      if (!map.has(s.name)) map.set(s.name, { name: s.name, iconUrl: s.iconUrl, isNsfw: s.isNsfw, sources: [] });
+      map.get(s.name)!.sources.push(s);
    }
    return Array.from(map.values());
  });
+
+  const LEVELS: { value: ContentLevel; label: string; desc: string }[] = [
+    { value: "strict",       label: "Strict",       desc: "Hides all adult, sexual, and graphic violent content" },
+    { value: "moderate",     label: "Moderate",     desc: "Allows violence and gore, filters sexual content" },
+    { value: "unrestricted", label: "Unrestricted", desc: "No content filtering applied" },
+  ];
 </script>

 <div class="s-panel">

  <div class="s-section">
-    <p class="s-section-title">Content Filter</p>
+    <p class="s-section-title">Content Level</p>
    <div class="s-section-body">
-      <label class="s-row">
-        <div class="s-row-info"><span class="s-label">Show adult content</span><span class="s-desc">Sources and manga matching blocked tags are hidden when off</span></div>
-        <button role="switch" aria-checked={store.settings.showNsfw} aria-label="Show adult content" class="s-toggle" class:on={store.settings.showNsfw}
-          onclick={() => updateSettings({ showNsfw: !store.settings.showNsfw })}><span class="s-toggle-thumb"></span></button>
-      </label>
+      <div class="s-row" style="border-bottom: none; padding-bottom: 0;">
+        <span class="s-desc">Controls what content is visible across library, search, and discover.</span>
      </div>
+      <div class="s-level-group">
+        {#each LEVELS as lvl}
+          {@const active = store.settings.contentLevel === lvl.value}
+          <button class="s-level-btn" class:active onclick={() => updateSettings({ contentLevel: lvl.value })}>
+            <span class="s-level-dot" class:active></span>
+            <div class="s-level-text">
+              <span class="s-level-label">{lvl.label}</span>
+              <span class="s-level-desc">{lvl.desc}</span>
            </div>
-
-  <div class="s-section">
-    <p class="s-section-title">
-      Blocked Genre Tags
-      <button class="s-btn" onclick={() => tagsRevealed = !tagsRevealed}>
-        {tagsRevealed ? "Hide" : `Show (${(store.settings.nsfwFilteredTags ?? []).length})`}
          </button>
-    </p>
-    <div class="s-section-body">
-      <div class="s-row" style="padding-bottom:var(--sp-2)">
-        <span class="s-desc">Manga matching any of these substrings are filtered. Case-insensitive, partial match.</span>
-      </div>
-      {#if tagsRevealed}
-        <div class="s-tag-grid">
-          {#each (store.settings.nsfwFilteredTags ?? []) as tag}
-            <span class="s-tag">
-              <Tag size={10} weight="light" />
-              {tag}
-              <button class="s-tag-remove" onclick={() => removeTag(tag)} title="Remove tag">×</button>
-            </span>
        {/each}
      </div>
-      {/if}
-      <div class="s-tag-add">
-        <input class="s-input full" placeholder="Add tag substring…" bind:value={newTagInput}
-          onkeydown={(e) => { if (e.key === "Enter") addTag(); }} />
-        <button class="s-btn s-btn-accent" onclick={addTag} disabled={!newTagInput.trim()}>
-          <Plus size={13} weight="bold" /> Add
-        </button>
-        <button class="s-btn" onclick={resetTags}>Reset</button>
-      </div>
    </div>
  </div>

  <div class="s-section">
    <p class="s-section-title">Source Overrides</p>
    <div class="s-section-body">
-      <div class="s-row">
-        <span class="s-desc">Allow lets a source through even if flagged NSFW. Block always hides it.</span>
+      <label class="s-row">
+        <div class="s-row-info">
+          <span class="s-label">Per-source overrides</span>
+          <span class="s-desc">Allow a source through even if flagged NSFW, or always block it. Allowed sources still respect the active content level.</span>
        </div>
+        <button
+          role="switch"
+          aria-checked={store.settings.sourceOverridesEnabled}
+          aria-label="Enable source overrides"
+          class="s-toggle"
+          class:on={store.settings.sourceOverridesEnabled}
+          onclick={() => updateSettings({ sourceOverridesEnabled: !store.settings.sourceOverridesEnabled })}
+        ><span class="s-toggle-thumb"></span></button>
+      </label>
+
+      {#if store.settings.sourceOverridesEnabled}
        <div class="s-search-wrap">
          <input class="s-input full" placeholder="Filter sources…" bind:value={sourceSearch} />
        </div>
@@ -154,7 +134,9 @@
                <img src={thumbUrl(group.iconUrl)} alt="" class="s-source-icon" loading="lazy" decoding="async" />
                <div class="s-source-info">
                  <span class="s-source-name">{group.name}</span>
-                <span class="s-source-meta">{group.sources[0].isNsfw ? "NSFW · " : ""}{group.sources.length > 1 ? `${group.sources.length} languages` : group.sources[0].lang.toUpperCase()}</span>
+                  <span class="s-source-meta">
+                    {group.sources[0].isNsfw ? "NSFW · " : ""}{group.sources.length > 1 ? `${group.sources.length} languages` : group.sources[0].lang.toUpperCase()}
+                  </span>
                </div>
                <div class="s-source-actions">
                  <button class="s-source-action-btn" class:allow={isAllowed} onclick={() => toggleSourceAllowed(ids)}>Allow</button>
@@ -164,7 +146,67 @@
            {/each}
          </div>
        {/if}
+      {/if}
    </div>
  </div>

 </div>
+
+<style>
+  .s-level-group {
+    display: flex;
+    flex-direction: column;
+    padding: var(--sp-2) var(--sp-4) var(--sp-3);
+    gap: var(--sp-1);
+  }
+
+  .s-level-btn {
+    display: flex;
+    align-items: center;
+    gap: var(--sp-3);
+    padding: 10px var(--sp-3);
+    border-radius: var(--radius-md);
+    border: 1px solid var(--border-dim);
+    background: var(--bg-surface);
+    cursor: pointer;
+    text-align: left;
+    transition: border-color var(--t-base), background var(--t-base);
+    width: 100%;
+  }
+  .s-level-btn:hover  { background: var(--bg-overlay); border-color: var(--border-strong); }
+  .s-level-btn.active { background: var(--accent-muted); border-color: var(--accent-dim); }
+
+  .s-level-dot {
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    border: 1.5px solid var(--border-strong);
+    background: none;
+    flex-shrink: 0;
+    transition: border-color var(--t-base), background var(--t-base);
+  }
+  .s-level-dot.active { border-color: var(--accent); background: var(--accent); }
+
+  .s-level-text {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    min-width: 0;
+  }
+
+  .s-level-label {
+    font-size: var(--text-sm);
+    color: var(--text-secondary);
+    line-height: 1.3;
+  }
+  .s-level-btn.active .s-level-label { color: var(--accent-fg); }
+
+  .s-level-desc {
+    font-family: var(--font-ui);
+    font-size: var(--text-xs);
+    color: var(--text-faint);
+    letter-spacing: var(--tracking-wide);
+    line-height: var(--leading-snug);
+  }
+  .s-level-btn.active .s-level-desc { color: var(--accent-fg); opacity: 0.7; }
+</style>
@@ -2,6 +2,7 @@
  import ThreeDCard from "@shared/manga/ThreeDCard.svelte";
  import { store, addToast } from "@store/state.svelte";
  import { cache } from "@core/cache/index";
+  import { invoke } from "@tauri-apps/api/core";

  interface PerfSnapshot { cacheEntries: number; cacheKeys: string[]; oldestEntryMs: number | null; newestEntryMs: number | null; }

@@ -9,10 +10,13 @@
  let splashTriggered = $state(false);
  let expOpen         = $state(false);
  let appVersion      = $state("…");
+  let helloAvailable  = $state<boolean | null>(null);
+  let helloBusy       = $state(false);

  $effect(() => {
    import("@tauri-apps/api/app").then(m => m.getVersion()).then(v => appVersion = v).catch(() => {});
    refreshPerfMetrics();
+    invoke<boolean>("windows_hello_available").then(v => helloAvailable = v).catch(() => helloAvailable = false);
  });

  function refreshPerfMetrics() {
@@ -49,6 +53,18 @@
    setTimeout(() => splashTriggered = false, 200);
    (window as any).__mokuShowSplash?.();
  }
+
+  async function testWindowsHello() {
+    helloBusy = true;
+    try {
+      await invoke("windows_hello_authenticate", { reason: "Moku devtools test" });
+      addToast({ kind: "success", title: "Windows Hello", body: "Verified successfully" });
+    } catch (e: any) {
+      addToast({ kind: "error", title: "Windows Hello", body: String(e) });
+    } finally {
+      helloBusy = false;
+    }
+  }
 </script>

 <div class="s-panel">
@@ -81,6 +97,21 @@
    </div>
  </div>

+  <div class="s-section">
+    <p class="s-section-title">Biometrics</p>
+    <div class="s-section-body">
+      <div class="s-row">
+        <div class="s-row-info">
+          <span class="s-label">Windows Hello</span>
+          <span class="s-desc">Available: {helloAvailable === null ? "…" : helloAvailable ? "yes" : "no"}</span>
+        </div>
+        <button class="s-btn" disabled={!helloAvailable || helloBusy} onclick={testWindowsHello}>
+          {helloBusy ? "…" : "Test"}
+        </button>
+      </div>
+    </div>
+  </div>
+
  <div class="s-section">
    <button class="s-collapsible-trigger" onclick={() => expOpen = !expOpen} aria-expanded={expOpen}>
      <span class="s-label">Experimental</span>
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { FolderSimple, Plus, Pencil, Trash, Star, Eye, EyeSlash } from "phosphor-svelte";
+  import { FolderSimple, Plus, Pencil, Trash, Star, Eye, EyeSlash, ArrowsClockwise, DownloadSimple } from "phosphor-svelte";
  import { gql } from "@api/client";
  import { GET_CATEGORIES } from "@api/queries/manga";
-  import { CREATE_CATEGORY, UPDATE_CATEGORY, DELETE_CATEGORY, UPDATE_CATEGORY_ORDER } from "@api/mutations/manga";
+  import { CREATE_CATEGORY, UPDATE_CATEGORY, UPDATE_CATEGORIES, DELETE_CATEGORY, UPDATE_CATEGORY_ORDER } from "@api/mutations/manga";
  import type { Category } from "@types";
  import { store, updateSettings, toggleHiddenCategory, setCategories } from "@store/state.svelte";

@@ -57,6 +57,19 @@
    } catch (e: any) { catsError = e?.message ?? "Failed to delete folder"; }
  }

+  async function toggleCategoryFlag(id: number, flag: "includeInUpdate" | "includeInDownload") {
+    const cat = store.categories.find(c => c.id === id);
+    if (!cat) return;
+    const next = !cat[flag];
+    setCategories(store.categories.map(c => c.id === id ? { ...c, [flag]: next } : c));
+    try {
+      await gql(UPDATE_CATEGORIES, { ids: [id], patch: { [flag]: next } });
+    } catch (e: any) {
+      setCategories(store.categories.map(c => c.id === id ? { ...c, [flag]: !next } : c));
+      catsError = e?.message ?? "Failed to update folder";
+    }
+  }
+
  async function moveCategory(id: number, direction: -1 | 1) {
    const zeroCat  = store.categories.filter(c => c.id === 0);
    const sortable = store.categories.filter(c => c.id !== 0).sort((a, b) => a.order - b.order);
@@ -144,6 +157,20 @@
                title={(store.settings.hiddenCategoryIds ?? []).includes(cat.id) ? "Show in Saved tab" : "Hide from Saved tab"}>
                {#if (store.settings.hiddenCategoryIds ?? []).includes(cat.id)}<EyeSlash size={13} weight="light" />{:else}<Eye size={13} weight="light" />{/if}
              </button>
+              <button
+                class="s-btn-icon"
+                class:accent={cat.includeInUpdate !== false}
+                onclick={() => toggleCategoryFlag(cat.id, "includeInUpdate")}
+                title={cat.includeInUpdate !== false ? "Exclude from library updates" : "Include in library updates"}>
+                <ArrowsClockwise size={13} weight={cat.includeInUpdate !== false ? "bold" : "light"} />
+              </button>
+              <button
+                class="s-btn-icon"
+                class:accent={cat.includeInDownload !== false}
+                onclick={() => toggleCategoryFlag(cat.id, "includeInDownload")}
+                title={cat.includeInDownload !== false ? "Exclude from auto-downloads" : "Include in auto-downloads"}>
+                <DownloadSimple size={13} weight={cat.includeInDownload !== false ? "bold" : "light"} />
+              </button>
              <button class="s-btn-icon" onclick={() => moveCategory(cat.id, -1)} disabled={i === 0} title="Move up">↑</button>
              <button class="s-btn-icon" onclick={() => moveCategory(cat.id, 1)} disabled={i === displayCats.length - 1} title="Move down">↓</button>
              <button class="s-btn-icon" onclick={() => startEdit(cat.id, cat.name)} title="Rename"><Pencil size={12} weight="light" /></button>
@@ -11,7 +11,7 @@

  let { selectOpen, closingSelect, toggleSelect, anims }: Props = $props();

-  let triggerIdleTimeout: HTMLButtonElement;
+  let triggerIdleTimeout = $state<HTMLButtonElement>(null!);
 </script>

 <div class="s-panel">
@@ -11,7 +11,7 @@

  let { selectOpen, toggleSelect, anims }: Props = $props();

-  let triggerSortDir: HTMLButtonElement;
+  let triggerSortDir = $state<HTMLButtonElement>(null!);
 </script>

 <div class="s-panel">
@@ -63,7 +63,16 @@
  </div>

  <div class="s-section">
-    <p class="s-section-title">History</p>
+    <p class="s-section-title">Series</p>
+    <div class="s-section-body">
+      <label class="s-row">
+        <div class="s-row-info"><span class="s-label">Auto-link on open</span><span class="s-desc">When opening a manga, automatically link it to similarly-titled entries and notify you of new matches</span></div>
+        <button role="switch" aria-checked={store.settings.autoLinkOnOpen ?? false} aria-label="Auto-link on open" class="s-toggle" class:on={store.settings.autoLinkOnOpen ?? false} onclick={() => updateSettings({ autoLinkOnOpen: !(store.settings.autoLinkOnOpen ?? false) })}><span class="s-toggle-thumb"></span></button>
+      </label>
+    </div>
+  </div>
+
+  <div class="s-section">
    <div class="s-section-body">
      <div class="s-row">
        <div class="s-row-info"><span class="s-label">Reading history</span><span class="s-desc">{store.history.length} entries</span></div>
@@ -11,9 +11,9 @@

  let { selectOpen, toggleSelect, anims }: Props = $props();

-  let triggerPageStyle:  HTMLButtonElement;
-  let triggerReadingDir: HTMLButtonElement;
-  let triggerFitMode:    HTMLButtonElement;
+  let triggerPageStyle  = $state<HTMLButtonElement>(null!);
+  let triggerReadingDir = $state<HTMLButtonElement>(null!);
+  let triggerFitMode    = $state<HTMLButtonElement>(null!);
 </script>

 <div class="s-panel">
@@ -88,20 +88,20 @@
        </div>
      </div>
      <div class="s-slider-row">
-        <input type="range" min={10} max={400} step={5}
+        <input type="range" min={10} max={100} step={5}
          value={Math.round((store.settings.readerZoom ?? 0.5) * 100)}
          oninput={(e) => updateSettings({ readerZoom: Number(e.currentTarget.value) / 100 })}
          class="s-slider" />
-        <input type="number" min={10} max={400} step={5} class="s-slider-val"
+        <input type="number" min={10} max={100} step={5} class="s-slider-val"
          value={Math.round((store.settings.readerZoom ?? 0.5) * 100)}
-          oninput={(e) => { const n = parseInt(e.currentTarget.value, 10); if (!isNaN(n) && n >= 10 && n <= 400) updateSettings({ readerZoom: n / 100 }); }}
-          onblur={(e) => { const n = parseInt(e.currentTarget.value, 10); if (isNaN(n) || n < 10) { updateSettings({ readerZoom: 0.1 }); e.currentTarget.value = "10"; } else if (n > 400) { updateSettings({ readerZoom: 4.0 }); e.currentTarget.value = "400"; } }}
+          oninput={(e) => { const n = parseInt(e.currentTarget.value, 10); if (!isNaN(n) && n >= 10 && n <= 100) updateSettings({ readerZoom: n / 100 }); }}
+          onblur={(e) => { const n = parseInt(e.currentTarget.value, 10); if (isNaN(n) || n < 10) { updateSettings({ readerZoom: 0.1 }); e.currentTarget.value = "10"; } else if (n > 100) { updateSettings({ readerZoom: 1.0 }); e.currentTarget.value = "100"; } }}
        />
        <span class="s-slider-unit">%</span>
        <button class="s-btn-icon" onclick={() => updateSettings({ readerZoom: 0.5 })} disabled={(store.settings.readerZoom ?? 0.5) === 0.5} title="Reset to 100%">↺</button>
      </div>
      <div class="s-presets">
-        {#each [50, 75, 100, 125, 150, 200] as v}
+        {#each [0, 10, 30, 50, 70, 90, 100] as v}
          <button class="s-preset" class:active={Math.round((store.settings.readerZoom ?? 0.5) * 100) === v} onclick={() => updateSettings({ readerZoom: v / 100 })}>{v}%</button>
        {/each}
      </div>
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { store, updateSettings, addToast } from "@store/state.svelte";
+  import { store, updateSettings } from "@store/state.svelte";
  import { gql } from "@api/client";
  import { authSession } from "@core/auth";
  import { GET_SERVER_SECURITY } from "@api/queries/extensions";
@@ -10,8 +10,6 @@

  let showAuthPass  = $state(false);
  let showSocksPass = $state(false);
-  let pinInput      = $state(store.settings.appLockPin ?? "");
-  let pinError      = $state("");
  let secLoading    = $state(false);
  let secError      = $state<string | null>(null);
  let secSaved      = $state<string | null>(null);
@@ -21,11 +19,6 @@
  let authUsername = $state(store.settings.serverAuthUser ?? "");
  let authPassword = $state("");

-  const authModeUnsupported = $derived(
-    store.settings.serverAuthMode === "SIMPLE_LOGIN" ||
-    store.settings.serverAuthMode === "UI_LOGIN"
-  );
-
  let socksEnabled  = $state(store.settings.socksProxyEnabled ?? false);
  let socksHost     = $state(store.settings.socksProxyHost ?? "");
  let socksPort     = $state(store.settings.socksProxyPort ?? "1080");
@@ -38,7 +31,7 @@
  let flareTimeout  = $state(store.settings.flareSolverrTimeout ?? 60);
  let flareSession  = $state(store.settings.flareSolverrSessionName ?? "moku");
  let flareTtl      = $state(store.settings.flareSolverrSessionTtl ?? 15);
-  let flareFallback = $state(store.settings.flareSolverrFallback ?? false);
+  let flareFallback = $state(store.settings.flareSolverrAsResponseFallback ?? false);

  function showSaved(key: string) {
    secSaved = key; secError = null;
@@ -60,9 +53,9 @@
        flareSolverrAsResponseFallback: boolean;
      }}>(GET_SERVER_SECURITY);
      const s = res.settings;
-      const mode = (s.authMode ?? "NONE") as "NONE" | "BASIC_AUTH" | "SIMPLE_LOGIN" | "UI_LOGIN";
-      authMode = mode; authUsername = s.authUsername;
-      updateSettings({ serverAuthMode: mode, serverAuthUser: s.authUsername });
+      authMode = store.settings.serverAuthMode ?? "NONE";
+      authUsername = s.authUsername || store.settings.serverAuthUser || "";
+      updateSettings({ serverAuthUser: authUsername });
      socksEnabled = s.socksProxyEnabled; socksHost = s.socksProxyHost;
      socksPort = s.socksProxyPort; socksVersion = s.socksProxyVersion;
      socksUsername = s.socksProxyUsername;
@@ -74,25 +67,34 @@
        socksProxyVersion: socksVersion, socksProxyUsername: socksUsername,
        flareSolverrEnabled: flareEnabled, flareSolverrUrl: flareUrl,
        flareSolverrTimeout: flareTimeout, flareSolverrSessionName: flareSession,
-        flareSolverrSessionTtl: flareTtl, flareSolverrFallback: flareFallback,
+        flareSolverrSessionTtl: flareTtl, flareSolverrAsResponseFallback: flareFallback,
      });
    } catch {}
  }

  async function saveAuth() {
-    if (authMode === "BASIC_AUTH" && (!authUsername.trim() || !authPassword.trim())) {
-      secError = "Username and password are required for Basic Auth"; return;
+    if ((authMode === "BASIC_AUTH" || authMode === "UI_LOGIN") && (!authUsername.trim() || !authPassword.trim())) {
+      secError = "Username and password are required"; return;
    }
    secLoading = true; secError = null;
    const prev = { mode: store.settings.serverAuthMode, user: store.settings.serverAuthUser, pass: store.settings.serverAuthPass };
-    const newUser = authMode === "BASIC_AUTH" ? authUsername.trim() : "";
-    const newPass = authMode === "BASIC_AUTH" ? authPassword.trim() : "";
-    if (authMode === "BASIC_AUTH" && !prev.pass.trim())
-      updateSettings({ serverAuthMode: authMode as any, serverAuthUser: newUser, serverAuthPass: newPass });
+
    try {
+      const newUser = authMode !== "NONE" ? authUsername.trim() : "";
+      const newPass = authMode !== "NONE" ? authPassword.trim() : "";
      await gql(SET_SERVER_AUTH, { authMode, authUsername: newUser, authPassword: newPass });
-      updateSettings({ serverAuthMode: authMode as any, serverAuthUser: newUser, serverAuthPass: newPass });
-      if (authMode === "NONE") { authSession.clearTokens(); authPassword = ""; }
+
+      if (authMode === "UI_LOGIN") {
+        authSession.clearTokens();
+        updateSettings({ serverAuthMode: "UI_LOGIN", serverAuthUser: newUser, serverAuthPass: "" });
+      } else if (authMode === "BASIC_AUTH") {
+        updateSettings({ serverAuthMode: "BASIC_AUTH", serverAuthUser: newUser, serverAuthPass: newPass });
+      } else {
+        authSession.clearTokens();
+        updateSettings({ serverAuthMode: "NONE", serverAuthUser: "", serverAuthPass: "" });
+      }
+
+      authPassword = "";
      showSaved("auth");
    } catch (e: any) {
      updateSettings({ serverAuthMode: prev.mode, serverAuthUser: prev.user, serverAuthPass: prev.pass });
@@ -144,7 +146,7 @@
      updateSettings({
        flareSolverrEnabled: flareEnabled, flareSolverrUrl: flareUrl,
        flareSolverrTimeout: flareTimeout, flareSolverrSessionName: flareSession,
-        flareSolverrSessionTtl: flareTtl, flareSolverrFallback: flareFallback,
+        flareSolverrSessionTtl: flareTtl, flareSolverrAsResponseFallback: flareFallback,
      });
      showSaved("flare");
    } catch (e: any) {
@@ -152,12 +154,13 @@
    } finally { secLoading = false; }
  }

-  function commitPin() {
-    const cleaned = pinInput.replace(/\D/g, "").slice(0, 8);
-    pinInput = cleaned;
-    if (cleaned.length >= 4) { updateSettings({ appLockPin: cleaned }); pinError = ""; }
-    else if (cleaned.length > 0) { pinError = "PIN must be at least 4 digits"; }
-    else { updateSettings({ appLockPin: "" }); pinError = ""; }
+  function forceResetAuth() {
+    authSession.clearTokens();
+    authMode = "NONE";
+    authUsername = "";
+    authPassword = "";
+    updateSettings({ serverAuthMode: "NONE", serverAuthUser: "", serverAuthPass: "" });
+    showSaved("auth");
  }

  const EyeOpen  = `<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg>`;
@@ -173,22 +176,16 @@
  <div class="s-section">
    <p class="s-section-title">
      Server Authentication
-      <span class="s-pill" class:on={store.settings.serverAuthMode === "BASIC_AUTH"} class:warn={authModeUnsupported}>
+      <span class="s-pill" class:on={store.settings.serverAuthMode === "BASIC_AUTH" || store.settings.serverAuthMode === "UI_LOGIN"}>
        {store.settings.serverAuthMode === "BASIC_AUTH" ? "Basic Auth" :
-         store.settings.serverAuthMode === "SIMPLE_LOGIN" ? "Simple Login — unsupported"  :
-         store.settings.serverAuthMode === "UI_LOGIN"     ? "UI Login — unsupported"      : "Disabled"}
+         store.settings.serverAuthMode === "UI_LOGIN"   ? "UI Login"  : "Disabled"}
      </span>
    </p>
    <div class="s-section-body">
-      {#if authModeUnsupported}
-        <div class="s-banner s-banner-warn">
-          <strong>{store.settings.serverAuthMode === "SIMPLE_LOGIN" ? "Simple Login" : "UI Login"}</strong> is not supported — only <strong>Basic Auth</strong> works here. Switch your server to <code>basic_auth</code> and set the mode to <strong>Basic</strong>.
-        </div>
-      {/if}
      <div class="s-row">
-        <div class="s-row-info"><span class="s-label">Mode</span><span class="s-desc">How Suwayomi verifies requests</span></div>
+        <div class="s-row-info"><span class="s-label">Mode</span><span class="s-desc">How Moku authenticates with the server</span></div>
        <div class="s-segment">
-          {#each [{ value: "NONE", label: "None" }, { value: "BASIC_AUTH", label: "Basic" }] as opt}
+          {#each [{ value: "NONE", label: "None" }, { value: "BASIC_AUTH", label: "Basic" }, { value: "UI_LOGIN", label: "UI Login" }] as opt}
            <button class="s-segment-btn" class:active={authMode === opt.value}
              onclick={() => authMode = opt.value as any} disabled={secLoading}>{opt.label}</button>
          {/each}
@@ -203,7 +200,7 @@
          <div class="s-row-info"><span class="s-label">Password</span></div>
          <div class="s-field-wrap">
            <input class="s-input" type={showAuthPass ? "text" : "password"} bind:value={authPassword} placeholder="Password" autocomplete="off" spellcheck="false" disabled={secLoading} />
-            <button class="s-eye-btn" onclick={() => showAuthPass = !showAuthPass} tabindex="-1">{@html showAuthPass ? EyeClose : EyeOpen}</button>
+            <button class="s-eye-btn" onclick={() => showAuthPass = !showAuthPass} tabindex="-1" aria-label={showAuthPass ? "Hide password" : "Show password"}>{@html showAuthPass ? EyeClose : EyeOpen}</button>
          </div>
        </div>
      {/if}
@@ -213,7 +210,12 @@
        </div>
      {/if}
      <div class="s-row">
-        <div class="s-row-info"></div>
+        <div class="s-row-info">
+          <button class="s-ghost-btn" onclick={forceResetAuth} disabled={secLoading} title="Force reset local auth state">
+            <svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
+            Reset
+          </button>
+        </div>
        <div class="s-btn-row">
          {#if store.settings.serverAuthMode !== "NONE"}
            <button class="s-btn s-btn-danger" onclick={clearAuth} disabled={secLoading}>
@@ -229,39 +231,12 @@
    </div>
  </div>

-  <div class="s-section">
-    <p class="s-section-title">App Lock</p>
-    <div class="s-section-body">
-      <label class="s-row">
-        <div class="s-row-info"><span class="s-label">PIN lock</span><span class="s-desc">Require a PIN on launch and after idle timeout</span></div>
-        <button role="switch" aria-checked={store.settings.appLockEnabled ?? false} class="s-toggle" class:on={store.settings.appLockEnabled}
-          onclick={() => updateSettings({ appLockEnabled: !store.settings.appLockEnabled })}><span class="s-toggle-thumb"></span></button>
-      </label>
-      {#if store.settings.appLockEnabled}
-        <div class="s-row">
-          <div class="s-row-info"><span class="s-label">PIN</span><span class="s-desc">4–8 digits</span></div>
-          <div class="s-btn-row">
-            <input class="s-input" type="password" inputmode="numeric" maxlength={8} placeholder="4–8 digits"
-              value={pinInput}
-              oninput={(e) => { pinInput = e.currentTarget.value.replace(/\D/g, "").slice(0, 8); pinError = ""; }}
-              onkeydown={(e) => e.key === "Enter" && commitPin()}
-              autocomplete="off" style="width:120px;letter-spacing:0.2em" />
-            <button class="s-btn s-btn-accent" onclick={commitPin} disabled={pinInput.length > 0 && pinInput.length < 4}>
-              {store.settings.appLockPin && pinInput === store.settings.appLockPin ? "Saved ✓" : "Save"}
-            </button>
-          </div>
-        </div>
-        {#if pinError}<div class="s-row"><span class="s-pin-error">{pinError}</span></div>{/if}
-      {/if}
-    </div>
-  </div>
-
  <div class="s-section">
    <p class="s-section-title">SOCKS Proxy</p>
    <div class="s-section-body">
      <label class="s-row">
        <div class="s-row-info"><span class="s-label">Enable SOCKS proxy</span><span class="s-desc">Route Suwayomi traffic through a SOCKS4/5 proxy</span></div>
-        <button role="switch" aria-checked={socksEnabled} class="s-toggle" class:on={socksEnabled}
+        <button role="switch" aria-checked={socksEnabled} aria-label="Enable SOCKS proxy" class="s-toggle" class:on={socksEnabled}
          onclick={() => { socksEnabled = !socksEnabled; saveSocksProxy(); }}><span class="s-toggle-thumb"></span></button>
      </label>
      {#if socksEnabled}
@@ -297,7 +272,7 @@
          <div class="s-row-info"><span class="s-label">Password</span><span class="s-desc">Optional</span></div>
          <div class="s-field-wrap">
            <input class="s-input" type={showSocksPass ? "text" : "password"} bind:value={socksPassword} placeholder="Password" autocomplete="off" spellcheck="false" />
-            <button class="s-eye-btn" onclick={() => showSocksPass = !showSocksPass} tabindex="-1">{@html showSocksPass ? EyeClose : EyeOpen}</button>
+            <button class="s-eye-btn" onclick={() => showSocksPass = !showSocksPass} tabindex="-1" aria-label={showSocksPass ? "Hide password" : "Show password"}>{@html showSocksPass ? EyeClose : EyeOpen}</button>
          </div>
        </div>
        <div class="s-row">
@@ -315,7 +290,7 @@
    <div class="s-section-body">
      <label class="s-row">
        <div class="s-row-info"><span class="s-label">Enable FlareSolverr</span><span class="s-desc">Bypass Cloudflare challenges for sources that require it</span></div>
-        <button role="switch" aria-checked={flareEnabled} class="s-toggle" class:on={flareEnabled}
+        <button role="switch" aria-checked={flareEnabled} aria-label="Enable FlareSolverr" class="s-toggle" class:on={flareEnabled}
          onclick={() => { flareEnabled = !flareEnabled; saveFlareSolverr(); }}><span class="s-toggle-thumb"></span></button>
      </label>
      {#if flareEnabled}
@@ -345,7 +320,7 @@
        </div>
        <label class="s-row">
          <div class="s-row-info"><span class="s-label">Response fallback</span><span class="s-desc">Use FlareSolverr's response when the direct request fails</span></div>
-          <button role="switch" aria-checked={flareFallback} class="s-toggle" class:on={flareFallback}
+          <button role="switch" aria-checked={flareFallback} aria-label="Response fallback" class="s-toggle" class:on={flareFallback}
            onclick={() => flareFallback = !flareFallback}><span class="s-toggle-thumb"></span></button>
        </label>
        <div class="s-row">
@@ -359,3 +334,8 @@
  </div>

 </div>
+<style>
+  .s-ghost-btn { display: inline-flex; align-items: center; gap: 5px; background: none; border: none; color: var(--text-faint); font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); cursor: pointer; padding: 2px 0; transition: color 0.15s; }
+  .s-ghost-btn:hover:not(:disabled) { color: var(--color-error); }
+  .s-ghost-btn:disabled { opacity: 0.35; cursor: default; }
+</style>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Youwes09	83711c155d	Chore: Prepare & Update for v0.9.2	2026-05-01 01:07:10 -05:00
Youwes09	3702a25813	Chore: Patch Biometrics	2026-05-01 05:56:39 -05:00
Youwes09	a71cc719ba	Chore: Patch all Svelte-Warnings & Add Aria-Labels	2026-05-01 00:38:15 -05:00
Youwes09	1801fecdbb	Feat: Windows-Hello Testing (DevTools Only)	2026-05-01 00:09:49 -05:00
Youwes09	0cd799f450	Fix: Cap ReaderSettings Zoom Value to 100	2026-04-30 23:11:39 -05:00
Youwes09	5dab7761bc	Feat: Update TrackingPanel	2026-04-30 22:48:58 -05:00
Youwes09	552a11a517	Feat: Library-Refresh Overhaul & Settings Re-Wiring	2026-04-30 22:42:59 -05:00
Youwes09	c8ec6d6b90	Feat: Update Suwayomi (Stable -> Preview) + UI Login	2026-04-30 22:02:45 -05:00
Youwes09	daaeae00fe	Fix: Patch Flake & PKGBUILD for Preview	2026-04-30 01:19:55 -05:00
Youwes09	79cb2f7c56	Feat: Shift from Stable to Preview (WIP)	2026-04-30 01:04:56 -05:00
Youwes09	4d3dfdbec6	Feat: Settings Reset, Data Clear, Date Fixes (#56 )	2026-04-29 21:07:53 -05:00
Youwes09	78573eacb1	Feat: TouchScreen Support for SeriesDetail & Modularity Revamp (#29	2026-04-29 18:40:41 -05:00
Youwes09	1bb7da3b22	Merge branch 'main' of github.com:moku-project/Moku	2026-04-29 18:18:41 -05:00
Youwes09	dd0cf9372d	Feat: Implement CSS for Chrome & Link to Context-Menu	2026-04-29 18:18:21 -05:00
Shozikan	50928c6343	Chore: Commit to Downloads in README	2026-04-29 11:22:54 -05:00
Youwes09	170493aa71	Feat: Implement Storage-based (JSON) Settings & Data-Storage (WIP) (#56 )	2026-04-29 00:18:09 -05:00
Youwes09	c009bd71fc	Fix: Optimized KeywordTab with BlobURL like TagTab	2026-04-28 23:45:35 -05:00
Youwes09	4df7f416a7	Feat: Revamped Content-Filtering + Levels & Source-Based Toggle	2026-04-28 23:22:29 -05:00
Youwes09	63209cb828	Fix: Futile Attempt to Implement Image-Dedupe (#55 )	2026-04-28 22:45:19 -05:00
Youwes09	2c1391c378	Fix: Integrate Sync-Back on Tracker Addition (#52 )	2026-04-28 22:24:37 -05:00
Youwes09	41fd4a820c	Fix: Revert Logic for TrackingPanel (#58 )	2026-04-28 22:17:16 -05:00
Youwes09	9f3c6d2ac3	Fix: LibraryGrid with Z-Index Applied (#57 )	2026-04-28 22:09:36 -05:00
Youwes09	f5b3f76b5d	Fix: Search Titles Overlay (Z-Index Applied)	2026-04-28 11:58:42 -05:00
Youwes09	528f966b1f	Chore: Refactor Rust-Backend Modularity	2026-04-28 10:54:52 -05:00
Youwes09	75e8bc5986	Feat: Cover-Image Switching & Auto-Link (#55 )	2026-04-28 01:22:36 -05:00
Youwes09	8123053a40	Chore: Update to Version 0.9.1 (V3)	2026-04-27 23:45:44 -05:00