chore: git hygiene — enforce LF, drop dead .gitattributes/.gitignore rules

- .gitattributes: 'text=auto eol=lf' so files are stored and checked out as LF on every OS (no more CRLF churn on Windows, regardless of core.autocrlf); mark common binaries; keep .bat/.cmd as CRLF. - Remove the stale Git LFS rule for modules/vlc-player (that module no longer exists and no LFS objects are tracked). - .gitignore: stop ignoring bun.lock (it's committed and checked by the lockfile workflow), and replace the dead/duplicate per-module build paths (player, hls-downloader, sf-player, music-controls, duplicate mpv-player) with a single modules/*/android/build/ glob. - Renormalise the one CRLF-stored file (crowdin.yml) to LF (EOL only).
2026-06-04 21:18:31 +01:00 · 2026-06-01 17:22:45 +02:00
44 changed files with 330 additions and 941 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,28 @@
-.modules/vlc-player/Frameworks/*.xcframework filter=lfs diff=lfs merge=lfs -text
+# Normalise line endings to LF for everyone. Files are stored as LF in git and
+# checked out as LF on every OS, so Windows clones stop producing CRLF churn
+# (no more "LF will be replaced by CRLF" warnings) regardless of core.autocrlf.
+* text=auto eol=lf
+
+# Windows-only scripts must stay CRLF
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+# Binary assets — never touched / never normalised
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.webp binary
+*.ico binary
+*.icns binary
+*.ttf binary
+*.otf binary
+*.woff binary
+*.woff2 binary
+*.mp3 binary
+*.mp4 binary
+*.mov binary
+*.pdf binary
+*.keystore binary
+*.jks binary
+*.p12 binary
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -1,51 +1,51 @@
-name: 🌐 Translation Sync
-
-on:
-  push:
-    branches: [develop]
-    paths:
-      - "translations/**"
-      - "crowdin.yml"
-      - "i18n.ts"
-      - ".github/workflows/crowdin.yml"
-  # Run weekly to pull new translations
-  schedule:
-    - cron: "0 2 * * 1" # Every Monday at 2 AM UTC
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  sync-translations:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 📥 Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-
-      - name: 🌐 Sync Translations with Crowdin
-        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
-        with:
-          upload_sources: true
-          upload_translations: true
-          download_translations: true
-          localization_branch_name: I10n_crowdin_translations
-          create_pull_request: true
-          pull_request_title: "feat: New Crowdin Translations"
-          pull_request_body: "New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)"
-          pull_request_base_branch_name: "develop"
-          pull_request_labels: "🌐 translation"
-          # Quality control options
-          skip_untranslated_strings: false
-          skip_untranslated_files: false
-          export_only_approved: false
-          # Commit customization
-          commit_message: "feat(i18n): update translations from Crowdin"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+name: 🌐 Translation Sync
+
+on:
+  push:
+    branches: [develop]
+    paths:
+      - "translations/**"
+      - "crowdin.yml"
+      - "i18n.ts"
+      - ".github/workflows/crowdin.yml"
+  # Run weekly to pull new translations
+  schedule:
+    - cron: "0 2 * * 1" # Every Monday at 2 AM UTC
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  sync-translations:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 📥 Checkout Repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+
+      - name: 🌐 Sync Translations with Crowdin
+        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
+        with:
+          upload_sources: true
+          upload_translations: true
+          download_translations: true
+          localization_branch_name: I10n_crowdin_translations
+          create_pull_request: true
+          pull_request_title: "feat: New Crowdin Translations"
+          pull_request_body: "New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)"
+          pull_request_base_branch_name: "develop"
+          pull_request_labels: "🌐 translation"
+          # Quality control options
+          skip_untranslated_strings: false
+          skip_untranslated_files: false
+          export_only_approved: false
+          # Commit customization
+          commit_message: "feat(i18n): update translations from Crowdin"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # Dependencies and Package Managers
 node_modules/
-bun.lock
 bun.lockb
 package-lock.json

@@ -21,10 +20,8 @@ web-build/
 # Gradle caches (top-level + per-module native projects)
 **/.gradle/

-# Module-specific Builds
-modules/mpv-player/android/build
-modules/player/android
-modules/hls-downloader/android/build
+# Native module build outputs (any module)
+modules/*/android/build/

 # Generated Applications
 Streamyfin.app
@@ -69,10 +66,6 @@ certs/

 # Version and Backup Files
 /version-backup-*
-/modules/sf-player/android/build
-/modules/music-controls/android/build
-modules/background-downloader/android/build/*
-/modules/mpv-player/android/build

 # ios:unsigned-build Artifacts
 build/
--- a/app/(auth)/(tabs)/(home)/settings/plugins/marlin-search/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/marlin-search/page.tsx
@@ -11,15 +11,12 @@ import {
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { ServerUrlStatusText } from "@/components/common/ServerUrlStatusText";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 import { useNetworkAwareQueryClient } from "@/hooks/useNetworkAwareQueryClient";
-import { useServerUrlResolver } from "@/hooks/useServerUrlResolver";
 import { useSettings } from "@/utils/atoms/settings";
-import { reachabilityProbe } from "@/utils/serverUrl/probes/reachability";

 export default function MarlinSearchPage() {
  const navigation = useNavigation();
@@ -32,7 +29,6 @@ export default function MarlinSearchPage() {
  const queryClient = useNetworkAwareQueryClient();

  const [value, setValue] = useState<string>(settings?.marlinServerUrl || "");
-  const urlResolver = useServerUrlResolver(reachabilityProbe);

  const onSave = (val: string) => {
    updateSettings({
@@ -131,17 +127,8 @@ export default function MarlinSearchPage() {
              autoCapitalize='none'
              textContentType='URL'
              onChangeText={(text) => setValue(text)}
-              onBlur={() => {
-                const candidate = value.trim();
-                if (candidate) {
-                  urlResolver.resolve(candidate).then((r) => {
-                    if (r.ok) setValue(r.url);
-                  });
-                }
-              }}
            />
          </View>
-          <ServerUrlStatusText state={urlResolver} className='mt-1' />
        </DisabledSetting>
        <Text className='px-4 text-xs text-neutral-500 mt-1'>
          {t("home.settings.plugins.marlin_search.marlin_search_hint")}{" "}
--- a/app/(auth)/(tabs)/(home)/settings/plugins/streamystats/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/plugins/streamystats/page.tsx
@@ -11,14 +11,11 @@ import {
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { ServerUrlStatusText } from "@/components/common/ServerUrlStatusText";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
 import { useNetworkAwareQueryClient } from "@/hooks/useNetworkAwareQueryClient";
-import { useServerUrlResolver } from "@/hooks/useServerUrlResolver";
 import { useSettings } from "@/utils/atoms/settings";
-import { reachabilityProbe } from "@/utils/serverUrl/probes/reachability";

 export default function StreamystatsPage() {
  const { t } = useTranslation();
@@ -35,7 +32,6 @@ export default function StreamystatsPage() {

  // Local state for all editable fields
  const [url, setUrl] = useState<string>(settings?.streamyStatsServerUrl || "");
-  const urlResolver = useServerUrlResolver(reachabilityProbe);
  const [useForSearch, setUseForSearch] = useState<boolean>(
    settings?.searchEngine === "Streamystats",
  );
@@ -156,20 +152,9 @@ export default function StreamystatsPage() {
              autoCapitalize='none'
              textContentType='URL'
              onChangeText={setUrl}
-              onBlur={() => {
-                const candidate = url.trim();
-                if (candidate) {
-                  urlResolver.resolve(candidate).then((r) => {
-                    if (r.ok) setUrl(r.url);
-                  });
-                }
-              }}
            />
          </ListItem>
        </ListGroup>
-        <View className='px-4 mt-1'>
-          <ServerUrlStatusText state={urlResolver} />
-        </View>

        <Text className='px-4 text-xs text-neutral-500 mt-1'>
          {t("home.settings.plugins.streamystats.streamystats_search_hint")}{" "}
--- a/app/(auth)/(tabs)/(libraries)/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/_layout.tsx
@@ -166,7 +166,7 @@ export default function IndexLayout() {
                open={dropdownOpen}
                onOpenChange={setDropdownOpen}
                trigger={
-                  <View>
+                  <View className='pl-1.5'>
                    <Ionicons
                      name='ellipsis-horizontal-outline'
                      size={24}
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/_layout.tsx
@@ -40,8 +40,6 @@ const Layout = () => {
        keyboardDismissMode='none'
        screenOptions={{
          tabBarBounces: true,
-          tabBarActiveTintColor: "#FFFFFF",
-          tabBarInactiveTintColor: "#9CA3AF",
          tabBarLabelStyle: {
            fontSize: TAB_LABEL_FONT_SIZE,
            fontWeight: "600",
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -274,11 +274,6 @@ export default function DirectPlayerPage() {
    };

    if (itemId) {
-      setItem(null);
-      setDownloadedItem(null);
-      // Clear the previous episode's stream so the loader gate stays closed
-      // until the new item's stream resolves (avoids a stale MPV source frame).
-      setStream(null);
      fetchItemData();
    }
  }, [itemId, offline, api, user?.Id]);
@@ -321,12 +316,6 @@ export default function DirectPlayerPage() {
          return null;
        }

-        // Ensure item matches the current itemId to avoid race conditions
-        if (item.Id !== itemId) {
-          setStreamStatus({ isLoading: false, isError: false });
-          return null;
-        }
-
        let result: Stream | null = null;
        if (offline && downloadedItem?.mediaSource) {
          const url = downloadedItem.videoFilePath;
@@ -399,7 +388,6 @@ export default function DirectPlayerPage() {
    item,
    user?.Id,
    downloadedItem,
-    offline,
  ]);

  useEffect(() => {
--- a/components/PlatformDropdown.tsx
+++ b/components/PlatformDropdown.tsx
@@ -1,7 +1,13 @@
 import { Ionicons } from "@expo/vector-icons";
 import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
-import React, { useEffect } from "react";
-import { Platform, StyleSheet, TouchableOpacity, View } from "react-native";
+import React, { useEffect, useState } from "react";
+import {
+  type LayoutChangeEvent,
+  Platform,
+  StyleSheet,
+  TouchableOpacity,
+  View,
+} from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { useGlobalModal } from "@/providers/GlobalModalProvider";
@@ -211,6 +217,24 @@ const PlatformDropdownComponent = ({
 }: PlatformDropdownProps) => {
  const { showModal, hideModal, isVisible } = useGlobalModal();

+  // @expo/ui's <Host> (SDK 55) fills its available space by default, and
+  // `matchContents` doesn't help here: it reports the native Menu's size via
+  // setStyleSize and overrides any explicit size. Instead we measure the
+  // trigger's intrinsic size in plain RN (off-layout) and pin it on the Host.
+  const [triggerSize, setTriggerSize] = useState<{
+    width: number;
+    height: number;
+  } | null>(null);
+
+  const handleMeasureTrigger = (e: LayoutChangeEvent) => {
+    const { width, height } = e.nativeEvent.layout;
+    setTriggerSize((prev) =>
+      prev && prev.width === width && prev.height === height
+        ? prev
+        : { width, height },
+    );
+  };
+
  // Handle controlled open state for Android
  useEffect(() => {
    if (Platform.OS === "android" && controlledOpen === true) {
@@ -241,11 +265,25 @@ const PlatformDropdownComponent = ({
  }, [isVisible, controlledOpen, controlledOnOpenChange]);

  if (Platform.OS === "ios" && !Platform.isTV) {
-    // @expo/ui's <Host> can't size to content, so an in-flow invisible copy of
-    // the trigger sizes the wrapper while the Host overlays the real Menu.
+    // Pin the wrapper to the measured trigger size. @expo/ui's <Host> (SDK 55)
+    // fills its parent and reports its own size via setStyleSize, so it can't
+    // size itself to content. If the wrapper has no size, the Host's `flex: 1`
+    // height depends on the parent while the parent depends on the Host — a
+    // circular dependency that collapses to 0 for any selector nested more than
+    // one level deep (so only the first, shallowest dropdown stays visible).
+    // Giving the wrapper the measured size breaks the cycle; the Host then
+    // fills a concrete box.
    return (
-      <View>
-        <View pointerEvents='none' aria-hidden style={{ opacity: 0 }}>
+      <View style={triggerSize ?? { opacity: 0 }}>
+        {/* Hidden measurer: lays the trigger out off-flow to capture its
+            intrinsic size. Absolutely positioned WITHOUT right/bottom so it
+            sizes to the trigger's content rather than to its parent. */}
+        <View
+          style={{ position: "absolute", top: 0, left: 0, opacity: 0 }}
+          pointerEvents='none'
+          aria-hidden
+          onLayout={handleMeasureTrigger}
+        >
          {trigger}
        </View>
        <Host style={[StyleSheet.absoluteFill, expoUIConfig?.hostStyle as any]}>
--- a/components/chapters/ChapterList.tsx
+++ b/components/chapters/ChapterList.tsx
@@ -11,7 +11,6 @@ import { useTranslation } from "react-i18next";
 import { FlatList, Modal, Pressable, StyleSheet, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { Colors } from "@/constants/Colors";
-import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
 import {
  type ChapterEntry,
  chapterStartsMs,
@@ -39,7 +38,6 @@ function ChapterListComponent({
  onClose,
 }: ChapterListProps) {
  const { t } = useTranslation();
-  const safeArea = useControlsSafeAreaInsets();
  const listRef = useRef<FlatList<ChapterEntry>>(null);

  const entries = useMemo(() => sortedChapters(chapters), [chapters]);
@@ -81,17 +79,7 @@ function ChapterListComponent({
      supportedOrientations={["portrait", "landscape"]}
    >
      <Pressable onPress={onClose} style={styles.backdrop}>
-        <Pressable
-          onPress={(e) => e.stopPropagation()}
-          style={[
-            styles.sheet,
-            {
-              marginLeft: safeArea.left,
-              marginRight: safeArea.right,
-              paddingBottom: safeArea.bottom,
-            },
-          ]}
-        >
+        <Pressable onPress={(e) => e.stopPropagation()} style={styles.sheet}>
          <View style={styles.header}>
            <Text style={styles.title}>{t("chapters.title")}</Text>
            <Pressable
@@ -172,12 +160,14 @@ const styles = StyleSheet.create({
  backdrop: {
    flex: 1,
    justifyContent: "flex-end",
+    backgroundColor: "rgba(0,0,0,0.6)",
  },
  sheet: {
    backgroundColor: Colors.background,
    borderTopLeftRadius: 16,
    borderTopRightRadius: 16,
    maxHeight: "70%",
+    paddingBottom: 24,
  },
  header: {
    flexDirection: "row",
--- a/components/common/ServerUrlField.tsx
+++ b/components/common/ServerUrlField.tsx
@@ -1,99 +0,0 @@
-import { useCallback, useRef } from "react";
-import { View } from "react-native";
-import { useServerUrlResolver } from "@/hooks/useServerUrlResolver";
-import type { ResolveOptions } from "@/utils/serverUrl/resolve";
-import type { ServerProbe } from "@/utils/serverUrl/types";
-import { Input } from "./Input";
-import { ServerUrlStatusText } from "./ServerUrlStatusText";
-import { Text } from "./Text";
-
-interface ServerUrlFieldProps {
-  /** Raw user input (controlled). */
-  value: string;
-  onChangeText: (text: string) => void;
-  /** Service-specific validator. Pass a stable (module-level) reference. */
-  probe: ServerProbe;
-  /** Called with the canonical URL once a candidate validates. */
-  onResolved?: (url: string, meta?: Record<string, unknown>) => void;
-  label?: string;
-  hint?: string;
-  placeholder?: string;
-  editable?: boolean;
-  resolveOptions?: ResolveOptions;
-}
-
-/**
- * Unified server-URL input: the user types a loose address (`media.example.com`,
- * `https://…`, `host:port`); on blur it auto-resolves via the given probe,
- * adopts the canonical URL into the field, and persists it. A small status line
- * (checking / resolved / error) shows underneath.
- */
-export function ServerUrlField({
-  value,
-  onChangeText,
-  probe,
-  onResolved,
-  label,
-  hint,
-  placeholder,
-  editable = true,
-  resolveOptions,
-}: ServerUrlFieldProps) {
-  const resolver = useServerUrlResolver(probe, resolveOptions);
-  const lastResolvedInput = useRef<string | null>(null);
-
-  const runResolve = useCallback(async () => {
-    const input = value.trim();
-    if (!input) {
-      resolver.reset();
-      lastResolvedInput.current = null;
-      return;
-    }
-    lastResolvedInput.current = input;
-    const result = await resolver.resolve(input);
-    if (result.ok) {
-      onChangeText(result.url); // adopt the canonical URL into the field
-      onResolved?.(result.url, result.meta);
-    }
-  }, [value, resolver, onChangeText, onResolved]);
-
-  const handleBlur = useCallback(() => {
-    const input = value.trim();
-    if (input && input !== lastResolvedInput.current) runResolve();
-  }, [value, runResolve]);
-
-  const handleChange = useCallback(
-    (text: string) => {
-      onChangeText(text);
-      // Editing invalidates a previous result; drop the stale status.
-      if (resolver.status !== "idle") resolver.reset();
-      lastResolvedInput.current = null;
-    },
-    [onChangeText, resolver],
-  );
-
-  return (
-    <View>
-      {label ? <Text className='font-bold mb-1'>{label}</Text> : null}
-      {hint ? <Text className='text-xs text-gray-500 mb-2'>{hint}</Text> : null}
-
-      <Input
-        value={value}
-        onChangeText={handleChange}
-        onBlur={handleBlur}
-        onSubmitEditing={runResolve}
-        placeholder={placeholder}
-        editable={editable}
-        extraClassName='border border-neutral-800'
-        keyboardType='url'
-        autoCapitalize='none'
-        autoCorrect={false}
-        returnKeyType='go'
-        textContentType='URL'
-        clearButtonMode='never'
-      />
-
-      <ServerUrlStatusText state={resolver} className='mt-2' />
-    </View>
-  );
-}
--- a/components/common/ServerUrlStatusText.tsx
+++ b/components/common/ServerUrlStatusText.tsx
@@ -1,49 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { ActivityIndicator, View } from "react-native";
-import type { ServerUrlResolverState } from "@/hooks/useServerUrlResolver";
-import { Text } from "./Text";
-
-/**
- * Compact status line for the server-URL resolver, for screens whose layout
- * (e.g. ListItem rows) doesn't fit the full `ServerUrlField`. Renders nothing
- * while idle.
- */
-export function ServerUrlStatusText({
-  state,
-  className = "",
-}: {
-  state: ServerUrlResolverState;
-  className?: string;
-}) {
-  const { t } = useTranslation();
-
-  if (state.status === "idle") return null;
-
-  if (state.status === "resolving") {
-    return (
-      <View className={`flex-row items-center ${className}`}>
-        <ActivityIndicator size='small' color='#9ca3af' />
-        <Text className='text-xs text-neutral-400 ml-2'>
-          {t("server_url.resolving")}
-        </Text>
-      </View>
-    );
-  }
-
-  if (state.status === "ok") {
-    return (
-      <Text className={`text-xs text-green-500 ${className}`}>
-        {t("server_url.resolved", { url: state.resolvedUrl })}
-      </Text>
-    );
-  }
-
-  const message =
-    state.reason === "wrong-service"
-      ? t("server_url.wrong_service")
-      : state.reason === "invalid"
-        ? t("server_url.invalid_url")
-        : t("server_url.unreachable");
-
-  return <Text className={`text-xs text-red-500 ${className}`}>{message}</Text>;
-}
--- a/components/companion/CompanionLoginScreen.tsx
+++ b/components/companion/CompanionLoginScreen.tsx
@@ -11,13 +11,10 @@ import {
  View,
 } from "react-native";
 import { Button } from "@/components/Button";
-import { ServerUrlStatusText } from "@/components/common/ServerUrlStatusText";
 import { Text } from "@/components/common/Text";
 import useRouter from "@/hooks/useAppRouter";
-import { useServerUrlResolver } from "@/hooks/useServerUrlResolver";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { sendCredentialsToTV } from "@/utils/pairingService";
-import { jellyfinProbe } from "@/utils/serverUrl/probes/jellyfin";

 type ScreenState =
  | "scanning"
@@ -52,7 +49,6 @@ export const CompanionLoginScreen: React.FC = () => {
  const [username, setUsername] = useState("");
  const [password, setPassword] = useState("");
  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const serverResolver = useServerUrlResolver(jellyfinProbe);

  // Pre-fill server URL and username from current session
  useEffect(() => {
@@ -409,16 +405,7 @@ export const CompanionLoginScreen: React.FC = () => {
              autoCorrect={false}
              keyboardType='url'
              returnKeyType='next'
-              onBlur={() => {
-                const candidate = serverUrl.trim();
-                if (candidate) {
-                  serverResolver.resolve(candidate).then((r) => {
-                    if (r.ok) setServerUrl(r.url);
-                  });
-                }
-              }}
            />
-            <ServerUrlStatusText state={serverResolver} className='mt-2' />
          </View>

          <View className='mb-5'>
--- a/components/home/Home.tsx
+++ b/components/home/Home.tsx
@@ -133,6 +133,7 @@ const HomeMobile = () => {
          onPress={() => {
            router.push("/(auth)/downloads");
          }}
+          className='ml-1.5'
          style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
        >
          <Feather
--- a/components/search/TVJellyseerrSearchResults.tsx
+++ b/components/search/TVJellyseerrSearchResults.tsx
@@ -401,6 +401,10 @@ export const TVJellyseerrSearchResults: React.FC<
 }) => {
  const { t } = useTranslation();

+  const hasMovies = movieResults && movieResults.length > 0;
+  const hasTv = tvResults && tvResults.length > 0;
+  const hasPersons = personResults && personResults.length > 0;
+
  if (loading) {
    return null;
  }
@@ -427,26 +431,22 @@ export const TVJellyseerrSearchResults: React.FC<

  return (
    <View>
-      {/* No section requests `hasTVPreferredFocus`: the native search field
-          keeps focus while typing, otherwise the first result would re-grab
-          focus on every keystroke as results re-render. The user navigates
-          down to the grid manually. */}
      <TVJellyseerrMovieSection
        title={t("search.request_movies")}
        items={movieResults}
-        isFirstSection={false}
+        isFirstSection={hasMovies}
        onItemPress={onMoviePress}
      />
      <TVJellyseerrTvSection
        title={t("search.request_series")}
        items={tvResults}
-        isFirstSection={false}
+        isFirstSection={!hasMovies && hasTv}
        onItemPress={onTvPress}
      />
      <TVJellyseerrPersonSection
        title={t("search.actors")}
        items={personResults}
-        isFirstSection={false}
+        isFirstSection={!hasMovies && !hasTv && hasPersons}
        onItemPress={onPersonPress}
      />
    </View>
--- a/components/search/TVSearchPage.tsx
+++ b/components/search/TVSearchPage.tsx
@@ -235,13 +235,10 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
            module). It renders the native search bar + grid keyboard and
            forwards typed text into the existing query pipeline via setSearch;
            our own results grid renders below. */}
-        {/* No horizontal margin here: the native tvOS search bar centers itself
-            and renders a trailing "Hold to Dictate in <Language>" hint. Extra
-            margins squeeze the bar's width and clip that trailing hint, so let
-            the native view span the full width and own its own insets. */}
        <View
          style={{
            marginBottom: 24,
+            marginHorizontal: HORIZONTAL_PADDING,
            height: SEARCH_AREA_HEIGHT,
          }}
        >
@@ -283,17 +280,13 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
        {/* Library Search Results */}
        {isLibraryMode && !loading && (
          <View style={{ gap: SECTION_GAP }}>
-            {sections.map((section) => (
+            {sections.map((section, index) => (
              <TVSearchSection
                key={section.key}
                title={section.title}
                items={section.items!}
                orientation={section.orientation || "vertical"}
-                // Never auto-focus a result. The native search field owns focus
-                // while typing; `hasTVPreferredFocus` here would re-grab focus on
-                // every keystroke as results re-render. User navigates down to the
-                // grid manually.
-                isFirstSection={false}
+                isFirstSection={index === 0}
                onItemPress={onItemPress}
                onItemLongPress={onItemLongPress}
                imageUrlGetter={
--- a/components/search/TVSearchSection.tsx
+++ b/components/search/TVSearchSection.tsx
@@ -297,12 +297,12 @@ export const TVSearchSection: React.FC<TVSearchSectionProps> = ({
        removeClippedSubviews={false}
        getItemLayout={getItemLayout}
        style={{ overflow: "visible" }}
-        // Edge padding via contentContainerStyle, NOT contentInset+contentOffset.
-        // contentOffset only applies on initial mount; since this FlatList is
-        // reused across searches (stable key), a second search left the inset
-        // without the offset and the grid snapped flush to the left edge.
+        contentInset={{
+          left: edgePadding,
+          right: edgePadding,
+        }}
+        contentOffset={{ x: -edgePadding, y: 0 }}
        contentContainerStyle={{
-          paddingHorizontal: edgePadding,
          paddingVertical: SCALE_PADDING,
        }}
      />
--- a/components/series/SeasonEpisodesCarousel.tsx
+++ b/components/series/SeasonEpisodesCarousel.tsx
@@ -31,12 +31,8 @@ export const SeasonEpisodesCarousel: React.FC<Props> = ({
 }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const router = useRouter();
  const isOffline = useOfflineMode();
-  // Read the live (cached) downloads DB inside the query rather than the
-  // provider's downloadedItems snapshot, so refetches after
-  // updateDownloadedItem() reflect the latest state instead of a stale
-  // refreshKey-gated snapshot. getAllDownloadedItems() is cached, so this stays cheap.
+  const router = useRouter();
  const { getDownloadedItems } = useDownload();

  const scrollRef = useRef<HorizontalScrollRef>(null);
@@ -104,7 +100,7 @@ export const SeasonEpisodesCarousel: React.FC<Props> = ({
          onPress={() => {
            router.setParams({ id: _item.Id });
          }}
-          className={`flex flex-col w-44
+          className={`flex flex-col w-44 
                  ${item?.Id === _item.Id ? "" : "opacity-50"}
                `}
        >
--- a/components/settings/Jellyseerr.tsx
+++ b/components/settings/Jellyseerr.tsx
@@ -7,11 +7,8 @@ import { toast } from "sonner-native";
 import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
 import { userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
-import { jellyseerrProbe } from "@/utils/serverUrl/probes/jellyseerr";
-import { resolveServerUrl } from "@/utils/serverUrl/resolve";
 import { Button } from "../Button";
 import { Input } from "../common/Input";
-import { ServerUrlField } from "../common/ServerUrlField";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
@@ -29,44 +26,26 @@ export const JellyseerrSettings = () => {
    string | undefined
  >(undefined);

-  const [jellyseerrServerUrl, setjellyseerrServerUrl] = useState<string>(
-    settings?.jellyseerrServerUrl ?? "",
-  );
-  const [resolvedUrl, setResolvedUrl] = useState<string | undefined>(
-    settings?.jellyseerrServerUrl ?? undefined,
-  );
+  const [jellyseerrServerUrl, setjellyseerrServerUrl] = useState<
+    string | undefined
+  >(settings?.jellyseerrServerUrl || undefined);

  const loginToJellyseerrMutation = useMutation({
    mutationFn: async () => {
+      if (!jellyseerrServerUrl && !settings?.jellyseerrServerUrl)
+        throw new Error("Missing server url");
      if (!user?.Name)
        throw new Error("Missing required information for login");
-
-      // Prefer the already-resolved URL; otherwise resolve the raw input now
-      // (covers tapping Login before the field's on-blur resolve settled).
-      let finalUrl = resolvedUrl || settings?.jellyseerrServerUrl || "";
-      if (!finalUrl && jellyseerrServerUrl) {
-        const resolved = await resolveServerUrl(
-          jellyseerrServerUrl,
-          jellyseerrProbe,
-        );
-        if (!resolved.ok) throw new Error("Invalid server url");
-        finalUrl = resolved.url;
-      }
-      if (!finalUrl) throw new Error("Missing server url");
-
-      const jellyseerrTempApi = new JellyseerrApi(finalUrl);
+      const jellyseerrTempApi = new JellyseerrApi(
+        jellyseerrServerUrl || settings.jellyseerrServerUrl || "",
+      );
      const testResult = await jellyseerrTempApi.test();
      if (!testResult.isValid) throw new Error("Invalid server url");
-      const loggedInUser = await jellyseerrTempApi.login(
-        user.Name,
-        jellyseerrPassword || "",
-      );
-      return { user: loggedInUser, url: finalUrl };
+      return jellyseerrTempApi.login(user.Name, jellyseerrPassword || "");
    },
-    onSuccess: ({ user: loggedInUser, url }) => {
-      setJellyseerrUser(loggedInUser);
-      setResolvedUrl(url);
-      updateSettings({ jellyseerrServerUrl: url });
+    onSuccess: (user) => {
+      setJellyseerrUser(user);
+      updateSettings({ jellyseerrServerUrl });
    },
    onError: () => {
      toast.error(t("jellyseerr.failed_to_login"));
@@ -80,8 +59,7 @@ export const JellyseerrSettings = () => {
    clearAllJellyseerData().finally(() => {
      setJellyseerrUser(undefined);
      setJellyseerrPassword(undefined);
-      setjellyseerrServerUrl("");
-      setResolvedUrl(undefined);
+      setjellyseerrServerUrl(undefined);
    });
  };

@@ -140,20 +118,30 @@ export const JellyseerrSettings = () => {
            <Text className='text-xs text-red-600 mb-2'>
              {t("home.settings.plugins.jellyseerr.jellyseerr_warning")}
            </Text>
-            <View className='mb-2'>
-              <ServerUrlField
-                value={jellyseerrServerUrl}
-                onChangeText={setjellyseerrServerUrl}
-                onResolved={(url) => setResolvedUrl(url)}
-                probe={jellyseerrProbe}
-                label={t("home.settings.plugins.jellyseerr.server_url")}
-                hint={t("home.settings.plugins.jellyseerr.server_url_hint")}
-                placeholder={t(
-                  "home.settings.plugins.jellyseerr.server_url_placeholder",
-                )}
-                editable={!loginToJellyseerrMutation.isPending}
-              />
+            <Text className='font-bold mb-1'>
+              {t("home.settings.plugins.jellyseerr.server_url")}
+            </Text>
+            <View className='flex flex-col shrink mb-2'>
+              <Text className='text-xs text-gray-600'>
+                {t("home.settings.plugins.jellyseerr.server_url_hint")}
+              </Text>
            </View>
+            <Input
+              className='border border-neutral-800 mb-2'
+              placeholder={t(
+                "home.settings.plugins.jellyseerr.server_url_placeholder",
+              )}
+              value={jellyseerrServerUrl ?? settings?.jellyseerrServerUrl}
+              defaultValue={
+                settings?.jellyseerrServerUrl ?? jellyseerrServerUrl
+              }
+              keyboardType='url'
+              returnKeyType='done'
+              autoCapitalize='none'
+              textContentType='URL'
+              onChangeText={setjellyseerrServerUrl}
+              editable={!loginToJellyseerrMutation.isPending}
+            />
            <View>
              <Text className='font-bold mb-2'>
                {t("home.settings.plugins.jellyseerr.password")}
--- a/components/settings/LocalNetworkSettings.tsx
+++ b/components/settings/LocalNetworkSettings.tsx
@@ -12,9 +12,8 @@ import {
  type LocalNetworkConfig,
  updateServerLocalConfig,
 } from "@/utils/secureCredentials";
-import { jellyfinProbe } from "@/utils/serverUrl/probes/jellyfin";
 import { Button } from "../Button";
-import { ServerUrlField } from "../common/ServerUrlField";
+import { Input } from "../common/Input";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
@@ -163,12 +162,13 @@ export function LocalNetworkSettings(): React.ReactElement | null {
            }
          >
            <View className=''>
-              <ServerUrlField
+              <Input
+                placeholder={t("home.settings.network.local_url_placeholder")}
                value={config.localUrl}
                onChangeText={handleLocalUrlChange}
-                onResolved={(url) => saveConfig({ ...config, localUrl: url })}
-                probe={jellyfinProbe}
-                placeholder={t("home.settings.network.local_url_placeholder")}
+                keyboardType='url'
+                autoCapitalize='none'
+                autoCorrect={false}
              />
            </View>
          </ListGroup>
--- a/components/video-player/controls/BottomControls.tsx
+++ b/components/video-player/controls/BottomControls.tsx
@@ -8,10 +8,10 @@ import { useTranslation } from "react-i18next";
 import { Pressable, View } from "react-native";
 import { Slider } from "react-native-awesome-slider";
 import { type SharedValue } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { ChapterList } from "@/components/chapters/ChapterList";
 import { ChapterTicks } from "@/components/chapters/ChapterTicks";
 import { Text } from "@/components/common/Text";
-import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
 import { useSettings } from "@/utils/atoms/settings";
 import { chapterMarkers, chapterNameAt } from "@/utils/chapters";
 import NextEpisodeCountDownButton from "./NextEpisodeCountDownButton";
@@ -75,6 +75,9 @@ interface BottomControlsProps {
    minutes: number;
    seconds: number;
  };
+
+  // Chapter props
+  chapterPositions?: number[];
 }

 export const BottomControls: FC<BottomControlsProps> = ({
@@ -108,10 +111,11 @@ export const BottomControls: FC<BottomControlsProps> = ({
  trickPlayUrl,
  trickplayInfo,
  time,
+  chapterPositions = [],
 }) => {
  const { settings } = useSettings();
  const { t } = useTranslation();
-  const insets = useControlsSafeAreaInsets();
+  const insets = useSafeAreaInsets();
  const [chapterListVisible, setChapterListVisible] = useState(false);

  // Only expose chapter UI when there are at least two real markers.
@@ -142,9 +146,13 @@ export const BottomControls: FC<BottomControlsProps> = ({
      style={[
        {
          position: "absolute",
-          right: insets.right,
-          left: insets.left,
-          bottom: Math.max(insets.bottom - 17, 0),
+          right:
+            (settings?.safeAreaInControlsEnabled ?? true) ? insets.right : 0,
+          left: (settings?.safeAreaInControlsEnabled ?? true) ? insets.left : 0,
+          bottom:
+            (settings?.safeAreaInControlsEnabled ?? true)
+              ? Math.max(insets.bottom - 17, 0)
+              : 0,
        },
      ]}
      className={"flex flex-col px-2"}
@@ -180,6 +188,17 @@ export const BottomControls: FC<BottomControlsProps> = ({
          ) : null}
        </View>
        <View className='flex flex-row items-center space-x-2 shrink-0'>
+          {hasChapters && (
+            <Pressable
+              onPress={() => setChapterListVisible(true)}
+              hitSlop={10}
+              className='justify-center mr-4'
+              accessibilityRole='button'
+              accessibilityLabel={t("chapters.open")}
+            >
+              <Ionicons name='bookmarks' size={24} color='white' />
+            </Pressable>
+          )}
          <SkipButton
            showButton={showSkipButton}
            onPress={skipIntro}
@@ -211,17 +230,6 @@ export const BottomControls: FC<BottomControlsProps> = ({
                onPress={handleNextEpisodeManual}
              />
            )}
-          {hasChapters && (
-            <Pressable
-              onPress={() => setChapterListVisible(true)}
-              hitSlop={10}
-              className='justify-center ml-4'
-              accessibilityRole='button'
-              accessibilityLabel={t("chapters.open")}
-            >
-              <Ionicons name='bookmarks' size={24} color='white' />
-            </Pressable>
-          )}
        </View>
      </View>
      <View
--- a/components/video-player/controls/CenterControls.tsx
+++ b/components/video-player/controls/CenterControls.tsx
@@ -1,9 +1,9 @@
 import { Ionicons } from "@expo/vector-icons";
 import type { FC } from "react";
 import { Platform, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
-import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
 import { useSettings } from "@/utils/atoms/settings";
 import AudioSlider from "./AudioSlider";
 import BrightnessSlider from "./BrightnessSlider";
@@ -42,15 +42,15 @@ export const CenterControls: FC<CenterControlsProps> = ({
  goToNextChapter,
 }) => {
  const { settings } = useSettings();
-  const insets = useControlsSafeAreaInsets();
+  const insets = useSafeAreaInsets();

  return (
    <View
      style={{
        position: "absolute",
        top: "50%",
-        left: insets.left,
-        right: insets.right,
+        left: (settings?.safeAreaInControlsEnabled ?? true) ? insets.left : 0,
+        right: (settings?.safeAreaInControlsEnabled ?? true) ? insets.right : 0,
        flexDirection: "row",
        justifyContent: "space-between",
        alignItems: "center",
--- a/components/video-player/controls/Controls.tsx
+++ b/components/video-player/controls/Controls.tsx
@@ -219,6 +219,7 @@ export const Controls: FC<Props> = ({
    hasNextChapter,
    goToPreviousChapter,
    goToNextChapter,
+    chapterPositions,
  } = useChapterNavigation({
    chapters: item.Chapters,
    progress,
@@ -365,9 +366,7 @@ export const Controls: FC<Props> = ({
        { applyLanguagePreferences: true },
      );

-      // Use setParams instead of replace to avoid unmounting/remounting the player,
-      // which would create a new MPV native view and crash with "mp_initialize already initialized".
-      router.setParams({
+      const queryParams = new URLSearchParams({
        ...(offline && { offline: "true" }),
        itemId: item.Id ?? "",
        audioIndex: defaultAudioIndex?.toString() ?? "",
@@ -376,17 +375,11 @@ export const Controls: FC<Props> = ({
        bitrateValue: bitrateValue?.toString(),
        playbackPosition:
          item.UserData?.PlaybackPositionTicks?.toString() ?? "",
-      });
+      }).toString();
+
+      router.replace(`player/direct-player?${queryParams}` as any);
    },
-    [
-      settings,
-      subtitleIndex,
-      audioIndex,
-      mediaSource,
-      bitrateValue,
-      router,
-      offline,
-    ],
+    [settings, subtitleIndex, audioIndex, mediaSource, bitrateValue, router],
  );

  const goToPreviousItem = useCallback(() => {
@@ -592,6 +585,7 @@ export const Controls: FC<Props> = ({
              trickPlayUrl={trickPlayUrl}
              trickplayInfo={trickplayInfo}
              time={isSliding || showRemoteBubble ? time : remoteTime}
+              chapterPositions={chapterPositions}
            />
          </Animated.View>
        </>
--- a/components/video-player/controls/Controls.tv.tsx
+++ b/components/video-player/controls/Controls.tv.tsx
@@ -1254,7 +1254,7 @@ export const Controls: FC<Props> = ({
                <Text
                  style={[styles.endsAtText, { fontSize: typography.callout }]}
                >
-                  {t("player.ends_at", { time: getFinishTime() })}
+                  {t("player.ends_at")} {getFinishTime()}
                </Text>
              </View>
            )}
@@ -1448,7 +1448,7 @@ export const Controls: FC<Props> = ({
                <Text
                  style={[styles.endsAtText, { fontSize: typography.callout }]}
                >
-                  {t("player.ends_at", { time: getFinishTime() })}
+                  {t("player.ends_at")} {getFinishTime()}
                </Text>
              </View>
            )}
--- a/components/video-player/controls/EpisodeList.tsx
+++ b/components/video-player/controls/EpisodeList.tsx
@@ -5,6 +5,7 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { atom, useAtom } from "jotai";
 import { useEffect, useMemo, useRef } from "react";
 import { TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
 import {
  HorizontalScroll,
@@ -16,10 +17,10 @@ import {
  SeasonDropdown,
  type SeasonIndexState,
 } from "@/components/series/SeasonDropdown";
-import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
 import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
+import { useSettings } from "@/utils/atoms/settings";
 import {
  getDownloadedEpisodesForSeason,
  getDownloadedSeasonNumbers,
@@ -45,7 +46,8 @@ export const EpisodeList: React.FC<Props> = ({ item, close, goToItem }) => {
    scrollViewRef.current?.scrollToIndex(index, 100);
  };
  const isOffline = useOfflineMode();
-  const insets = useControlsSafeAreaInsets();
+  const { settings } = useSettings();
+  const insets = useSafeAreaInsets();

  // Set the initial season index
  useEffect(() => {
@@ -57,11 +59,6 @@ export const EpisodeList: React.FC<Props> = ({ item, close, goToItem }) => {
    }
  }, []);

-  // Read the live (cached) downloads DB inside the query rather than the
-  // provider's downloadedItems snapshot. The snapshot only refreshes on the
-  // provider refreshKey, so after updateDownloadedItem() invalidates
-  // ["episodes"]/["seasons"] (e.g. progress/played writes) the refetch would
-  // return stale data. getAllDownloadedItems() is cached, so this stays cheap.
  const { getDownloadedItems } = useDownload();

  const seasonIndex = seasonIndexState[item.ParentId ?? ""];
@@ -185,9 +182,12 @@ export const EpisodeList: React.FC<Props> = ({ item, close, goToItem }) => {
        backgroundColor: "black",
        height: "100%",
        width: "100%",
-        paddingTop: insets.top,
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
+        paddingTop:
+          (settings?.safeAreaInControlsEnabled ?? true) ? insets.top : 0,
+        paddingLeft:
+          (settings?.safeAreaInControlsEnabled ?? true) ? insets.left : 0,
+        paddingRight:
+          (settings?.safeAreaInControlsEnabled ?? true) ? insets.right : 0,
      }}
    >
      <View
--- a/components/video-player/controls/HeaderControls.tsx
+++ b/components/video-player/controls/HeaderControls.tsx
@@ -5,11 +5,12 @@ import type {
 } from "@jellyfin/sdk/lib/generated-client";
 import { type FC, useCallback, useState } from "react";
 import { Platform, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import useRouter from "@/hooks/useAppRouter";
-import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
 import { useHaptic } from "@/hooks/useHaptic";
 import { useOrientation } from "@/hooks/useOrientation";
 import { OrientationLock } from "@/packages/expo-screen-orientation";
+import { useSettings } from "@/utils/atoms/settings";
 import { HEADER_LAYOUT, ICON_SIZES } from "./constants";
 import DropdownView from "./dropdown/DropdownView";
 import { PlaybackSpeedScope } from "./utils/playback-speed-settings";
@@ -57,8 +58,9 @@ export const HeaderControls: FC<HeaderControlsProps> = ({
  showTechnicalInfo = false,
  onToggleTechnicalInfo,
 }) => {
+  const { settings } = useSettings();
  const router = useRouter();
-  const insets = useControlsSafeAreaInsets();
+  const insets = useSafeAreaInsets();
  const lightHapticFeedback = useHaptic("light");
  const { orientation, lockOrientation } = useOrientation();
  const [isTogglingOrientation, setIsTogglingOrientation] = useState(false);
@@ -97,9 +99,10 @@ export const HeaderControls: FC<HeaderControlsProps> = ({
      style={[
        {
          position: "absolute",
-          top: insets.top,
-          left: insets.left,
-          right: insets.right,
+          top: (settings?.safeAreaInControlsEnabled ?? true) ? insets.top : 0,
+          left: (settings?.safeAreaInControlsEnabled ?? true) ? insets.left : 0,
+          right:
+            (settings?.safeAreaInControlsEnabled ?? true) ? insets.right : 0,
          padding: HEADER_LAYOUT.CONTAINER_PADDING,
        },
      ]}
--- a/components/video-player/controls/TechnicalInfoOverlay.tsx
+++ b/components/video-player/controls/TechnicalInfoOverlay.tsx
@@ -16,8 +16,8 @@ import Animated, {
 } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useScaledTVTypography } from "@/constants/TVTypography";
-import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
 import type { TechnicalInfo } from "@/modules/mpv-player";
+import { useSettings } from "@/utils/atoms/settings";
 import { HEADER_LAYOUT } from "./constants";

 type PlayMethod = "DirectPlay" | "DirectStream" | "Transcode";
@@ -184,8 +184,8 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
    currentAudioIndex,
  }) => {
    const typography = useScaledTVTypography();
+    const { settings } = useSettings();
    const insets = useSafeAreaInsets();
-    const safeInsets = useControlsSafeAreaInsets();
    const [info, setInfo] = useState<TechnicalInfo | null>(null);

    const opacity = useSharedValue(0);
@@ -268,8 +268,14 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          left: Math.max(insets.left, 48) + 20,
        }
      : {
-          top: safeInsets.top + HEADER_LAYOUT.CONTAINER_PADDING + 4,
-          left: safeInsets.left + HEADER_LAYOUT.CONTAINER_PADDING + 20,
+          top:
+            (settings?.safeAreaInControlsEnabled ?? true)
+              ? insets.top + HEADER_LAYOUT.CONTAINER_PADDING + 4
+              : HEADER_LAYOUT.CONTAINER_PADDING + 4,
+          left:
+            (settings?.safeAreaInControlsEnabled ?? true)
+              ? insets.left + HEADER_LAYOUT.CONTAINER_PADDING + 20
+              : HEADER_LAYOUT.CONTAINER_PADDING + 20,
        };

    const textStyle = Platform.isTV
--- a/hooks/useControlsSafeAreaInsets.ts
+++ b/hooks/useControlsSafeAreaInsets.ts
@@ -1,18 +0,0 @@
-import {
-  type EdgeInsets,
-  useSafeAreaInsets,
-} from "react-native-safe-area-context";
-import { useSettings } from "@/utils/atoms/settings";
-
-const ZERO_INSETS: EdgeInsets = { top: 0, right: 0, bottom: 0, left: 0 };
-
-/**
- * Returns safe-area insets to apply to in-player controls, honoring the
- * `safeAreaInControlsEnabled` user setting. When the setting is disabled,
- * returns zero insets so controls can sit flush against the screen edges.
- */
-export const useControlsSafeAreaInsets = (): EdgeInsets => {
-  const { settings } = useSettings();
-  const insets = useSafeAreaInsets();
-  return settings.safeAreaInControlsEnabled ? insets : ZERO_INSETS;
-};
--- a/hooks/useImageStorage.ts
+++ b/hooks/useImageStorage.ts
@@ -1,4 +1,3 @@
-import { File, Paths } from "expo-file-system";
 import { useCallback } from "react";
 import { storage } from "@/utils/mmkv";

@@ -13,28 +12,36 @@ const useImageStorage = () => {
    }
  }, []);

-  /**
-   * expo-file-system instead of fetch+Blob+FileReader: the latter silently
-   * resolves to an empty payload under RN's New Architecture.
-   */
  const image2Base64 = useCallback(async (url?: string | null) => {
    if (!url) return null;

-    const tmpFile = new File(
-      Paths.cache,
-      `img-${Date.now()}-${Math.random().toString(36).slice(2)}.jpg`,
-    );
+    let blob: Blob;
    try {
-      const downloaded = await File.downloadFileAsync(url, tmpFile, {
-        idempotent: true,
-      });
-      return await downloaded.base64();
+      // Fetch the data from the URL
+      const response = await fetch(url);
+      blob = await response.blob();
    } catch (error) {
      console.warn("Error fetching image:", error);
      return null;
-    } finally {
-      if (tmpFile.exists) tmpFile.delete();
    }
+
+    // Create a FileReader instance
+    const reader = new FileReader();
+
+    // Convert blob to base64
+    return new Promise<string>((resolve, reject) => {
+      reader.onloadend = () => {
+        if (typeof reader.result === "string") {
+          // Extract the base64 string (remove the data URL prefix)
+          const base64 = reader.result.split(",")[1];
+          resolve(base64);
+        } else {
+          reject(new Error("Failed to convert image to base64"));
+        }
+      };
+      reader.onerror = reject;
+      reader.readAsDataURL(blob);
+    });
  }, []);

  const saveImage = useCallback(
--- a/hooks/useJellyseerr.ts
+++ b/hooks/useJellyseerr.ts
@@ -48,7 +48,6 @@ import type {
  TvDetails,
 } from "@/utils/jellyseerr/server/models/Tv";
 import { writeErrorLog } from "@/utils/log";
-import { isVersionBelow } from "@/utils/serverUrl/semver";

 interface SearchParams {
  query: string;
@@ -142,13 +141,10 @@ export class JellyseerrApi {
      .then((response) => {
        const { status, headers, data } = response;
        if (inRange(status, 200, 299)) {
-          if (data.version && isVersionBelow(data.version, "2.0.0")) {
+          if (data.version < "2.0.0") {
            const error = t(
              "jellyseerr.toasts.jellyseer_does_not_meet_requirements",
            );
-            writeErrorLog(
-              `Jellyseerr version ${data.version} is below the required 2.0.0`,
-            );
            toast.error(error);
            throw Error(error);
          }
--- a/hooks/usePlaybackManager.ts
+++ b/hooks/usePlaybackManager.ts
@@ -109,35 +109,30 @@ export const usePlaybackManager = ({
    staleTime: 0,
  });

-  /**
-   * Derive prev/next from the current item's real position in the adjacent
-   * list rather than from the array length. `getEpisodes({ adjacentTo })` does
-   * not guarantee a fixed [prev, current, next] shape — at the first/last
-   * episode it can still return the current item as the first/last entry — so
-   * length-based indexing wrongly surfaces the current episode as "previous".
-   */
-  const currentIndex = useMemo(
-    () => adjacentItems?.findIndex((e) => e.Id === item?.Id) ?? -1,
-    [adjacentItems, item],
-  );
-
-  /** A neighbour is only navigable if it has an actual media file (not a
-   * "Virtual"/missing episode placeholder, e.g. an absent Special). */
-  const isNavigable = (episode?: BaseItemDto | null): episode is BaseItemDto =>
-    !!episode && episode.Id !== item?.Id && episode.LocationType !== "Virtual";
-
  const previousItem = useMemo(() => {
-    if (!adjacentItems || currentIndex <= 0) return null;
-    const candidate = adjacentItems[currentIndex - 1];
-    return isNavigable(candidate) ? candidate : null;
-  }, [adjacentItems, currentIndex, item]);
+    if (!adjacentItems || adjacentItems.length <= 1) {
+      return null;
+    }
+
+    if (adjacentItems.length === 2) {
+      return adjacentItems[0].Id === item?.Id ? null : adjacentItems[0];
+    }
+
+    return adjacentItems[0];
+  }, [adjacentItems, item]);

  /** The next item in the series */
  const nextItem = useMemo(() => {
-    if (!adjacentItems || currentIndex < 0) return null;
-    const candidate = adjacentItems[currentIndex + 1];
-    return isNavigable(candidate) ? candidate : null;
-  }, [adjacentItems, currentIndex, item]);
+    if (!adjacentItems || adjacentItems.length <= 1) {
+      return null;
+    }
+
+    if (adjacentItems.length === 2) {
+      return adjacentItems[1].Id === item?.Id ? null : adjacentItems[1];
+    }
+
+    return adjacentItems[2];
+  }, [adjacentItems, item]);

  /**
   * Reports playback progress.
--- a/hooks/useServerUrlResolver.ts
+++ b/hooks/useServerUrlResolver.ts
@@ -1,65 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from "react";
-import {
-  type ResolveFailureReason,
-  type ResolveOptions,
-  type ResolveResult,
-  resolveServerUrl,
-} from "@/utils/serverUrl/resolve";
-import type { ServerProbe } from "@/utils/serverUrl/types";
-
-export type ServerUrlResolverState =
-  | { status: "idle" }
-  | { status: "resolving" }
-  | { status: "ok"; resolvedUrl: string; meta?: Record<string, unknown> }
-  | { status: "error"; reason: ResolveFailureReason };
-
-/**
- * Stateful wrapper around `resolveServerUrl` for screens.
- *
- * `resolve(input)` cancels any in-flight resolution, drives the state machine
- * (idle → resolving → ok | error) and returns the raw result. Pass a stable
- * (module-level) probe; memoize `options` if you supply one.
- */
-export function useServerUrlResolver(
-  probe: ServerProbe,
-  options?: ResolveOptions,
-) {
-  const [state, setState] = useState<ServerUrlResolverState>({
-    status: "idle",
-  });
-  const abortRef = useRef<AbortController | null>(null);
-
-  const resolve = useCallback(
-    async (input: string): Promise<ResolveResult> => {
-      abortRef.current?.abort();
-      const controller = new AbortController();
-      abortRef.current = controller;
-      setState({ status: "resolving" });
-
-      const result = await resolveServerUrl(input, probe, {
-        ...options,
-        signal: controller.signal,
-      });
-
-      // Ignore results from a resolution that was superseded/cancelled.
-      if (!controller.signal.aborted) {
-        setState(
-          result.ok
-            ? { status: "ok", resolvedUrl: result.url, meta: result.meta }
-            : { status: "error", reason: result.reason },
-        );
-      }
-      return result;
-    },
-    [probe, options],
-  );
-
-  const reset = useCallback(() => {
-    abortRef.current?.abort();
-    setState({ status: "idle" });
-  }, []);
-
-  useEffect(() => () => abortRef.current?.abort(), []);
-
-  return { ...state, resolve, reset };
-}
--- a/modules/mpv-player/ios/MpvPlayerModule.swift
+++ b/modules/mpv-player/ios/MpvPlayerModule.swift
@@ -213,7 +213,7 @@ public class MpvPlayerModule: Module {
      }

      // Defines events that the view can send to JavaScript
-      Events("onLoad", "onPlaybackStateChange", "onProgress", "onError", "onTracksReady", "onPictureInPictureChange")
+      Events("onLoad", "onPlaybackStateChange", "onProgress", "onError", "onTracksReady")
    }
  }
 }
--- a/modules/mpv-player/ios/MpvPlayerView.swift
+++ b/modules/mpv-player/ios/MpvPlayerView.swift
@@ -61,7 +61,6 @@ class MpvPlayerView: ExpoView {
 	let onProgress = EventDispatcher()
 	let onError = EventDispatcher()
 	let onTracksReady = EventDispatcher()
-	let onPictureInPictureChange = EventDispatcher()

 	private var currentURL: URL?
 	private var cachedPosition: Double = 0
@@ -82,6 +81,7 @@ class MpvPlayerView: ExpoView {
 	private func setupView() {
 		clipsToBounds = true
 		backgroundColor = .black
+		configureAudioSession()

 		videoContainer = UIView()
 		videoContainer.translatesAutoresizingMaskIntoConstraints = false
@@ -141,26 +141,21 @@ class MpvPlayerView: ExpoView {
 		CATransaction.commit()
 	}

-	// MARK: - Audio Session & Notifications
-
 	private func configureAudioSession() {
-		let session = AVAudioSession.sharedInstance()
+		let audioSession = AVAudioSession.sharedInstance()
 		do {
-			try session.setCategory(.playback, mode: .moviePlayback, policy: .longFormAudio, options: [])
-			try session.setActive(true)
+			try audioSession.setCategory(
+				.playback,
+				mode: .moviePlayback,
+				policy: .longFormAudio,
+				options: []
+			)
+			try audioSession.setActive(true)
 		} catch {
 			print("Failed to configure audio session: \(error)")
 		}
 	}
-
-	/// Deactivate the session AND reset the category — `setActive(false)` alone
-	/// leaves `.playback`/`.longFormAudio` on the shared singleton, so any later
-	/// reactivation (foreground, route change, other modules) re-steals audio.
-	private func tearDownAudioSession() {
-		let session = AVAudioSession.sharedInstance()
-		try? session.setActive(false, options: .notifyOthersOnDeactivation)
-		try? session.setCategory(.ambient, mode: .default, options: [.mixWithOthers])
-	}
+	// MARK: - Audio Session & Notifications

 	private func setupNotifications() {
 		// Handle audio session interruptions (e.g., incoming calls, other apps playing audio)
@@ -275,7 +270,6 @@ class MpvPlayerView: ExpoView {

 	func play() {
 		intendedPlayState = true
-		configureAudioSession()
 		setupRemoteCommands()
 		renderer?.play()
 		pipController?.setPlaybackRate(1.0)
@@ -446,7 +440,6 @@ class MpvPlayerView: ExpoView {
 		renderer?.stop()
 		displayLayer.removeFromSuperlayer()
 		clearNowPlayingInfo()
-		tearDownAudioSession()
 		NotificationCenter.default.removeObserver(self)
 	}
 }
@@ -526,7 +519,9 @@ extension MpvPlayerView: MPVLayerRendererDelegate {
 	}

 	func renderer(_: MPVLayerRenderer, didSelectAudioOutput audioOutput: String) {
-		print("[MPV] Audio output ready (\(audioOutput)), syncing Now Playing")
+		// Audio output is now active - this is the right time to activate audio session and set Now Playing
+		print("[MPV] Audio output ready (\(audioOutput)), activating audio session and syncing Now Playing")
+		nowPlayingManager.activateAudioSession()
 		syncNowPlaying(isPlaying: !isPaused())
 	}
 }
@@ -638,9 +633,6 @@ extension MpvPlayerView: PiPControllerDelegate {
 		print("PiP did start: \(didStartPictureInPicture)")
 		// Ensure current time is synced when PiP starts
 		pipController?.setCurrentTimeFromSeconds(cachedPosition, duration: cachedDuration)
-		// Notify JS of the actual PiP active state. `didStartPictureInPicture`
-		// is `false` when AVKit reports a failure to start, so reflect that.
-		onPictureInPictureChange(["isActive": didStartPictureInPicture])
 	}
 	
 	func pipController(_ controller: PiPController, willStopPictureInPicture: Bool) {
@@ -659,9 +651,6 @@ extension MpvPlayerView: PiPControllerDelegate {
 		if _isZoomedToFill {
 			displayLayer.videoGravity = .resizeAspectFill
 		}
-		// Notify JS that PiP has fully stopped so the controls overlay can
-		// be re-mounted when the user returns to full screen.
-		onPictureInPictureChange(["isActive": false])
 	}
 	
 	func pipController(_ controller: PiPController, restoreUserInterfaceForPictureInPictureStop completionHandler: @escaping (Bool) -> Void) {
--- a/providers/Downloads/database.ts
+++ b/providers/Downloads/database.ts
@@ -4,68 +4,28 @@ import type { DownloadedItem, DownloadsDatabase } from "./types";

 const DOWNLOADS_DATABASE_KEY = "downloads.v2.json";

-// Performance optimization: Cache the parsed database to avoid repeated JSON.parse calls
-let cachedDb: DownloadsDatabase | null = null;
-let cacheVersion = 0;
-
-// Performance optimization: Cache the flattened items array
-let cachedItems: DownloadedItem[] | null = null;
-let itemsCacheVersion = -1;
-
-// Performance optimization: Index for O(1) item lookups by ID
-let itemIndex: Map<string, DownloadedItem> | null = null;
-let indexCacheVersion = -1;
-
 /**
 * Get the downloads database from storage
- * PERFORMANCE: Caches the parsed database to avoid repeated JSON.parse calls.
- * NOTE: Returns the shared cached instance — do NOT mutate it directly. Go
- * through addDownloadedItem/updateDownloadedItem/removeDownloadedItem so
- * saveDownloadsDatabase() runs and the derived caches stay consistent.
 */
 export function getDownloadsDatabase(): DownloadsDatabase {
-  // Return cached database if available
-  if (cachedDb !== null) {
-    return cachedDb;
-  }
-
-  // Parse from storage and cache the result
  const file = storage.getString(DOWNLOADS_DATABASE_KEY);
  if (file) {
-    cachedDb = JSON.parse(file) as DownloadsDatabase;
-    return cachedDb;
+    return JSON.parse(file) as DownloadsDatabase;
  }
-
-  const emptyDb = { movies: {}, series: {}, other: {} };
-  cachedDb = emptyDb;
-  return emptyDb;
+  return { movies: {}, series: {}, other: {} };
 }

 /**
 * Save the downloads database to storage
- * PERFORMANCE: Updates cache and invalidates derived caches
 */
 export function saveDownloadsDatabase(db: DownloadsDatabase): void {
  storage.set(DOWNLOADS_DATABASE_KEY, JSON.stringify(db));
-  // Update the cache with the new database
-  cachedDb = db;
-  // Invalidate derived caches (items array and index)
-  cachedItems = null;
-  itemIndex = null;
-  cacheVersion++;
 }

 /**
 * Get all downloaded items as a flat array
- * PERFORMANCE: Caches the flattened array to avoid rebuilding on every call
 */
 export function getAllDownloadedItems(): DownloadedItem[] {
-  // Return cached items if available and up-to-date
-  if (cachedItems !== null && itemsCacheVersion === cacheVersion) {
-    return cachedItems;
-  }
-
-  // Build the items array from the database
  const db = getDownloadsDatabase();
  const items: DownloadedItem[] = [];

@@ -87,41 +47,34 @@ export function getAllDownloadedItems(): DownloadedItem[] {
    }
  }

-  // Cache the result
-  cachedItems = items;
-  itemsCacheVersion = cacheVersion;
-
  return items;
 }

 /**
- * Build or refresh the item index for O(1) lookups
+ * Get a downloaded item by its ID
 */
-function ensureItemIndex(): void {
-  if (itemIndex !== null && indexCacheVersion === cacheVersion) {
-    return; // Index is up-to-date
+export function getDownloadedItemById(id: string): DownloadedItem | undefined {
+  const db = getDownloadsDatabase();
+
+  if (db.movies[id]) {
+    return db.movies[id];
  }

-  // Build new index from all items
-  itemIndex = new Map<string, DownloadedItem>();
-  const items = getAllDownloadedItems();
-
-  for (const item of items) {
-    if (item.item.Id) {
-      itemIndex.set(item.item.Id, item);
+  for (const series of Object.values(db.series)) {
+    for (const season of Object.values(series.seasons)) {
+      for (const episode of Object.values(season.episodes)) {
+        if (episode.item.Id === id) {
+          return episode;
+        }
+      }
    }
  }

-  indexCacheVersion = cacheVersion;
-}
+  if (db.other?.[id]) {
+    return db.other[id];
+  }

-/**
- * Get a downloaded item by its ID
- * PERFORMANCE: Uses O(1) index lookup instead of O(n²) iteration
- */
-export function getDownloadedItemById(id: string): DownloadedItem | undefined {
-  ensureItemIndex();
-  return itemIndex!.get(id);
+  return undefined;
 }

 /**
@@ -268,5 +221,4 @@ export function updateDownloadedItem(
 */
 export function clearAllDownloadedItems(): void {
  saveDownloadsDatabase({ movies: {}, series: {}, other: {} });
-  // saveDownloadsDatabase already invalidates caches
 }
--- a/translations/en.json
+++ b/translations/en.json
@@ -1,12 +1,4 @@
 {
-  "server_url": {
-    "resolving": "Checking…",
-    "resolved": "→ {{url}}",
-    "connected": "Connected to {{url}}",
-    "unreachable": "Server unreachable",
-    "wrong_service": "Reachable, but not the expected server",
-    "invalid_url": "Enter a valid address"
-  },
  "login": {
    "username_required": "Username Is Required",
    "error_title": "Error",
--- a/utils/serverUrl/candidates.ts
+++ b/utils/serverUrl/candidates.ts
@@ -1,75 +0,0 @@
-/**
- * Generic server-URL candidate generator.
- *
- * Turns loose user input (`media.uruk.dev`, `https://media.uruk.dev`,
- * `host:8096`, `http://10.0.0.5:3000/path`) into an ordered list of full URLs
- * to probe — https first, http as fallback — while preserving any explicit
- * port and path. Service-agnostic: unlike the Jellyfin SDK's `getAddressCandidates`
- * it adds no Jellyfin-specific ports, so it suits Jellyseerr/Streamystats/etc.
- */
-
-// scheme? host (port)? (path/query/hash)?
-const URL_RE = /^(?:(https?):\/\/)?([^/:\s?#]+)(?::(\d+))?([/?#].*)?$/i;
-
-export interface ParsedServerInput {
-  scheme?: "http" | "https";
-  host: string;
-  port?: string;
-  /** Normalized path+query+hash, without a trailing slash; "" when none. */
-  path: string;
-}
-
-function normalizePath(path?: string): string {
-  if (!path || path === "/") return "";
-  return path.replace(/\/+$/, "");
-}
-
-/** Parse loose user input. Returns null when it can't be understood. */
-export function parseServerInput(input: string): ParsedServerInput | null {
-  const trimmed = input.trim();
-  if (!trimmed) return null;
-
-  const match = URL_RE.exec(trimmed);
-  if (!match) return null;
-
-  const [, scheme, host, port, rawPath] = match;
-  return {
-    scheme: scheme ? (scheme.toLowerCase() as "http" | "https") : undefined,
-    host: host.toLowerCase(),
-    port,
-    path: normalizePath(rawPath),
-  };
-}
-
-function buildUrl(
-  scheme: "http" | "https",
-  host: string,
-  port: string | undefined,
-  path: string,
-): string {
-  return `${scheme}://${host}${port ? `:${port}` : ""}${path}`;
-}
-
-/**
- * Ordered, de-duplicated candidate URLs for the given input.
- *
- * - Explicit scheme AND port → trusted as-is (single candidate).
- * - Otherwise https is tried before http (prefer secure), keeping any port/path.
- *
- * @returns [] when the input can't be parsed.
- */
-export function getServerUrlCandidates(input: string): string[] {
-  const parsed = parseServerInput(input);
-  if (!parsed) return [];
-
-  const { scheme, host, port, path } = parsed;
-
-  // Fully specified: don't second-guess the user.
-  if (scheme && port) return [buildUrl(scheme, host, port, path)];
-
-  // Secure-first; the typed scheme (if any) is still covered by this set.
-  const candidates = (["https", "http"] as const).map((s) =>
-    buildUrl(s, host, port, path),
-  );
-  return Array.from(new Set(candidates));
-}
--- a/utils/serverUrl/index.ts
+++ b/utils/serverUrl/index.ts
@@ -1,16 +0,0 @@
-export {
-  getServerUrlCandidates,
-  type ParsedServerInput,
-  parseServerInput,
-} from "./candidates";
-export { jellyfinProbe } from "./probes/jellyfin";
-export { jellyseerrProbe } from "./probes/jellyseerr";
-export { reachabilityProbe } from "./probes/reachability";
-export {
-  type ResolveFailureReason,
-  type ResolveOptions,
-  type ResolveResult,
-  resolveServerUrl,
-} from "./resolve";
-export { isVersionBelow } from "./semver";
-export type { ServerProbe, ServerProbeOutcome } from "./types";
--- a/utils/serverUrl/probes/jellyfin.ts
+++ b/utils/serverUrl/probes/jellyfin.ts
@@ -1,24 +0,0 @@
-import axios from "axios";
-import type { ServerProbe } from "../types";
-
-/** Public, unauthenticated Jellyfin endpoint; `ProductName` confirms the service. */
-const PRODUCT_NAME = "Jellyfin Server";
-
-export const jellyfinProbe: ServerProbe = async (url, signal) => {
-  try {
-    const { status, data } = await axios.get(`${url}/System/Info/Public`, {
-      signal,
-      timeout: 8000, // backstop; the resolver aborts via signal first
-    });
-
-    if (status < 200 || status >= 300) return { status: "unreachable" };
-    if (data?.ProductName !== PRODUCT_NAME) return { status: "wrong-service" };
-
-    return {
-      status: "ok",
-      meta: { version: data?.Version, serverName: data?.ServerName },
-    };
-  } catch {
-    return { status: "unreachable" };
-  }
-};
--- a/utils/serverUrl/probes/jellyseerr.ts
+++ b/utils/serverUrl/probes/jellyseerr.ts
@@ -1,30 +0,0 @@
-import axios from "axios";
-import type { ServerProbe } from "../types";
-
-/**
- * Probe for a Jellyseerr server. `/api/v1/status` is jellyseerr/overseerr
- * specific and unauthenticated, so it both proves reachability and confirms we
- * hit the right service. The minimum-version requirement is enforced at login
- * time (see JellyseerrApi.test) — not surfaced here, to keep the field UI clean.
- */
-export const jellyseerrProbe: ServerProbe = async (url, signal) => {
-  try {
-    const { status, data } = await axios.get(`${url}/api/v1/status`, {
-      signal,
-      timeout: 8000, // backstop; the resolver aborts via signal first
-    });
-
-    if (status < 200 || status >= 300) return { status: "unreachable" };
-
-    // A JSON body carrying version/commitTag identifies a real jellyseerr.
-    const looksLikeJellyseerr =
-      !!data &&
-      typeof data === "object" &&
-      (typeof data.version === "string" || "commitTag" in data);
-    if (!looksLikeJellyseerr) return { status: "wrong-service" };
-
-    return { status: "ok", meta: { version: data.version } };
-  } catch {
-    return { status: "unreachable" };
-  }
-};
--- a/utils/serverUrl/probes/reachability.ts
+++ b/utils/serverUrl/probes/reachability.ts
@@ -1,23 +0,0 @@
-import axios from "axios";
-import type { ServerProbe } from "../types";
-
-/**
- * Minimal probe for services without a known/unauthenticated health endpoint
- * (e.g. Marlin Search, Streamystats). Any HTTP response — even 4xx — proves the
- * host is up and speaking HTTP at this protocol/port, which is enough to pick
- * https vs http. It cannot detect a "wrong service".
- */
-export const reachabilityProbe: ServerProbe = async (url, signal) => {
-  try {
-    await axios.get(url, {
-      signal,
-      timeout: 8000,
-      validateStatus: () => true, // any status = the server answered
-    });
-    return { status: "ok" };
-  } catch (error) {
-    // A delivered response that still threw counts as reachable.
-    if ((error as { response?: unknown })?.response) return { status: "ok" };
-    return { status: "unreachable" };
-  }
-};
--- a/utils/serverUrl/resolve.ts
+++ b/utils/serverUrl/resolve.ts
@@ -1,88 +0,0 @@
-import { getServerUrlCandidates } from "./candidates";
-import type { ServerProbe, ServerProbeOutcome } from "./types";
-
-export type ResolveFailureReason =
-  | "empty"
-  | "invalid"
-  | "wrong-service"
-  | "unreachable";
-
-export type ResolveResult =
-  | { ok: true; url: string; meta?: Record<string, unknown> }
-  | { ok: false; reason: ResolveFailureReason };
-
-export interface ResolveOptions {
-  /** Per-candidate probe timeout in ms. Default 5000. */
-  timeoutMs?: number;
-  /** Abort the whole resolution (cancels every in-flight probe). */
-  signal?: AbortSignal;
-}
-
-// Order in which to surface a failure when no candidate validated:
-// the more specific/actionable the reason, the earlier it is reported.
-const FAILURE_PRIORITY = [
-  "wrong-service",
-  "unreachable",
-] as const satisfies ReadonlyArray<ResolveFailureReason>;
-
-/**
- * Resolve loose user input to a single working, canonical server URL.
- *
- * Generates candidates (https-first), probes them in parallel with a per-candidate
- * timeout, and returns the first candidate (in preference order) the probe
- * accepted. When none work, the most actionable failure is returned.
- */
-export async function resolveServerUrl(
-  input: string,
-  probe: ServerProbe,
-  options: ResolveOptions = {},
-): Promise<ResolveResult> {
-  const { timeoutMs = 5000, signal } = options;
-
-  if (!input.trim()) return { ok: false, reason: "empty" };
-
-  const candidates = getServerUrlCandidates(input);
-  if (candidates.length === 0) return { ok: false, reason: "invalid" };
-
-  const outcomes = await Promise.all(
-    candidates.map((url) => runProbe(url, probe, timeoutMs, signal)),
-  );
-
-  // Prefer the first candidate (https-first) that validated.
-  for (let i = 0; i < candidates.length; i++) {
-    const outcome = outcomes[i];
-    if (outcome.status === "ok") {
-      return { ok: true, url: candidates[i], meta: outcome.meta };
-    }
-  }
-
-  // Nothing validated: report the most useful failure.
-  for (const reason of FAILURE_PRIORITY) {
-    const hit = outcomes.find((outcome) => outcome.status === reason);
-    if (hit) {
-      return { ok: false, reason };
-    }
-  }
-  return { ok: false, reason: "unreachable" };
-}
-
-async function runProbe(
-  url: string,
-  probe: ServerProbe,
-  timeoutMs: number,
-  parentSignal?: AbortSignal,
-): Promise<ServerProbeOutcome> {
-  const controller = new AbortController();
-  const abort = () => controller.abort();
-  parentSignal?.addEventListener("abort", abort);
-  const timer = setTimeout(abort, timeoutMs);
-
-  try {
-    return await probe(url, controller.signal);
-  } catch {
-    return { status: "unreachable" };
-  } finally {
-    clearTimeout(timer);
-    parentSignal?.removeEventListener("abort", abort);
-  }
-}
--- a/utils/serverUrl/semver.ts
+++ b/utils/serverUrl/semver.ts
@@ -1,22 +0,0 @@
-/**
- * Strict numeric "below" comparison for dotted versions.
- *
- * Avoids the string-comparison bug (`"1.9.9" < "2.0.0"` works by luck but
- * `"2.10.0" < "2.0.0"` is wrongly true). Non-numeric/pre-release suffixes on a
- * segment are ignored (e.g. `2.0.0-beta` → 2.0.0).
- */
-export function isVersionBelow(version: string, minimum: string): boolean {
-  const parse = (v: string) =>
-    v.split(".").map((segment) => Number.parseInt(segment, 10) || 0);
-
-  const a = parse(version);
-  const b = parse(minimum);
-  const length = Math.max(a.length, b.length);
-
-  for (let i = 0; i < length; i++) {
-    const x = a[i] ?? 0;
-    const y = b[i] ?? 0;
-    if (x !== y) return x < y;
-  }
-  return false;
-}
--- a/utils/serverUrl/types.ts
+++ b/utils/serverUrl/types.ts
@@ -1,15 +0,0 @@
-/** Result of probing a single candidate URL for a specific service. */
-export type ServerProbeOutcome =
-  | { status: "ok"; meta?: Record<string, unknown> }
-  | { status: "wrong-service" }
-  | { status: "unreachable" };
-
-/**
- * Validates one fully-qualified candidate URL for a given service.
- * Implementations must resolve (never reject) — map errors to "unreachable".
- * The provided signal is aborted on timeout or cancellation.
- */
-export type ServerProbe = (
-  url: string,
-  signal: AbortSignal,
-) => Promise<ServerProbeOutcome>;