From bb1918f28b09f000bfdd91ee6f82b3c399828774 Mon Sep 17 00:00:00 2001
From: Priveetee <brahim.benyoucefpro@proton.me>
Date: Wed, 6 May 2026 20:11:20 +0200
Subject: [PATCH 1/6] fix: show progress on history cards

---
 apps/web/src/components/continue-card.tsx     |  6 ++---
 apps/web/src/components/history-card.tsx      |  2 ++
 .../web/src/components/video-progress-bar.tsx | 22 +++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 apps/web/src/components/video-progress-bar.tsx

diff --git a/apps/web/src/components/continue-card.tsx b/apps/web/src/components/continue-card.tsx
index ab94928..89eb502 100644
--- a/apps/web/src/components/continue-card.tsx
+++ b/apps/web/src/components/continue-card.tsx
@@ -2,13 +2,13 @@ import { Link } from "@tanstack/react-router";
 import { useWatchPrefetch } from "../hooks/use-watch-prefetch";
 import { formatDuration } from "../lib/format";
 import type { HistoryItem } from "../types/user";
+import { VideoProgressBar } from "./video-progress-bar";
 
 type ContinueCardProps = {
   item: HistoryItem;
 };
 
 export function ContinueCard({ item }: ContinueCardProps) {
-  const pct = Math.min(100, Math.round((item.progress / item.duration) * 100));
   const prefetch = useWatchPrefetch(item.url);
 
   return (
@@ -30,9 +30,7 @@ export function ContinueCard({ item }: ContinueCardProps) {
         <span className="absolute bottom-1 right-1 bg-black/80 text-white text-[10px] font-medium px-1 py-0.5 rounded">
           {formatDuration(item.duration)}
         </span>
-        <div className="absolute bottom-0 left-0 right-0 h-0.5 bg-surface-soft">
-          <div className="h-full bg-danger-strong" style={{ width: `${pct}%` }} />
-        </div>
+        <VideoProgressBar progress={item.progress} duration={item.duration} />
       </div>
       <div className="flex flex-col gap-0.5">
         <span className="text-xs text-fg line-clamp-2 leading-snug group-hover:text-white">
diff --git a/apps/web/src/components/history-card.tsx b/apps/web/src/components/history-card.tsx
index e1941bc..ec188d8 100644
--- a/apps/web/src/components/history-card.tsx
+++ b/apps/web/src/components/history-card.tsx
@@ -4,6 +4,7 @@ import { formatDuration } from "../lib/format";
 import { proxyImage } from "../lib/proxy";
 import type { HistoryItem } from "../types/user";
 import { HistoryChannelAvatar } from "./history-channel-avatar";
+import { VideoProgressBar } from "./video-progress-bar";
 
 function XIcon() {
   return (
@@ -67,6 +68,7 @@ export function HistoryCard({ item, onRemove, index }: HistoryCardProps) {
               {formatDuration(item.duration)}
             </span>
           )}
+          <VideoProgressBar progress={item.progress} duration={item.duration} alwaysVisible />
           <button
             type="button"
             onClick={(e) => {
diff --git a/apps/web/src/components/video-progress-bar.tsx b/apps/web/src/components/video-progress-bar.tsx
new file mode 100644
index 0000000..c4d25af
--- /dev/null
+++ b/apps/web/src/components/video-progress-bar.tsx
@@ -0,0 +1,22 @@
+type Props = {
+  progress: number;
+  duration: number;
+  className?: string;
+  alwaysVisible?: boolean;
+};
+
+function progressPercent(progress: number, duration: number): number | null {
+  if (!Number.isFinite(progress) || !Number.isFinite(duration) || duration <= 0) return null;
+  return Math.min(100, Math.max(0, (progress / duration) * 100));
+}
+
+export function VideoProgressBar({ progress, duration, className, alwaysVisible = false }: Props) {
+  const pct = progressPercent(progress, duration);
+  if (pct === null || (!alwaysVisible && pct <= 0)) return null;
+
+  return (
+    <div className={`absolute bottom-0 left-0 right-0 h-0.5 bg-surface-soft ${className ?? ""}`}>
+      <div className="h-full bg-danger-strong" style={{ width: `${pct}%` }} />
+    </div>
+  );
+}

From 6ce8751c94126e59b2af753af15f202ac9943981 Mon Sep 17 00:00:00 2001
From: Priveetee <brahim.benyoucefpro@proton.me>
Date: Wed, 6 May 2026 20:11:26 +0200
Subject: [PATCH 2/6] feat: add admin sessions API client

---
 apps/web/src/hooks/use-admin-sessions.ts |  11 +++
 apps/web/src/lib/api-admin-sessions.ts   | 111 +++++++++++++++++++++++
 apps/web/src/lib/session-device.ts       |  47 ++++++++++
 apps/web/src/types/admin.ts              |  28 ++++++
 4 files changed, 197 insertions(+)
 create mode 100644 apps/web/src/hooks/use-admin-sessions.ts
 create mode 100644 apps/web/src/lib/api-admin-sessions.ts
 create mode 100644 apps/web/src/lib/session-device.ts

diff --git a/apps/web/src/hooks/use-admin-sessions.ts b/apps/web/src/hooks/use-admin-sessions.ts
new file mode 100644
index 0000000..51ab66d
--- /dev/null
+++ b/apps/web/src/hooks/use-admin-sessions.ts
@@ -0,0 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+import { fetchAdminSessions } from "../lib/api-admin-sessions";
+
+export function useAdminSessions(enabled: boolean) {
+  return useQuery({
+    queryKey: ["admin-sessions"],
+    queryFn: fetchAdminSessions,
+    enabled,
+    refetchInterval: enabled ? 5000 : false,
+  });
+}
diff --git a/apps/web/src/lib/api-admin-sessions.ts b/apps/web/src/lib/api-admin-sessions.ts
new file mode 100644
index 0000000..b80ae10
--- /dev/null
+++ b/apps/web/src/lib/api-admin-sessions.ts
@@ -0,0 +1,111 @@
+import type { AdminSession } from "../types/admin";
+import { ApiError } from "./api";
+import { authed, authedJson } from "./authed";
+import { API_BASE as BASE } from "./env";
+
+export type SessionDevicePayload = {
+  clientName?: string;
+  clientVersion?: string;
+  deviceId?: string;
+  deviceName?: string;
+  deviceType?: string;
+};
+
+export type SessionPlaybackPayload = SessionDevicePayload & {
+  videoUrl?: string;
+  title?: string;
+  thumbnail?: string | null;
+  channelName?: string | null;
+  positionMs?: number;
+  durationMs?: number | null;
+  paused?: boolean;
+};
+
+export type SessionPlaybackStartPayload = SessionDevicePayload & {
+  videoUrl: string;
+  title: string;
+  thumbnail?: string | null;
+  channelName?: string | null;
+  positionMs?: number;
+  durationMs?: number | null;
+  paused?: boolean;
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === "object";
+}
+
+function isNullableString(value: unknown): value is string | null | undefined {
+  return value === null || value === undefined || typeof value === "string";
+}
+
+function isNullableNumber(value: unknown): value is number | null | undefined {
+  return value === null || value === undefined || typeof value === "number";
+}
+
+function isNowPlaying(value: unknown): value is NonNullable<AdminSession["nowPlaying"]> {
+  if (!isRecord(value)) return false;
+  return (
+    typeof value.videoUrl === "string" &&
+    typeof value.title === "string" &&
+    isNullableString(value.thumbnail) &&
+    isNullableString(value.channelName) &&
+    typeof value.positionMs === "number" &&
+    isNullableNumber(value.durationMs) &&
+    typeof value.paused === "boolean" &&
+    typeof value.updatedAt === "number"
+  );
+}
+
+function isAdminSession(value: unknown): value is AdminSession {
+  if (!isRecord(value)) return false;
+  const nowPlaying = value.nowPlaying;
+  return (
+    typeof value.id === "string" &&
+    isNullableString(value.userId) &&
+    isNullableString(value.username) &&
+    isNullableString(value.clientName) &&
+    isNullableString(value.clientVersion) &&
+    isNullableString(value.deviceId) &&
+    isNullableString(value.deviceName) &&
+    isNullableString(value.deviceType) &&
+    isNullableString(value.userAgent) &&
+    isNullableString(value.remoteAddress) &&
+    typeof value.lastActivityAt === "number" &&
+    isNullableNumber(value.lastPlaybackAt) &&
+    (nowPlaying === null || nowPlaying === undefined || isNowPlaying(nowPlaying))
+  );
+}
+
+export async function fetchAdminSessions(): Promise<AdminSession[]> {
+  const payload = await authedJson<unknown>(`${BASE}/admin/sessions`);
+  if (!Array.isArray(payload) || !payload.every(isAdminSession)) {
+    throw new ApiError("Invalid admin sessions payload", 500);
+  }
+  return payload;
+}
+
+async function postSession(path: string, body: SessionDevicePayload | SessionPlaybackPayload) {
+  const res = await authed(`${BASE}${path}`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+  });
+  if (res.status !== 204) throw new ApiError("Session reporting failed", res.status);
+}
+
+export function reportSessionActivity(body: SessionDevicePayload): Promise<void> {
+  return postSession("/sessions/activity", body);
+}
+
+export function reportPlaybackStart(body: SessionPlaybackStartPayload): Promise<void> {
+  return postSession("/sessions/playback/start", body);
+}
+
+export function reportPlaybackProgress(body: SessionPlaybackPayload): Promise<void> {
+  return postSession("/sessions/playback/progress", body);
+}
+
+export function reportPlaybackStop(body: SessionDevicePayload): Promise<void> {
+  return postSession("/sessions/playback/stop", body);
+}
diff --git a/apps/web/src/lib/session-device.ts b/apps/web/src/lib/session-device.ts
new file mode 100644
index 0000000..c1462ec
--- /dev/null
+++ b/apps/web/src/lib/session-device.ts
@@ -0,0 +1,47 @@
+import type { SessionDevicePayload } from "./api-admin-sessions";
+
+const DEVICE_ID_KEY = "typetype-device-id";
+
+function createDeviceId(): string {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID();
+  }
+  return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
+}
+
+function readDeviceId(): string {
+  try {
+    const existing = localStorage.getItem(DEVICE_ID_KEY);
+    if (existing) return existing;
+    const next = createDeviceId();
+    localStorage.setItem(DEVICE_ID_KEY, next);
+    return next;
+  } catch {
+    return createDeviceId();
+  }
+}
+
+function detectDeviceType(): string {
+  if (typeof navigator !== "undefined" && navigator.maxTouchPoints > 0) return "mobile";
+  return "desktop";
+}
+
+function detectDeviceName(): string {
+  if (typeof navigator === "undefined") return "Browser";
+  const ua = navigator.userAgent;
+  if (ua.includes("Firefox/")) return "Firefox";
+  if (ua.includes("Edg/")) return "Edge";
+  if (ua.includes("Chrome/")) return "Chrome";
+  if (ua.includes("Safari/")) return "Safari";
+  return "Browser";
+}
+
+export function getSessionDevicePayload(): SessionDevicePayload {
+  return {
+    clientName: "web",
+    clientVersion: import.meta.env.PROD ? "prod" : "dev",
+    deviceId: readDeviceId(),
+    deviceName: detectDeviceName(),
+    deviceType: detectDeviceType(),
+  };
+}
diff --git a/apps/web/src/types/admin.ts b/apps/web/src/types/admin.ts
index 6c11907..b6694cf 100644
--- a/apps/web/src/types/admin.ts
+++ b/apps/web/src/types/admin.ts
@@ -2,4 +2,32 @@ export type AdminSettings = {
   allowRegistration: boolean;
   allowGuest: boolean;
   forceEmailVerification: boolean;
+  activeSessionsEnabled: boolean;
+};
+
+type AdminSessionNowPlaying = {
+  videoUrl: string;
+  title: string;
+  thumbnail?: string | null;
+  channelName?: string | null;
+  positionMs: number;
+  durationMs?: number | null;
+  paused: boolean;
+  updatedAt: number;
+};
+
+export type AdminSession = {
+  id: string;
+  userId?: string | null;
+  username?: string | null;
+  clientName?: string | null;
+  clientVersion?: string | null;
+  deviceId?: string | null;
+  deviceName?: string | null;
+  deviceType?: string | null;
+  userAgent?: string | null;
+  remoteAddress?: string | null;
+  lastActivityAt: number;
+  lastPlaybackAt?: number | null;
+  nowPlaying?: AdminSessionNowPlaying | null;
 };

From 6a70250a8035e73bb22d3f7b0e086df37de43101 Mon Sep 17 00:00:00 2001
From: Priveetee <brahim.benyoucefpro@proton.me>
Date: Wed, 6 May 2026 20:11:32 +0200
Subject: [PATCH 3/6] feat: report active watch sessions

---
 apps/web/src/components/watch-layout.tsx      |  30 ++---
 .../hooks/use-session-activity-reporting.ts   |  30 +++++
 apps/web/src/hooks/use-watch-player-events.ts |  33 +++++
 .../src/hooks/use-watch-session-reporting.ts  | 126 ++++++++++++++++++
 apps/web/src/routes/__root.tsx                |  30 +----
 5 files changed, 205 insertions(+), 44 deletions(-)
 create mode 100644 apps/web/src/hooks/use-session-activity-reporting.ts
 create mode 100644 apps/web/src/hooks/use-watch-player-events.ts
 create mode 100644 apps/web/src/hooks/use-watch-session-reporting.ts

diff --git a/apps/web/src/components/watch-layout.tsx b/apps/web/src/components/watch-layout.tsx
index 9fc52dc..9c6f914 100644
--- a/apps/web/src/components/watch-layout.tsx
+++ b/apps/web/src/components/watch-layout.tsx
@@ -5,11 +5,8 @@ import { usePlayerError } from "../hooks/use-player-error";
 import { useSaveProgress } from "../hooks/use-progress";
 import { useSettings } from "../hooks/use-settings";
 import { useVolumeSync } from "../hooks/use-volume-sync";
-import {
-  useWatchRecommendationTracking,
-  useWatchVttAssets,
-} from "../hooks/use-watch-layout-assets";
-import { useWatchProgressPersistence } from "../hooks/use-watch-progress-persistence";
+import { useWatchVttAssets } from "../hooks/use-watch-layout-assets";
+import { useWatchPlayerEvents } from "../hooks/use-watch-player-events";
 import {
   getOriginalAudioLocale,
   getOriginalAudioTrackId,
@@ -55,13 +52,6 @@ export function WatchLayout({ stream, startTime }: Props) {
   const [toast, setToast] = useState<string | null>(null);
   const handleVolumeChange = useVolumeSync(update.mutate);
   const { thumbnailVtt, chaptersVtt } = useWatchVttAssets(stream);
-  const { positionRef, handleTimeUpdate, handlePause, handleSeeked } = useWatchProgressPersistence({
-    durationSec: stream.duration,
-    isLive,
-    mutate: save.mutate,
-  });
-
-  useWatchRecommendationTracking(stream, isLive, positionRef);
 
   useEffect(() => {
     if (!toast) return;
@@ -75,11 +65,17 @@ export function WatchLayout({ stream, startTime }: Props) {
     if (!next) return;
     navigate({ to: "/watch", search: { v: next.id } });
   }, [settingsReady, settings.autoplay, stream.related, navigate]);
+  const playerEvents = useWatchPlayerEvents({
+    stream,
+    isLive,
+    mutate: save.mutate,
+    onEnded: handleEnded,
+  });
 
   const overlay = (
     <>
       {isNicoNico && bulletCommentsOn && bulletComments && (
-        <DanmakuOverlay comments={bulletComments} positionRef={positionRef} />
+        <DanmakuOverlay comments={bulletComments} positionRef={playerEvents.positionRef} />
       )}
       <PlayerFocuser />
       <PlayerDefaults
@@ -131,11 +127,11 @@ export function WatchLayout({ stream, startTime }: Props) {
             originalAudioLocale={originalLocale}
             overlay={overlay}
             onVolumeChange={handleVolumeChange}
-            onTimeUpdate={handleTimeUpdate}
-            onPause={handlePause}
-            onSeeked={handleSeeked}
+            onTimeUpdate={playerEvents.handleTimeUpdate}
+            onPause={playerEvents.handlePause}
+            onSeeked={playerEvents.handleSeeked}
             onError={handleError}
-            onEnded={handleEnded}
+            onEnded={playerEvents.handleEnded}
             onSeekReady={(s) => {
               seekRef.current = s;
             }}
diff --git a/apps/web/src/hooks/use-session-activity-reporting.ts b/apps/web/src/hooks/use-session-activity-reporting.ts
new file mode 100644
index 0000000..8ccb1bd
--- /dev/null
+++ b/apps/web/src/hooks/use-session-activity-reporting.ts
@@ -0,0 +1,30 @@
+import { useEffect } from "react";
+import { reportSessionActivity } from "../lib/api-admin-sessions";
+import { getSessionDevicePayload } from "../lib/session-device";
+import { useAuth } from "./use-auth";
+
+const ACTIVITY_INTERVAL_MS = 60_000;
+
+export function useSessionActivityReporting() {
+  const { status } = useAuth();
+  const enabled = status === "authenticated";
+
+  useEffect(() => {
+    if (!enabled) return;
+
+    const report = () => {
+      void reportSessionActivity(getSessionDevicePayload()).catch(() => {});
+    };
+    const onVisibilityChange = () => {
+      if (document.visibilityState === "visible") report();
+    };
+
+    report();
+    const interval = setInterval(report, ACTIVITY_INTERVAL_MS);
+    document.addEventListener("visibilitychange", onVisibilityChange);
+    return () => {
+      clearInterval(interval);
+      document.removeEventListener("visibilitychange", onVisibilityChange);
+    };
+  }, [enabled]);
+}
diff --git a/apps/web/src/hooks/use-watch-player-events.ts b/apps/web/src/hooks/use-watch-player-events.ts
new file mode 100644
index 0000000..98522f2
--- /dev/null
+++ b/apps/web/src/hooks/use-watch-player-events.ts
@@ -0,0 +1,33 @@
+import type { VideoStream } from "../types/stream";
+import { useWatchProgressPersistence } from "./use-watch-progress-persistence";
+import { useWatchSessionReporting } from "./use-watch-session-reporting";
+
+type Args = {
+  stream: VideoStream;
+  isLive: boolean;
+  mutate: (positionMs: number) => void;
+  onEnded: () => void;
+};
+
+export function useWatchPlayerEvents({ stream, isLive, mutate, onEnded }: Args) {
+  const { positionRef, handleTimeUpdate, handlePause, handleSeeked } = useWatchProgressPersistence({
+    durationSec: stream.duration,
+    isLive,
+    mutate,
+  });
+  const sessionReporting = useWatchSessionReporting({
+    stream,
+    isLive,
+    onTimeUpdate: handleTimeUpdate,
+    onPause: handlePause,
+    onSeeked: handleSeeked,
+    onEnded,
+  });
+  return {
+    positionRef,
+    handleTimeUpdate: sessionReporting.handleTimeUpdate,
+    handlePause: sessionReporting.handlePause,
+    handleSeeked: sessionReporting.handleSeeked,
+    handleEnded: sessionReporting.handleEnded,
+  };
+}
diff --git a/apps/web/src/hooks/use-watch-session-reporting.ts b/apps/web/src/hooks/use-watch-session-reporting.ts
new file mode 100644
index 0000000..22d47af
--- /dev/null
+++ b/apps/web/src/hooks/use-watch-session-reporting.ts
@@ -0,0 +1,126 @@
+import { useCallback, useEffect, useRef } from "react";
+import {
+  reportPlaybackProgress,
+  reportPlaybackStart,
+  reportPlaybackStop,
+  type SessionPlaybackPayload,
+  type SessionPlaybackStartPayload,
+} from "../lib/api-admin-sessions";
+import { getSessionDevicePayload } from "../lib/session-device";
+import type { VideoStream } from "../types/stream";
+import { useAuth } from "./use-auth";
+
+const PROGRESS_INTERVAL_MS = 15_000;
+
+type Args = {
+  stream: VideoStream;
+  isLive: boolean;
+  onTimeUpdate: (positionMs: number) => void;
+  onPause: () => void;
+  onSeeked: () => void;
+  onEnded: () => void;
+};
+
+function durationMs(durationSec: number): number | null {
+  if (!Number.isFinite(durationSec) || durationSec <= 0) return null;
+  return Math.round(durationSec * 1000);
+}
+
+export function useWatchSessionReporting({
+  stream,
+  isLive,
+  onTimeUpdate,
+  onPause,
+  onSeeked,
+  onEnded,
+}: Args) {
+  const { status } = useAuth();
+  const enabled = status === "authenticated" && !isLive;
+  const startedRef = useRef(false);
+  const lastReportRef = useRef(0);
+  const positionRef = useRef(0);
+
+  const buildPayload = useCallback(
+    (positionMs: number, paused: boolean): SessionPlaybackStartPayload => ({
+      ...getSessionDevicePayload(),
+      videoUrl: stream.id,
+      title: stream.title,
+      thumbnail: stream.thumbnail,
+      channelName: stream.channelName,
+      positionMs: Math.max(0, Math.round(positionMs)),
+      durationMs: durationMs(stream.duration),
+      paused,
+    }),
+    [stream.channelName, stream.duration, stream.id, stream.thumbnail, stream.title],
+  );
+
+  const start = useCallback(
+    (positionMs: number) => {
+      if (!enabled || startedRef.current) return;
+      startedRef.current = true;
+      lastReportRef.current = Date.now();
+      void reportPlaybackStart(buildPayload(positionMs, false)).catch(() => {});
+    },
+    [buildPayload, enabled],
+  );
+
+  const progress = useCallback(
+    (positionMs: number, paused: boolean, force: boolean) => {
+      if (!enabled) return;
+      if (!startedRef.current) start(positionMs);
+      const now = Date.now();
+      if (!force && now - lastReportRef.current < PROGRESS_INTERVAL_MS) return;
+      lastReportRef.current = now;
+      const payload: SessionPlaybackPayload = buildPayload(positionMs, paused);
+      void reportPlaybackProgress(payload).catch(() => {});
+    },
+    [buildPayload, enabled, start],
+  );
+
+  const handleTimeUpdate = useCallback(
+    (positionMs: number) => {
+      positionRef.current = positionMs;
+      onTimeUpdate(positionMs);
+      progress(positionMs, false, false);
+    },
+    [onTimeUpdate, progress],
+  );
+
+  const handlePause = useCallback(() => {
+    onPause();
+    progress(positionRef.current, true, true);
+  }, [onPause, progress]);
+
+  const handleSeeked = useCallback(() => {
+    onSeeked();
+    progress(positionRef.current, false, true);
+  }, [onSeeked, progress]);
+
+  const handleEnded = useCallback(() => {
+    if (enabled && startedRef.current) {
+      startedRef.current = false;
+      void reportPlaybackStop(getSessionDevicePayload()).catch(() => {});
+    }
+    onEnded();
+  }, [enabled, onEnded]);
+
+  useEffect(() => {
+    const videoUrl = stream.id;
+    startedRef.current = false;
+    lastReportRef.current = 0;
+    positionRef.current = 0;
+    if (!enabled) return;
+    const stop = () => {
+      if (!startedRef.current || !videoUrl) return;
+      startedRef.current = false;
+      void reportPlaybackStop(getSessionDevicePayload()).catch(() => {});
+    };
+    window.addEventListener("pagehide", stop);
+    return () => {
+      window.removeEventListener("pagehide", stop);
+      stop();
+    };
+  }, [enabled, stream.id]);
+
+  return { handleTimeUpdate, handlePause, handleSeeked, handleEnded };
+}
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index c1cace2..776a94c 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -4,7 +4,7 @@ import { Navbar } from "../components/navbar";
 import { Sidebar } from "../components/sidebar";
 import { useAuth } from "../hooks/use-auth";
 import { useMobile } from "../hooks/use-mobile";
-import { useRecommendationOnboardingState } from "../hooks/use-recommendation-onboarding";
+import { useSessionActivityReporting } from "../hooks/use-session-activity-reporting";
 import { isAdminRoute, isAuthPage, requiresAuth } from "../lib/auth-routes";
 import { bootstrapSession } from "../lib/auth-session";
 import { applyTheme } from "../lib/theme";
@@ -34,11 +34,9 @@ function RootLayout() {
   const cinemaMode = useWatchLayoutStore((s) => s.cinemaMode);
   const { isAuthed, isAdmin, status } = useAuth();
   const pathname = useRouterState({ select: (state) => state.location.pathname });
-  const onboardingPage = pathname === "/onboarding";
   const shortsPage = pathname === "/shorts";
   const watchCinemaPage = pathname === "/watch" && cinemaMode;
-  const onboardingState = useRecommendationOnboardingState(status === "authenticated");
-  const onboardingRequired = onboardingState.data?.requiresOnboarding === true;
+  useSessionActivityReporting();
 
   useEffect(() => {
     void bootstrapSession();
@@ -74,21 +72,7 @@ function RootLayout() {
       window.location.replace("/");
       return;
     }
-    if (status !== "authenticated") return;
-    if (onboardingState.isError) return;
-    if (onboardingRequired && !onboardingPage) {
-      window.location.replace("/onboarding");
-      return;
-    }
-  }, [
-    isAuthed,
-    isAdmin,
-    status,
-    pathname,
-    onboardingState.isError,
-    onboardingRequired,
-    onboardingPage,
-  ]);
+  }, [isAuthed, isAdmin, status, pathname]);
 
   if (status === "loading" && (requiresAuth(pathname) || isAdminRoute(pathname))) {
     return (
@@ -98,14 +82,6 @@ function RootLayout() {
     );
   }
 
-  if (status === "authenticated" && !onboardingPage && onboardingState.isPending) {
-    return (
-      <div className="min-h-screen bg-app text-fg flex items-center justify-center">
-        <p className="text-sm text-fg-muted">Loading recommendations...</p>
-      </div>
-    );
-  }
-
   const authPage = isAuthPage(pathname);
 
   if (authPage) {

From da0dbedd28e9bbc650c0b5a8ce824c708f4a1cfb Mon Sep 17 00:00:00 2001
From: Priveetee <brahim.benyoucefpro@proton.me>
Date: Wed, 6 May 2026 20:12:33 +0200
Subject: [PATCH 4/6] feat: add admin sessions dashboard

---
 .../src/components/admin-console-header.tsx   |   4 +-
 apps/web/src/components/admin-console-nav.tsx |   8 +-
 .../web/src/components/admin-session-card.tsx | 125 ++++++++++++++++++
 .../src/components/admin-sessions-section.tsx |  50 +++++++
 .../src/components/admin-settings-panel.tsx   |   6 +
 apps/web/src/lib/api-admin.ts                 |   3 +-
 apps/web/src/routes/admin-console.tsx         |  17 ++-
 7 files changed, 203 insertions(+), 10 deletions(-)
 create mode 100644 apps/web/src/components/admin-session-card.tsx
 create mode 100644 apps/web/src/components/admin-sessions-section.tsx

diff --git a/apps/web/src/components/admin-console-header.tsx b/apps/web/src/components/admin-console-header.tsx
index ba7de4c..dab936f 100644
--- a/apps/web/src/components/admin-console-header.tsx
+++ b/apps/web/src/components/admin-console-header.tsx
@@ -1,4 +1,4 @@
-type AdminSection = "settings" | "users" | "issues";
+type AdminSection = "settings" | "users" | "sessions" | "issues";
 
 type Props = {
   section: AdminSection;
@@ -7,12 +7,14 @@ type Props = {
 const TITLES: Record<AdminSection, string> = {
   settings: "Admin Settings",
   users: "User Management",
+  sessions: "Active Sessions",
   issues: "Issue Triage",
 };
 
 const DESCRIPTIONS: Record<AdminSection, string> = {
   settings: "Global moderation and platform switches.",
   users: "Roles, suspension, and account recovery tools.",
+  sessions: "Connected clients, playback state, and recent activity.",
   issues: "Bug reports, diagnostics, status updates, and GitHub sync.",
 };
 
diff --git a/apps/web/src/components/admin-console-nav.tsx b/apps/web/src/components/admin-console-nav.tsx
index 5bb5306..60f89a0 100644
--- a/apps/web/src/components/admin-console-nav.tsx
+++ b/apps/web/src/components/admin-console-nav.tsx
@@ -1,4 +1,4 @@
-type AdminSection = "settings" | "users" | "issues";
+type AdminSection = "settings" | "users" | "sessions" | "issues";
 
 type Item = {
   key: AdminSection;
@@ -13,8 +13,8 @@ type Props = {
 
 export function AdminConsoleNav({ items, active, onSelect }: Props) {
   return (
-    <nav className="pt-3" aria-label="Admin sections">
-      <div className="grid grid-cols-1 gap-1 sm:grid-cols-3">
+    <nav className="overflow-x-auto pt-3" aria-label="Admin sections">
+      <div className="flex min-w-max gap-3 sm:grid sm:min-w-0 sm:grid-cols-4 sm:gap-1">
         {items.map((item) => {
           const isActive = item.key === active;
           return (
@@ -23,7 +23,7 @@ export function AdminConsoleNav({ items, active, onSelect }: Props) {
               type="button"
               aria-current={isActive ? "page" : undefined}
               onClick={() => onSelect(item.key)}
-              className={`border-b px-1 py-2 text-left font-mono text-xs uppercase tracking-[0.16em] transition-colors ${
+              className={`shrink-0 border-b px-1 py-2 text-left font-mono text-xs uppercase tracking-[0.16em] transition-colors ${
                 isActive
                   ? "border-border text-fg"
                   : "border-border text-fg-soft hover:border-border-strong hover:text-fg-muted"
diff --git a/apps/web/src/components/admin-session-card.tsx b/apps/web/src/components/admin-session-card.tsx
new file mode 100644
index 0000000..ddce41c
--- /dev/null
+++ b/apps/web/src/components/admin-session-card.tsx
@@ -0,0 +1,125 @@
+import { toApiUrl } from "../lib/env";
+import { getOpenMojiUrl, pickOpenMojiCode } from "../lib/openmoji";
+import type { AdminSession } from "../types/admin";
+import type { AuthUser } from "../types/auth";
+
+type Props = {
+  session: AdminSession;
+  user?: AuthUser;
+};
+
+function formatDuration(value: number | null | undefined): string {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return "0:00";
+  const totalSeconds = Math.floor(value / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}:${seconds.toString().padStart(2, "0")}`;
+}
+
+function initials(value: string): string {
+  return value
+    .split(" ")
+    .filter(Boolean)
+    .slice(0, 2)
+    .map((part) => part[0]?.toUpperCase() ?? "")
+    .join("");
+}
+
+function avatarUrl(user: AuthUser | undefined, session: AdminSession): string | null {
+  if (user?.avatarType === "emoji" && user.avatarCode) return getOpenMojiUrl(user.avatarCode);
+  if (user?.avatarUrl) return toApiUrl(user.avatarUrl);
+  if (user) return getOpenMojiUrl(pickOpenMojiCode(`${user.id}:${user.email}`));
+  if (session.userId) return getOpenMojiUrl(pickOpenMojiCode(session.userId));
+  return null;
+}
+
+export function AdminSessionCard({ session, user }: Props) {
+  const name =
+    user?.publicUsername ?? user?.name ?? session.username ?? session.userId ?? "Unknown user";
+  const device = [session.deviceName, session.deviceType].filter(Boolean).join(" - ") || "Browser";
+  const nowPlaying = session.nowPlaying;
+  const stateLabel = nowPlaying ? (nowPlaying.paused ? "Paused" : "Playing") : "Online";
+  const imageUrl = avatarUrl(user, session);
+  const progress = nowPlaying?.durationMs
+    ? Math.min(100, Math.max(0, (nowPlaying.positionMs / nowPlaying.durationMs) * 100))
+    : 0;
+
+  return (
+    <article className="group overflow-hidden rounded-2xl border border-border bg-[#10151f] shadow-sm transition-colors hover:border-border-strong">
+      <div className="relative aspect-video overflow-hidden bg-surface-soft">
+        {nowPlaying?.thumbnail ? (
+          <img
+            src={nowPlaying.thumbnail}
+            alt=""
+            className="h-full w-full object-cover opacity-85 transition-transform duration-300 group-hover:scale-[1.03]"
+            loading="lazy"
+          />
+        ) : (
+          <div className="relative h-full w-full overflow-hidden bg-[#0b1220]">
+            <div className="absolute -left-12 top-4 h-40 w-40 rounded-full bg-[#00a4dc]/25 blur-3xl" />
+            <div className="absolute bottom-0 right-0 h-44 w-44 rounded-full bg-sky-500/15 blur-3xl" />
+            <div className="absolute inset-0 bg-[radial-gradient(circle_at_top_right,rgba(255,255,255,0.12),transparent_32%)]" />
+            <div className="absolute inset-x-0 bottom-0 h-px bg-gradient-to-r from-transparent via-white/20 to-transparent" />
+          </div>
+        )}
+        <div className="absolute inset-0 bg-gradient-to-t from-[#10151f] via-[#10151f]/45 to-transparent" />
+        <div className="absolute left-3 top-3 flex items-center gap-2 rounded-full bg-black/55 px-3 py-1 text-xs font-medium text-white backdrop-blur sm:left-4 sm:top-4">
+          <span
+            className={`h-2 w-2 rounded-full ${nowPlaying && !nowPlaying.paused ? "bg-emerald-400" : "bg-fg-soft"}`}
+          />
+          {stateLabel}
+        </div>
+        <div className="absolute bottom-0 left-0 right-0 p-3 sm:p-4">
+          <div className="flex items-end gap-3">
+            <div className="flex h-10 w-10 shrink-0 items-center justify-center overflow-hidden rounded-full border border-white/15 bg-white/10 font-mono text-sm font-semibold text-white shadow-lg backdrop-blur sm:h-12 sm:w-12">
+              {imageUrl ? (
+                <img
+                  src={imageUrl}
+                  alt={name}
+                  className="h-full w-full object-cover"
+                  referrerPolicy="no-referrer"
+                />
+              ) : (
+                initials(name) || "U"
+              )}
+            </div>
+            <div className="min-w-0 pb-0.5">
+              <h2 className="truncate text-base font-semibold text-white">{name}</h2>
+              <p className="truncate text-xs text-white/70">{device}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div className="space-y-4 p-3 sm:p-4">
+        {nowPlaying ? (
+          <div>
+            <div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between sm:gap-3">
+              <div className="min-w-0">
+                <p className="truncate text-sm font-semibold text-white">{nowPlaying.title}</p>
+                <p className="mt-1 truncate text-xs text-white/55">
+                  {nowPlaying.channelName ?? "Video"}
+                </p>
+              </div>
+              <span className="self-start rounded-full bg-white/10 px-2 py-1 text-[11px] font-medium text-white/70">
+                {formatDuration(nowPlaying.positionMs)}
+              </span>
+            </div>
+            <div className="mt-4 h-2 overflow-hidden rounded-full bg-white/10">
+              <div className="h-full rounded-full bg-[#00a4dc]" style={{ width: `${progress}%` }} />
+            </div>
+            <div className="mt-2 flex items-center justify-between text-xs text-white/50">
+              <span>{formatDuration(nowPlaying.positionMs)}</span>
+              <span>{formatDuration(nowPlaying.durationMs)}</span>
+            </div>
+          </div>
+        ) : (
+          <div className="rounded-xl border border-white/10 bg-[#0c1524] p-4">
+            <p className="text-sm font-medium text-white/85">No active playback</p>
+            <p className="mt-1 text-xs text-sky-200/55">The client is connected and ready.</p>
+          </div>
+        )}
+      </div>
+    </article>
+  );
+}
diff --git a/apps/web/src/components/admin-sessions-section.tsx b/apps/web/src/components/admin-sessions-section.tsx
new file mode 100644
index 0000000..8302d31
--- /dev/null
+++ b/apps/web/src/components/admin-sessions-section.tsx
@@ -0,0 +1,50 @@
+import { useAdminSessions } from "../hooks/use-admin-sessions";
+import { useAdminUsers } from "../hooks/use-admin-users";
+import { AdminSessionCard } from "./admin-session-card";
+
+type Props = {
+  enabled: boolean;
+};
+
+export function AdminSessionsSection({ enabled }: Props) {
+  const query = useAdminSessions(enabled);
+  const usersQuery = useAdminUsers(enabled, 1, 200).query;
+  const sessions = query.data ?? [];
+  const users = usersQuery.data?.items ?? [];
+
+  if (query.isPending) {
+    return (
+      <section className="rounded-lg border border-border bg-surface/70 p-4 text-center text-sm text-fg-muted sm:p-6">
+        Loading active sessions...
+      </section>
+    );
+  }
+
+  if (query.isError) {
+    return (
+      <section className="rounded-lg border border-danger bg-danger/30 p-4 text-center text-sm text-danger-strong sm:p-6">
+        Unable to load active sessions.
+      </section>
+    );
+  }
+
+  if (sessions.length === 0) {
+    return (
+      <section className="rounded-lg border border-border bg-surface/70 p-4 text-center text-sm text-fg-muted sm:p-6">
+        No active sessions are currently reported.
+      </section>
+    );
+  }
+
+  return (
+    <section className="grid grid-cols-[minmax(0,1fr)] gap-4 md:grid-cols-2 2xl:grid-cols-3">
+      {sessions.map((session) => (
+        <AdminSessionCard
+          key={session.id}
+          session={session}
+          user={users.find((item) => item.id === session.userId)}
+        />
+      ))}
+    </section>
+  );
+}
diff --git a/apps/web/src/components/admin-settings-panel.tsx b/apps/web/src/components/admin-settings-panel.tsx
index e9cf68d..cb8ad43 100644
--- a/apps/web/src/components/admin-settings-panel.tsx
+++ b/apps/web/src/components/admin-settings-panel.tsx
@@ -35,6 +35,12 @@ export function AdminSettingsPanel({ settings, pending, onToggle }: Props) {
           pending={pending}
           onClick={() => onToggle("forceEmailVerification")}
         />
+        <SettingToggle
+          label="Track active sessions"
+          value={settings.activeSessionsEnabled}
+          pending={pending}
+          onClick={() => onToggle("activeSessionsEnabled")}
+        />
       </div>
     </section>
   );
diff --git a/apps/web/src/lib/api-admin.ts b/apps/web/src/lib/api-admin.ts
index 8fbab45..44c5fc6 100644
--- a/apps/web/src/lib/api-admin.ts
+++ b/apps/web/src/lib/api-admin.ts
@@ -17,7 +17,8 @@ function isAdminSettings(value: unknown): value is AdminSettings {
   return (
     typeof record.allowRegistration === "boolean" &&
     typeof record.allowGuest === "boolean" &&
-    typeof record.forceEmailVerification === "boolean"
+    typeof record.forceEmailVerification === "boolean" &&
+    typeof record.activeSessionsEnabled === "boolean"
   );
 }
 
diff --git a/apps/web/src/routes/admin-console.tsx b/apps/web/src/routes/admin-console.tsx
index e0a198f..9541cd0 100644
--- a/apps/web/src/routes/admin-console.tsx
+++ b/apps/web/src/routes/admin-console.tsx
@@ -3,24 +3,32 @@ import { useEffect, useState } from "react";
 import { AdminBugReportsSection } from "../components/admin-bug-reports-section";
 import { AdminConsoleHeader } from "../components/admin-console-header";
 import { AdminConsoleNav } from "../components/admin-console-nav";
+import { AdminSessionsSection } from "../components/admin-sessions-section";
 import { AdminSettingsSection } from "../components/admin-settings-section";
 import { AdminUsersSection } from "../components/admin-users-section";
 import { Toast } from "../components/toast";
 import { useAuth } from "../hooks/use-auth";
 import { goto } from "../lib/route-redirect";
 
-type AdminSection = "settings" | "users" | "issues";
+type AdminSection = "settings" | "users" | "sessions" | "issues";
 
 function isSection(value: unknown): value is AdminSection {
-  return value === "settings" || value === "users" || value === "issues";
+  return value === "settings" || value === "users" || value === "sessions" || value === "issues";
 }
 
 function availableSections(isAdmin: boolean, isModerator: boolean): AdminSection[] {
-  if (isAdmin) return ["settings", "users", "issues"];
+  if (isAdmin) return ["settings", "users", "sessions", "issues"];
   if (isModerator) return ["issues"];
   return [];
 }
 
+function sectionLabel(section: AdminSection): string {
+  if (section === "issues") return "Issues";
+  if (section === "users") return "Users";
+  if (section === "sessions") return "Sessions";
+  return "Settings";
+}
+
 function AdminConsolePage() {
   const { isAdmin, isModerator, me } = useAuth();
   const { section } = Route.useSearch();
@@ -51,7 +59,7 @@ function AdminConsolePage() {
       <AdminConsoleNav
         items={sections.map((key) => ({
           key,
-          label: key === "issues" ? "Issues" : key === "users" ? "Users" : "Settings",
+          label: sectionLabel(key),
         }))}
         active={activeSection}
         onSelect={(next) => navigate({ search: { section: next } })}
@@ -63,6 +71,7 @@ function AdminConsolePage() {
       {activeSection === "users" && isAdmin && (
         <AdminUsersSection enabled={isAdmin} currentUserId={me?.id ?? null} onToast={setToast} />
       )}
+      {activeSection === "sessions" && isAdmin && <AdminSessionsSection enabled={isAdmin} />}
       {activeSection === "issues" && (
         <AdminBugReportsSection enabled={canAccessAdmin} isAdmin={isAdmin} onToast={setToast} />
       )}

From 1a91acad36dc1f3d75b72d6ce38347b712033901 Mon Sep 17 00:00:00 2001
From: Priveetee <brahim.benyoucefpro@proton.me>
Date: Wed, 6 May 2026 20:12:45 +0200
Subject: [PATCH 5/6] refactor: remove recommendation personalization

---
 Architecture.md                               |   8 +-
 .../home-recommendations-section.tsx          |  23 +---
 apps/web/src/components/nav-items.tsx         |  10 --
 .../web/src/components/onboarding-actions.tsx |  87 -------------
 .../onboarding-channel-option-row.tsx         |  52 --------
 .../onboarding-channel-search-block.tsx       |  57 ---------
 .../onboarding-channel-selected-list.tsx      |  26 ----
 .../onboarding-channel-suggested-block.tsx    |  50 --------
 .../components/onboarding-channels-step.tsx   |  69 ----------
 apps/web/src/components/onboarding-error.tsx  |  22 ----
 apps/web/src/components/onboarding-header.tsx |  27 ----
 .../components/onboarding-interests-step.tsx  |  86 -------------
 .../web/src/components/onboarding-loading.tsx |   9 --
 .../src/components/onboarding-progress.tsx    |  26 ----
 .../src/components/onboarding-workflow.tsx    |  74 -----------
 .../recommendation-settings-shell.tsx         |  40 ------
 apps/web/src/components/shorts-actions.tsx    |  57 +--------
 .../src/components/shorts-player-shell.tsx    |  35 +-----
 ...n.tsx => video-block-actions-dropdown.tsx} |  30 +----
 .../components/video-card-feedback-menu.tsx   |   2 +-
 .../components/video-card-feedback-panel.tsx  |  21 +---
 .../web/src/components/watch-more-actions.tsx |  22 +---
 .../hooks/use-onboarding-channel-avatars.ts   |  75 -----------
 .../hooks/use-onboarding-channel-search.ts    |  45 -------
 .../hooks/use-onboarding-workflow-actions.ts  |  81 ------------
 .../hooks/use-onboarding-workflow-state.ts    |  90 -------------
 apps/web/src/hooks/use-onboarding-workflow.ts |  75 -----------
 .../hooks/use-recommendation-onboarding.ts    |  82 ------------
 apps/web/src/hooks/use-settings.ts            |  10 --
 apps/web/src/hooks/use-shorts-feed.ts         |  13 +-
 apps/web/src/hooks/use-watch-layout-assets.ts |  30 -----
 apps/web/src/lib/api-recommendations.ts       |  41 +-----
 apps/web/src/lib/auth-routes.ts               |   6 -
 apps/web/src/lib/channel-avatar-resolver.ts   |  53 --------
 apps/web/src/lib/recommendation-tracker.ts    | 119 ------------------
 apps/web/src/lib/shorts-tracking.ts           |  54 --------
 apps/web/src/routes/onboarding.tsx            |   8 --
 apps/web/src/routes/privacy.tsx               |  74 ++---------
 apps/web/src/routes/settings.tsx              |  18 ---
 .../src/routes/settings/recommendations.tsx   |  10 --
 .../stores/recommendation-tracking-store.ts   |  17 ---
 apps/web/src/stores/shorts-feedback-store.ts  |  25 ----
 apps/web/src/types/api.ts                     |  18 ---
 apps/web/src/types/user.ts                    |   1 -
 44 files changed, 29 insertions(+), 1749 deletions(-)
 delete mode 100644 apps/web/src/components/onboarding-actions.tsx
 delete mode 100644 apps/web/src/components/onboarding-channel-option-row.tsx
 delete mode 100644 apps/web/src/components/onboarding-channel-search-block.tsx
 delete mode 100644 apps/web/src/components/onboarding-channel-selected-list.tsx
 delete mode 100644 apps/web/src/components/onboarding-channel-suggested-block.tsx
 delete mode 100644 apps/web/src/components/onboarding-channels-step.tsx
 delete mode 100644 apps/web/src/components/onboarding-error.tsx
 delete mode 100644 apps/web/src/components/onboarding-header.tsx
 delete mode 100644 apps/web/src/components/onboarding-interests-step.tsx
 delete mode 100644 apps/web/src/components/onboarding-loading.tsx
 delete mode 100644 apps/web/src/components/onboarding-progress.tsx
 delete mode 100644 apps/web/src/components/onboarding-workflow.tsx
 delete mode 100644 apps/web/src/components/recommendation-settings-shell.tsx
 rename apps/web/src/components/{recommendation-feedback-dropdown.tsx => video-block-actions-dropdown.tsx} (77%)
 delete mode 100644 apps/web/src/hooks/use-onboarding-channel-avatars.ts
 delete mode 100644 apps/web/src/hooks/use-onboarding-channel-search.ts
 delete mode 100644 apps/web/src/hooks/use-onboarding-workflow-actions.ts
 delete mode 100644 apps/web/src/hooks/use-onboarding-workflow-state.ts
 delete mode 100644 apps/web/src/hooks/use-onboarding-workflow.ts
 delete mode 100644 apps/web/src/hooks/use-recommendation-onboarding.ts
 delete mode 100644 apps/web/src/lib/channel-avatar-resolver.ts
 delete mode 100644 apps/web/src/lib/recommendation-tracker.ts
 delete mode 100644 apps/web/src/lib/shorts-tracking.ts
 delete mode 100644 apps/web/src/routes/onboarding.tsx
 delete mode 100644 apps/web/src/routes/settings/recommendations.tsx
 delete mode 100644 apps/web/src/stores/recommendation-tracking-store.ts
 delete mode 100644 apps/web/src/stores/shorts-feedback-store.ts

diff --git a/Architecture.md b/Architecture.md
index eb1f508..8a659c3 100644
--- a/Architecture.md
+++ b/Architecture.md
@@ -112,7 +112,7 @@ Protected user routes:
 - `/history`, `/subscriptions`, `/subscriptions/feed`, `/subscriptions/shorts`
 - `/playlists`, `/watch-later`, `/progress`, `/favorites`, `/settings`
 - `/search-history`, `/blocked/channels`, `/blocked/videos`
-- `/recommendations/events`, `/recommendations/feedback`, `/recommendations/home`
+- `/recommendations/home`, `/recommendations/shorts`
 - `/recommendations/home/metrics`, `/restore/pipepipe`, `/imports/youtube-takeout`, `/bug-reports`
 
 Protected admin routes:
@@ -125,14 +125,12 @@ Protected admin routes:
 - YouTube uses `/streams/native-manifest` first, then fallback to `/streams/manifest` on `422`
 - NicoNico can return `422` on `/streams/manifest`; expected for non-DASH cases
 - `GET /search-history` supports backend pagination: `page` and `limit`, total from `X-Total-Count`
-- `settings.recommendationPersonalizationEnabled=false` disables recommendation event/feedback personalization while keeping Home recommendations available
-- Shorts recommendations can emit `short_skip` with optional `watchDurationMs` for skip-depth signals
+- Home and Shorts recommendations are fetched without client event reporting
 
 ## Recommendation and Privacy Flow
 
-- Frontend stores user preference through `PUT /settings` (`recommendationPersonalizationEnabled`).
-- Recommendation events are posted to `/recommendations/events` with optional fields such as `watchRatio` and `watchDurationMs`.
 - Home feed requests call `/recommendations/home` with `intent` (currently default `auto`).
+- Shorts feed requests call `/recommendations/shorts` with `intent` (currently default `auto`).
 - Optional offline quality metrics are available via `/recommendations/home/metrics`.
 
 ## Import and Restore Flow
diff --git a/apps/web/src/components/home-recommendations-section.tsx b/apps/web/src/components/home-recommendations-section.tsx
index 36a9874..fd6fc74 100644
--- a/apps/web/src/components/home-recommendations-section.tsx
+++ b/apps/web/src/components/home-recommendations-section.tsx
@@ -1,6 +1,5 @@
 import { useBlockedFilter } from "../hooks/use-blocked-filter";
 import { useHomeRecommendations } from "../hooks/use-home-recommendations";
-import { trackRecommendationEvent } from "../lib/recommendation-tracker";
 import { HomeFallbackSection } from "./home-fallback-section";
 import { ScrollSentinel } from "./scroll-sentinel";
 import { VideoCardSkeleton } from "./video-card-skeleton";
@@ -19,16 +18,8 @@ function SkeletonGrid() {
 }
 
 export function HomeRecommendationsSection() {
-  const {
-    streams,
-    serviceId,
-    intent,
-    isLoading,
-    isError,
-    hasNextPage,
-    isFetchingNextPage,
-    fetchNextPage,
-  } = useHomeRecommendations();
+  const { streams, isLoading, isError, hasNextPage, isFetchingNextPage, fetchNextPage } =
+    useHomeRecommendations();
   const { filter } = useBlockedFilter();
   const filtered = filter(streams);
 
@@ -36,15 +27,7 @@ export function HomeRecommendationsSection() {
   if (isError || filtered.length === 0) return <HomeFallbackSection />;
   return (
     <>
-      <VideoGrid
-        streams={filtered}
-        onCardOpen={(stream) => {
-          trackRecommendationEvent("click", stream, { serviceId, intent });
-        }}
-        onCardImpression={(stream) => {
-          trackRecommendationEvent("impression", stream, { serviceId, intent });
-        }}
-      />
+      <VideoGrid streams={filtered} />
       <ScrollSentinel onIntersect={fetchNextPage} enabled={hasNextPage && !isFetchingNextPage} />
     </>
   );
diff --git a/apps/web/src/components/nav-items.tsx b/apps/web/src/components/nav-items.tsx
index be7d077..417ab74 100644
--- a/apps/web/src/components/nav-items.tsx
+++ b/apps/web/src/components/nav-items.tsx
@@ -77,16 +77,6 @@ export const NAV_ITEMS: NavItem[] = [
       </>
     ),
   },
-  {
-    label: "Profile",
-    to: "/profile",
-    icon: (
-      <>
-        <circle cx="12" cy="8" r="3" />
-        <path d="M5 21v-2a4 4 0 0 1 4-4h6a4 4 0 0 1 4 4v2" />
-      </>
-    ),
-  },
   {
     label: "Privacy",
     to: "/privacy",
diff --git a/apps/web/src/components/onboarding-actions.tsx b/apps/web/src/components/onboarding-actions.tsx
deleted file mode 100644
index d617983..0000000
--- a/apps/web/src/components/onboarding-actions.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-type Props = {
-  currentStep: number;
-  canNext: boolean;
-  canFinish: boolean;
-  pending: boolean;
-  mode: "onboarding" | "settings";
-  onBack: () => void;
-  onSkip: () => void;
-  onSave: () => void;
-  onNext: () => void;
-  onFinish: () => void;
-};
-
-export function OnboardingActions({
-  currentStep,
-  canNext,
-  canFinish,
-  pending,
-  mode,
-  onBack,
-  onSkip,
-  onSave,
-  onNext,
-  onFinish,
-}: Props) {
-  const firstStep = currentStep === 0;
-  const lastStep = currentStep === 1;
-  const onboardingMode = mode === "onboarding";
-
-  return (
-    <footer className="sticky bottom-0 z-20 flex flex-wrap items-center justify-between gap-3 border-t border-border bg-app/95 pb-[calc(env(safe-area-inset-bottom)+0.5rem)] pt-3 backdrop-blur sm:static sm:bg-transparent sm:pb-0 sm:pt-4">
-      <div className="flex items-center gap-4">
-        {!firstStep && (
-          <button
-            type="button"
-            onClick={onBack}
-            disabled={pending}
-            className="h-10 rounded-lg px-2 text-sm text-fg-muted transition-colors hover:text-fg disabled:opacity-60"
-          >
-            Back
-          </button>
-        )}
-        {onboardingMode && (
-          <button
-            type="button"
-            onClick={onSkip}
-            disabled={pending}
-            className="h-10 rounded-lg px-1 text-sm text-fg-muted transition-colors hover:text-fg disabled:opacity-60"
-          >
-            Skip for now
-          </button>
-        )}
-      </div>
-
-      <div className="flex items-center gap-3">
-        <button
-          type="button"
-          onClick={onSave}
-          disabled={pending}
-          className="h-10 rounded-lg border border-border-strong px-4 text-sm text-fg disabled:opacity-60"
-        >
-          {onboardingMode ? "Save" : "Apply"}
-        </button>
-        {!lastStep && (
-          <button
-            type="button"
-            onClick={onNext}
-            disabled={!canNext || pending}
-            className="h-10 rounded-lg bg-fg px-4 text-sm font-medium text-app disabled:opacity-60"
-          >
-            Next
-          </button>
-        )}
-        {lastStep && (
-          <button
-            type="button"
-            onClick={onFinish}
-            disabled={!canFinish || pending}
-            className="h-10 rounded-lg bg-fg px-4 text-sm font-medium text-app disabled:opacity-60"
-          >
-            Finish
-          </button>
-        )}
-      </div>
-    </footer>
-  );
-}
diff --git a/apps/web/src/components/onboarding-channel-option-row.tsx b/apps/web/src/components/onboarding-channel-option-row.tsx
deleted file mode 100644
index 7988e5c..0000000
--- a/apps/web/src/components/onboarding-channel-option-row.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-type Props = {
-  name: string;
-  avatarUrl: string;
-  fallbackLabel: string;
-  active: boolean;
-  subtitle?: string;
-  onClick: () => void;
-};
-
-function initialFromLabel(value: string): string {
-  const text = value.trim();
-  if (!text) return "?";
-  return text[0]?.toUpperCase() ?? "?";
-}
-
-export function OnboardingChannelOptionRow({
-  name,
-  avatarUrl,
-  fallbackLabel,
-  active,
-  subtitle,
-  onClick,
-}: Props) {
-  return (
-    <button
-      type="button"
-      onClick={onClick}
-      className={`flex items-center gap-3 rounded-xl border px-3 py-2.5 sm:py-2 text-left transition-colors ${
-        active
-          ? "border-border bg-fg/90 text-app"
-          : "border-border-strong text-fg hover:border-border-strong"
-      }`}
-    >
-      {avatarUrl ? (
-        <img
-          src={avatarUrl}
-          alt={name}
-          loading="lazy"
-          className="h-8 w-8 rounded-full border border-border-strong object-cover"
-        />
-      ) : (
-        <div className="h-8 w-8 rounded-full border border-border-strong bg-surface text-[11px] font-semibold text-fg-muted grid place-items-center">
-          {initialFromLabel(fallbackLabel)}
-        </div>
-      )}
-      <div className="flex min-w-0 flex-col">
-        <span className="truncate text-sm">{name}</span>
-        {subtitle && <span className="truncate text-xs text-fg-soft">{subtitle}</span>}
-      </div>
-    </button>
-  );
-}
diff --git a/apps/web/src/components/onboarding-channel-search-block.tsx b/apps/web/src/components/onboarding-channel-search-block.tsx
deleted file mode 100644
index 9869b75..0000000
--- a/apps/web/src/components/onboarding-channel-search-block.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { OnboardingChannelCandidate } from "../hooks/use-onboarding-channel-search";
-import { OnboardingChannelOptionRow } from "./onboarding-channel-option-row";
-
-type Props = {
-  query: string;
-  loading: boolean;
-  resolving: boolean;
-  channels: OnboardingChannelCandidate[];
-  selectedKeys: Set<string>;
-  onChangeQuery: (value: string) => void;
-  onSelect: (channel: OnboardingChannelCandidate) => void;
-};
-
-export function OnboardingChannelSearchBlock({
-  query,
-  loading,
-  resolving,
-  channels,
-  selectedKeys,
-  onChangeQuery,
-  onSelect,
-}: Props) {
-  return (
-    <div>
-      <p className="text-xs uppercase tracking-[0.12em] text-fg-soft">Find channels quickly</p>
-      <input
-        type="text"
-        value={query}
-        onChange={(e) => onChangeQuery(e.target.value)}
-        placeholder="Search a YouTube channel"
-        className="mt-2 h-11 sm:h-10 w-full rounded-lg border border-border-strong bg-app px-3 text-sm text-fg"
-      />
-      {loading && <p className="mt-2 text-xs text-fg-soft">Searching channels...</p>}
-      {channels.length > 0 && (
-        <div className="mt-3 grid gap-2">
-          {channels.map((channel, index) => (
-            <div
-              key={channel.channelUrl}
-              className="animate-card-pop-in"
-              style={{ animationDelay: `${Math.min(index * 40, 280)}ms` }}
-            >
-              <OnboardingChannelOptionRow
-                name={channel.name}
-                avatarUrl={channel.avatarUrl.trim()}
-                fallbackLabel={channel.name || channel.channelUrl}
-                subtitle={channel.channelUrl}
-                active={selectedKeys.has(channel.channelUrl.toLowerCase())}
-                onClick={() => onSelect(channel)}
-              />
-            </div>
-          ))}
-        </div>
-      )}
-      {resolving && <p className="mt-2 text-xs text-fg-soft">Resolving avatars...</p>}
-    </div>
-  );
-}
diff --git a/apps/web/src/components/onboarding-channel-selected-list.tsx b/apps/web/src/components/onboarding-channel-selected-list.tsx
deleted file mode 100644
index 89f5172..0000000
--- a/apps/web/src/components/onboarding-channel-selected-list.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-type Props = {
-  channels: string[];
-  onRemove: (channel: string) => void;
-};
-
-export function OnboardingChannelSelectedList({ channels, onRemove }: Props) {
-  if (channels.length === 0) return null;
-
-  return (
-    <div>
-      <p className="text-xs uppercase tracking-[0.12em] text-fg-soft">Selected channels</p>
-      <div className="mt-2 flex flex-col gap-2 text-xs">
-        {channels.map((channel) => (
-          <button
-            key={channel}
-            type="button"
-            onClick={() => onRemove(channel)}
-            className="rounded-lg border border-border bg-app px-3 py-2.5 sm:py-2 text-left text-fg-muted hover:border-border-strong"
-          >
-            {channel}
-          </button>
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/components/onboarding-channel-suggested-block.tsx b/apps/web/src/components/onboarding-channel-suggested-block.tsx
deleted file mode 100644
index dea00e8..0000000
--- a/apps/web/src/components/onboarding-channel-suggested-block.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { SubscriptionItem } from "../types/user";
-import { OnboardingChannelOptionRow } from "./onboarding-channel-option-row";
-
-type Props = {
-  channels: SubscriptionItem[];
-  loading: boolean;
-  resolving: boolean;
-  selectedKeys: Set<string>;
-  onSelect: (channelUrl: string) => void;
-};
-
-export function OnboardingChannelSuggestedBlock({
-  channels,
-  loading,
-  resolving,
-  selectedKeys,
-  onSelect,
-}: Props) {
-  return (
-    <div>
-      <p className="text-xs uppercase tracking-[0.12em] text-fg-soft">
-        Suggested from subscriptions
-      </p>
-      {loading && <p className="mt-2 text-xs text-fg-soft">Loading suggestions...</p>}
-      {!loading && channels.length === 0 && (
-        <p className="mt-2 text-xs text-fg-soft">No subscriptions available yet.</p>
-      )}
-      {channels.length > 0 && (
-        <div className="mt-3 grid gap-2">
-          {channels.map((channel, index) => (
-            <div
-              key={channel.channelUrl}
-              className="animate-card-pop-in"
-              style={{ animationDelay: `${Math.min(index * 32, 224)}ms` }}
-            >
-              <OnboardingChannelOptionRow
-                name={channel.name}
-                avatarUrl={channel.avatarUrl.trim()}
-                fallbackLabel={channel.name || channel.channelUrl}
-                active={selectedKeys.has(channel.channelUrl.toLowerCase())}
-                onClick={() => onSelect(channel.channelUrl)}
-              />
-            </div>
-          ))}
-        </div>
-      )}
-      {resolving && <p className="mt-2 text-xs text-fg-soft">Resolving avatars...</p>}
-    </div>
-  );
-}
diff --git a/apps/web/src/components/onboarding-channels-step.tsx b/apps/web/src/components/onboarding-channels-step.tsx
deleted file mode 100644
index 41abb88..0000000
--- a/apps/web/src/components/onboarding-channels-step.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { OnboardingChannelCandidate } from "../hooks/use-onboarding-channel-search";
-import type { SubscriptionItem } from "../types/user";
-import { OnboardingChannelSearchBlock } from "./onboarding-channel-search-block";
-import { OnboardingChannelSelectedList } from "./onboarding-channel-selected-list";
-import { OnboardingChannelSuggestedBlock } from "./onboarding-channel-suggested-block";
-
-type Props = {
-  channelQuery: string;
-  selectedChannels: string[];
-  suggestedChannels: SubscriptionItem[];
-  searchedChannels: OnboardingChannelCandidate[];
-  suggestionsLoading: boolean;
-  searchLoading: boolean;
-  avatarResolving: boolean;
-  onChangeQuery: (value: string) => void;
-  onRemoveChannel: (channel: string) => void;
-  onSelectSuggestion: (channelUrl: string) => void;
-  onSelectSearched: (channel: OnboardingChannelCandidate) => void;
-};
-
-export function OnboardingChannelsStep({
-  channelQuery,
-  selectedChannels,
-  suggestedChannels,
-  searchedChannels,
-  suggestionsLoading,
-  searchLoading,
-  avatarResolving,
-  onChangeQuery,
-  onRemoveChannel,
-  onSelectSuggestion,
-  onSelectSearched,
-}: Props) {
-  const selectedKeys = new Set(selectedChannels.map((channel) => channel.toLowerCase()));
-
-  return (
-    <section className="flex flex-col gap-5">
-      <div className="border-b border-border pb-4">
-        <p className="font-mono text-xs uppercase tracking-[0.16em] text-fg-soft">
-          Step 2 - Favorite channels
-        </p>
-        <h2 className="mt-2 text-xl font-semibold text-fg">Add channels you trust</h2>
-        <p className="mt-2 text-sm text-fg-muted">
-          We use this to stabilize your first recommendations before history takes over.
-        </p>
-      </div>
-
-      <OnboardingChannelSearchBlock
-        query={channelQuery}
-        loading={searchLoading}
-        resolving={avatarResolving}
-        channels={searchedChannels}
-        selectedKeys={selectedKeys}
-        onChangeQuery={onChangeQuery}
-        onSelect={onSelectSearched}
-      />
-
-      <OnboardingChannelSuggestedBlock
-        channels={suggestedChannels}
-        loading={suggestionsLoading}
-        resolving={avatarResolving}
-        selectedKeys={selectedKeys}
-        onSelect={onSelectSuggestion}
-      />
-
-      <OnboardingChannelSelectedList channels={selectedChannels} onRemove={onRemoveChannel} />
-    </section>
-  );
-}
diff --git a/apps/web/src/components/onboarding-error.tsx b/apps/web/src/components/onboarding-error.tsx
deleted file mode 100644
index bdb020a..0000000
--- a/apps/web/src/components/onboarding-error.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-type Props = {
-  onRetry: () => void;
-};
-
-export function OnboardingError({ onRetry }: Props) {
-  return (
-    <div className="mx-auto mt-14 w-full max-w-xl rounded-2xl border border-border bg-surface/70 p-6">
-      <p className="font-mono text-xs uppercase tracking-[0.18em] text-fg-soft">Onboarding</p>
-      <h1 className="mt-2 text-xl font-semibold text-fg">Unable to load recommendations setup</h1>
-      <p className="mt-2 text-sm text-fg-muted">
-        We could not load onboarding data from the server. Retry to continue.
-      </p>
-      <button
-        type="button"
-        onClick={onRetry}
-        className="mt-4 h-10 rounded-lg border border-border-strong px-4 text-sm text-fg hover:border-border-strong"
-      >
-        Retry
-      </button>
-    </div>
-  );
-}
diff --git a/apps/web/src/components/onboarding-header.tsx b/apps/web/src/components/onboarding-header.tsx
deleted file mode 100644
index f4ed496..0000000
--- a/apps/web/src/components/onboarding-header.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { OnboardingProgress } from "./onboarding-progress";
-
-type Props = {
-  mode: "onboarding" | "settings";
-  step: number;
-};
-
-export function OnboardingHeader({ mode, step }: Props) {
-  const onboardingMode = mode === "onboarding";
-
-  return (
-    <header className="border-b border-border pb-5">
-      <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">First login</p>
-      <h1 className="mt-3 font-mono text-2xl sm:text-3xl font-semibold tracking-tight text-fg">
-        {onboardingMode ? "Tune your recommendations" : "Recommendation profile"}
-      </h1>
-      <p className="mt-3 max-w-2xl text-sm text-fg-muted">
-        {onboardingMode
-          ? "Quick setup in two steps. You can skip now and fine tune later from settings."
-          : "Adjust your interests and channels. Changes apply immediately to recommendation seeding."}
-      </p>
-      <div className="mt-4">
-        <OnboardingProgress currentStep={step} />
-      </div>
-    </header>
-  );
-}
diff --git a/apps/web/src/components/onboarding-interests-step.tsx b/apps/web/src/components/onboarding-interests-step.tsx
deleted file mode 100644
index c752f8b..0000000
--- a/apps/web/src/components/onboarding-interests-step.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import type { RecommendationOnboardingTopicsResponse } from "../types/api";
-
-type Props = {
-  topics: RecommendationOnboardingTopicsResponse | undefined;
-  selectedTopics: string[];
-  activeGroupId: string | null;
-  onSelectGroup: (groupId: string) => void;
-  onToggleTopic: (topic: string) => void;
-};
-
-export function OnboardingInterestsStep({
-  topics,
-  selectedTopics,
-  activeGroupId,
-  onSelectGroup,
-  onToggleTopic,
-}: Props) {
-  const minTopics = topics?.minTopics ?? 3;
-  const selectedTopicKeys = new Set(selectedTopics.map((topic) => topic.toLowerCase()));
-  const activeGroup =
-    topics?.groups.find((group) => group.id === activeGroupId) ?? topics?.groups[0];
-
-  return (
-    <section className="flex flex-col gap-5">
-      <div className="border-b border-border pb-4">
-        <p className="font-mono text-xs uppercase tracking-[0.16em] text-fg-soft">
-          Step 1 - Interests
-        </p>
-        <h2 className="mt-2 text-xl font-semibold text-fg">What should we prioritize?</h2>
-        <p className="mt-2 text-sm text-fg-muted">
-          Pick at least {minTopics} topics. You can change this later in settings.
-        </p>
-      </div>
-
-      <div className="flex items-center justify-between">
-        <p className="text-xs uppercase tracking-[0.12em] text-fg-soft">Selected topics</p>
-        <p className="text-xs text-fg-muted">
-          <span className="font-semibold text-fg">{selectedTopics.length}</span>
-          {` / ${minTopics} minimum`}
-        </p>
-      </div>
-
-      <div className="flex flex-wrap gap-1.5 sm:gap-2">
-        {topics?.groups.map((group) => {
-          const selected = group.id === activeGroup?.id;
-          return (
-            <button
-              key={group.id}
-              type="button"
-              onClick={() => onSelectGroup(group.id)}
-              className={`rounded-full border px-2.5 sm:px-3 py-1 text-xs transition-colors ${
-                selected
-                  ? "border-border bg-fg text-app"
-                  : "border-border-strong text-fg-muted hover:border-border-strong"
-              }`}
-            >
-              {group.label}
-            </button>
-          );
-        })}
-      </div>
-
-      {activeGroup && (
-        <div className="flex flex-wrap gap-1.5 sm:gap-2">
-          {activeGroup.topics.map((topic) => {
-            const selected = selectedTopicKeys.has(topic.toLowerCase());
-            return (
-              <button
-                key={topic}
-                type="button"
-                onClick={() => onToggleTopic(topic)}
-                className={`rounded-full border px-2.5 sm:px-3 py-1 text-xs transition-colors ${
-                  selected
-                    ? "border-border bg-fg text-app"
-                    : "border-border-strong text-fg hover:border-border-strong"
-                }`}
-              >
-                {topic}
-              </button>
-            );
-          })}
-        </div>
-      )}
-    </section>
-  );
-}
diff --git a/apps/web/src/components/onboarding-loading.tsx b/apps/web/src/components/onboarding-loading.tsx
deleted file mode 100644
index 2b53e90..0000000
--- a/apps/web/src/components/onboarding-loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-export function OnboardingLoading() {
-  return (
-    <div className="mx-auto flex w-full max-w-4xl flex-col gap-4 pt-14">
-      <div className="h-28 rounded-2xl border border-border bg-surface/60" />
-      <div className="h-56 rounded-2xl border border-border bg-surface/60" />
-      <div className="h-44 rounded-2xl border border-border bg-surface/60" />
-    </div>
-  );
-}
diff --git a/apps/web/src/components/onboarding-progress.tsx b/apps/web/src/components/onboarding-progress.tsx
deleted file mode 100644
index 7d3cbb2..0000000
--- a/apps/web/src/components/onboarding-progress.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-type Props = {
-  currentStep: number;
-};
-
-const STEPS = ["Interests", "Channels"];
-
-export function OnboardingProgress({ currentStep }: Props) {
-  return (
-    <div className="flex flex-wrap items-center gap-2">
-      {STEPS.map((label, index) => {
-        const active = index === currentStep;
-        const done = index < currentStep;
-        return (
-          <div key={label} className="flex items-center gap-2">
-            <div
-              className={`h-1.5 w-14 rounded-full ${active || done ? "bg-fg" : "bg-surface-soft"}`}
-            />
-            <span className={`text-xs ${active || done ? "text-fg-muted" : "text-fg-soft"}`}>
-              {label}
-            </span>
-          </div>
-        );
-      })}
-    </div>
-  );
-}
diff --git a/apps/web/src/components/onboarding-workflow.tsx b/apps/web/src/components/onboarding-workflow.tsx
deleted file mode 100644
index a8f4d43..0000000
--- a/apps/web/src/components/onboarding-workflow.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useOnboardingWorkflow } from "../hooks/use-onboarding-workflow";
-import type { useRecommendationOnboardingActions } from "../hooks/use-recommendation-onboarding";
-import type {
-  RecommendationOnboardingStateResponse,
-  RecommendationOnboardingTopicsResponse,
-} from "../types/api";
-import { OnboardingActions } from "./onboarding-actions";
-import { OnboardingChannelsStep } from "./onboarding-channels-step";
-import { OnboardingHeader } from "./onboarding-header";
-import { OnboardingInterestsStep } from "./onboarding-interests-step";
-import { Toast } from "./toast";
-
-type Props = {
-  state: RecommendationOnboardingStateResponse | undefined;
-  topics: RecommendationOnboardingTopicsResponse | undefined;
-  actions: ReturnType<typeof useRecommendationOnboardingActions>;
-  mode?: "onboarding" | "settings";
-};
-
-export function OnboardingWorkflow({ state, topics, actions, mode = "onboarding" }: Props) {
-  const flow = useOnboardingWorkflow({ state, topics, actions });
-
-  return (
-    <div className="mx-auto flex w-full max-w-4xl flex-col gap-6 sm:gap-7 pt-6 sm:pt-8 pb-6 sm:pb-8 [animation:page-fade-in_0.2s_ease-out]">
-      <Toast message={flow.toast} />
-      <OnboardingHeader mode={mode} step={flow.step} />
-
-      {flow.step === 0 && (
-        <div key="step-interests" className="[animation:onboarding-step-enter_0.26s_ease-out]">
-          <OnboardingInterestsStep
-            topics={topics}
-            selectedTopics={flow.selectedTopics}
-            activeGroupId={flow.activeGroupId}
-            onSelectGroup={flow.setActiveGroupId}
-            onToggleTopic={flow.toggleTopic}
-          />
-        </div>
-      )}
-
-      {flow.step === 1 && (
-        <div key="step-channels" className="[animation:onboarding-step-enter_0.26s_ease-out]">
-          <OnboardingChannelsStep
-            channelQuery={flow.channelQuery}
-            selectedChannels={flow.selectedChannels}
-            suggestedChannels={flow.suggestedChannels}
-            searchedChannels={flow.searchedChannels}
-            suggestionsLoading={flow.suggestionsLoading}
-            searchLoading={flow.searchLoading}
-            avatarResolving={flow.avatarResolving}
-            onChangeQuery={flow.setChannelQuery}
-            onRemoveChannel={flow.removeChannel}
-            onSelectSuggestion={flow.toggleSuggestedChannel}
-            onSelectSearched={flow.addChannelFromCandidate}
-          />
-        </div>
-      )}
-
-      {flow.error && <p className="text-sm text-danger">{flow.error}</p>}
-
-      <OnboardingActions
-        currentStep={flow.step}
-        canNext={flow.canNext}
-        canFinish={flow.canFinish}
-        pending={flow.pending}
-        mode={mode}
-        onBack={() => flow.setStep((current) => Math.max(0, current - 1))}
-        onSkip={() => void flow.skip()}
-        onSave={() => void flow.saveAndReapply()}
-        onNext={() => flow.setStep(1)}
-        onFinish={() => void flow.complete()}
-      />
-    </div>
-  );
-}
diff --git a/apps/web/src/components/recommendation-settings-shell.tsx b/apps/web/src/components/recommendation-settings-shell.tsx
deleted file mode 100644
index e38803c..0000000
--- a/apps/web/src/components/recommendation-settings-shell.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  useRecommendationOnboardingActions,
-  useRecommendationOnboardingState,
-  useRecommendationOnboardingTopics,
-} from "../hooks/use-recommendation-onboarding";
-import { OnboardingError } from "./onboarding-error";
-import { OnboardingLoading } from "./onboarding-loading";
-import { OnboardingWorkflow } from "./onboarding-workflow";
-
-type Props = {
-  mode?: "onboarding" | "settings";
-};
-
-export function RecommendationSettingsShell({ mode = "onboarding" }: Props) {
-  const stateQuery = useRecommendationOnboardingState(true);
-  const topicsQuery = useRecommendationOnboardingTopics(true);
-  const actions = useRecommendationOnboardingActions();
-
-  if (stateQuery.isPending || topicsQuery.isPending) return <OnboardingLoading />;
-
-  if (stateQuery.isError || topicsQuery.isError) {
-    return (
-      <OnboardingError
-        onRetry={() => {
-          void stateQuery.refetch();
-          void topicsQuery.refetch();
-        }}
-      />
-    );
-  }
-
-  return (
-    <OnboardingWorkflow
-      state={stateQuery.data}
-      topics={topicsQuery.data}
-      actions={actions}
-      mode={mode}
-    />
-  );
-}
diff --git a/apps/web/src/components/shorts-actions.tsx b/apps/web/src/components/shorts-actions.tsx
index cca73b1..48a6a94 100644
--- a/apps/web/src/components/shorts-actions.tsx
+++ b/apps/web/src/components/shorts-actions.tsx
@@ -1,18 +1,10 @@
-import { Ban, Clock3, MessageCircle, Share2, Star, UserMinus } from "lucide-react";
-import { useEffect, useState } from "react";
+import { Clock3, MessageCircle, Share2, Star } from "lucide-react";
 import { useAuth } from "../hooks/use-auth";
 import { useFavoritesPlaylist } from "../hooks/use-favorites-playlist";
-import { useSettings } from "../hooks/use-settings";
 import { useShareUrl } from "../hooks/use-share-url";
 import { useWatchLaterPlaylist } from "../hooks/use-watch-later-playlist";
-import {
-  sendRecommendationFeedback,
-  trackRecommendationEvent,
-} from "../lib/recommendation-tracker";
-import { useShortsFeedbackStore } from "../stores/shorts-feedback-store";
 import type { VideoStream } from "../types/stream";
 import { ShortsActionButton } from "./shorts-action-button";
-import { Toast } from "./toast";
 
 type Props = {
   stream: VideoStream;
@@ -23,12 +15,7 @@ type Props = {
 
 export function ShortsActions({ stream, onOpenComments, className, compact }: Props) {
   const { isAuthed } = useAuth();
-  const { settings } = useSettings();
-  const shortsIntent = "auto" as const;
   const { copied, share } = useShareUrl();
-  const [toastMsg, setToastMsg] = useState<string | null>(null);
-  const hideVideo = useShortsFeedbackStore((s) => s.hideVideo);
-  const hideChannel = useShortsFeedbackStore((s) => s.hideChannel);
   const {
     add: addFavorite,
     remove: removeFavorite,
@@ -45,12 +32,6 @@ export function ShortsActions({ stream, onOpenComments, className, compact }: Pr
   const favorited = isInFavorites(stream.id);
   const watchLater = isInWatchLater(stream.id);
 
-  useEffect(() => {
-    if (!toastMsg) return;
-    const timer = setTimeout(() => setToastMsg(null), 1800);
-    return () => clearTimeout(timer);
-  }, [toastMsg]);
-
   function requireAuth(): boolean {
     if (isAuthed) return true;
     const redirect = `/shorts?v=${encodeURIComponent(stream.id)}`;
@@ -70,10 +51,6 @@ export function ShortsActions({ stream, onOpenComments, className, compact }: Pr
       thumbnail: stream.thumbnail,
       duration: stream.duration,
     });
-    trackRecommendationEvent("favorite", stream, {
-      serviceId: settings.defaultService,
-      intent: shortsIntent,
-    });
   }
 
   async function toggleWatchLater() {
@@ -88,10 +65,6 @@ export function ShortsActions({ stream, onOpenComments, className, compact }: Pr
       thumbnail: stream.thumbnail,
       duration: stream.duration,
     });
-    trackRecommendationEvent("watch_later_add", stream, {
-      serviceId: settings.defaultService,
-      intent: shortsIntent,
-    });
   }
 
   function handleShare() {
@@ -99,19 +72,6 @@ export function ShortsActions({ stream, onOpenComments, className, compact }: Pr
     void share(watchUrl);
   }
 
-  function markNotInterested() {
-    sendRecommendationFeedback("not_interested", stream);
-    hideVideo(stream.id);
-    setToastMsg("Understood. We will fine-tune your Shorts.");
-  }
-
-  function showLessFromChannel() {
-    if (!stream.channelUrl) return;
-    sendRecommendationFeedback("less_from_channel", stream);
-    hideChannel(stream.channelUrl);
-    setToastMsg("Okay. We will show less from this channel.");
-  }
-
   return (
     <div className={`pointer-events-auto flex flex-col items-center gap-3 ${className ?? ""}`}>
       <ShortsActionButton
@@ -132,20 +92,6 @@ export function ShortsActions({ stream, onOpenComments, className, compact }: Pr
         compact={compact}
         onClick={() => void toggleWatchLater()}
       />
-      <ShortsActionButton
-        icon={Ban}
-        label="Not interested"
-        compact={compact}
-        onClick={markNotInterested}
-      />
-      <ShortsActionButton
-        icon={UserMinus}
-        label="Less channel"
-        stateLabel="Less channel"
-        compact={compact}
-        onClick={showLessFromChannel}
-        disabled={!stream.channelUrl}
-      />
       <ShortsActionButton
         icon={MessageCircle}
         label="Comments"
@@ -159,7 +105,6 @@ export function ShortsActions({ stream, onOpenComments, className, compact }: Pr
         compact={compact}
         onClick={handleShare}
       />
-      <Toast message={toastMsg} />
     </div>
   );
 }
diff --git a/apps/web/src/components/shorts-player-shell.tsx b/apps/web/src/components/shorts-player-shell.tsx
index b0de8f3..17eea99 100644
--- a/apps/web/src/components/shorts-player-shell.tsx
+++ b/apps/web/src/components/shorts-player-shell.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useRef, useState } from "react";
 import { ShortsPlayerStage } from "../components/shorts-player-stage";
 import { ShortsShellLoader } from "../components/shorts-shell-loader";
 import { useMobile } from "../hooks/use-mobile";
@@ -13,11 +13,8 @@ import {
   getOriginalAudioTrackId,
   getPreferredDefaultAudioTrackId,
 } from "../lib/audio-track";
-import { trackRecommendationEvent } from "../lib/recommendation-tracker";
 import { useShortsNavigation } from "../lib/shorts-navigation";
-import { trackShortsAutoAdvance, trackShortsUserMove } from "../lib/shorts-tracking";
 import { useUiStore } from "../stores/ui-store";
-import type { VideoStream } from "../types/stream";
 
 type Props = {
   targetUrl?: string;
@@ -27,30 +24,13 @@ export function ShortsPlayerShell({ targetUrl }: Props) {
   const isMobile = useMobile();
   const { shorts, isLoading, hasNextPage, isFetchingNextPage, fetchNextPage } = useShortsFeed();
   const { settings, update, query: settingsQuery } = useSettings();
-  const shortsIntent = "auto" as const;
   const sidebarCollapsed = useUiStore((s) => s.sidebarCollapsed);
   const playerRef = useRef<HTMLDivElement>(null);
-  const activeEnteredAtRef = useRef<number>(Date.now());
-  const activeStreamRef = useRef<VideoStream | null>(null);
   const [commentsOpen, setCommentsOpen] = useState(false);
   const settingsReady =
     (settingsQuery.isSuccess && !settingsQuery.isPlaceholderData) || settingsQuery.isError;
 
-  const onMove = (delta: number, reason: "user" | "auto") => {
-    const stream = activeStreamRef.current;
-    if (reason !== "user" || delta === 0 || !stream) return;
-    trackShortsUserMove(stream, activeEnteredAtRef.current, settings.defaultService, shortsIntent);
-  };
-
   const handleAutoNext = () => {
-    const stream = activeStreamRef.current;
-    if (stream)
-      trackShortsAutoAdvance(
-        stream,
-        activeEnteredAtRef.current,
-        settings.defaultService,
-        shortsIntent,
-      );
     moveBy(1, "auto");
   };
   const { index, moveBy, moveTo, onWheel, onTouchStart, onTouchEnd } = useShortsNavigation(
@@ -58,22 +38,9 @@ export function ShortsPlayerShell({ targetUrl }: Props) {
     hasNextPage,
     isFetchingNextPage,
     fetchNextPage,
-    onMove,
   );
   const { active, activeId, stream, streamQuery, current, errorMessage, isMemberOnlyShort } =
     useShortsActiveStream({ shorts, index });
-  useEffect(() => {
-    if (!active) {
-      activeStreamRef.current = null;
-      return;
-    }
-    activeStreamRef.current = active;
-    activeEnteredAtRef.current = Date.now();
-    trackRecommendationEvent("impression", active, {
-      serviceId: settings.defaultService,
-      intent: shortsIntent,
-    });
-  }, [active, settings.defaultService, shortsIntent]);
   const originalAudioTrackId = getOriginalAudioTrackId(stream);
   const preferredDefaultAudioTrackId = getPreferredDefaultAudioTrackId(stream);
   const originalAudioLocale = getOriginalAudioLocale(stream);
diff --git a/apps/web/src/components/recommendation-feedback-dropdown.tsx b/apps/web/src/components/video-block-actions-dropdown.tsx
similarity index 77%
rename from apps/web/src/components/recommendation-feedback-dropdown.tsx
rename to apps/web/src/components/video-block-actions-dropdown.tsx
index be3e63b..aeb51dc 100644
--- a/apps/web/src/components/recommendation-feedback-dropdown.tsx
+++ b/apps/web/src/components/video-block-actions-dropdown.tsx
@@ -1,27 +1,20 @@
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-import type { VideoStream } from "../types/stream";
 
 const MARGIN = 8;
 
 type Props = {
-  stream: VideoStream;
   anchorEl: HTMLElement | null;
   onClose: () => void;
-  onNotInterested: () => void;
-  onLessFromChannel?: () => void;
   onToggleVideoBlock?: () => void;
   onToggleChannelBlock?: () => void;
   videoBlocked?: boolean;
   channelBlocked?: boolean;
 };
 
-export function RecommendationFeedbackDropdown({
-  stream,
+export function VideoBlockActionsDropdown({
   anchorEl,
   onClose,
-  onNotInterested,
-  onLessFromChannel,
   onToggleVideoBlock,
   onToggleChannelBlock,
   videoBlocked,
@@ -73,27 +66,6 @@ export function RecommendationFeedbackDropdown({
       style={panelStyle}
       className="fixed z-50 w-56 overflow-hidden rounded-lg border border-border-strong bg-surface shadow-2xl"
     >
-      <button
-        type="button"
-        onClick={() => {
-          onNotInterested();
-          onClose();
-        }}
-        className="w-full px-3 py-2 text-left text-sm text-fg transition-colors hover:bg-surface-strong"
-      >
-        Not interested
-      </button>
-      <button
-        type="button"
-        onClick={() => {
-          onLessFromChannel?.();
-          onClose();
-        }}
-        disabled={!onLessFromChannel}
-        className="w-full px-3 py-2 text-left text-sm text-fg transition-colors hover:bg-surface-strong disabled:cursor-not-allowed disabled:text-fg-soft"
-      >
-        Less from {stream.channelName}
-      </button>
       {onToggleVideoBlock && (
         <button
           type="button"
diff --git a/apps/web/src/components/video-card-feedback-menu.tsx b/apps/web/src/components/video-card-feedback-menu.tsx
index aa90850..34b1494 100644
--- a/apps/web/src/components/video-card-feedback-menu.tsx
+++ b/apps/web/src/components/video-card-feedback-menu.tsx
@@ -23,7 +23,7 @@ export function VideoCardFeedbackMenu({ stream }: Props) {
         type="button"
         onClick={() => setMenuOpen((open) => !open)}
         className="rounded-md p-1 text-fg-muted transition-colors hover:bg-surface-strong hover:text-fg"
-        aria-label="Recommendation options"
+        aria-label="Video options"
       >
         <MoreIcon />
       </button>
diff --git a/apps/web/src/components/video-card-feedback-panel.tsx b/apps/web/src/components/video-card-feedback-panel.tsx
index 06477ff..1d7ae06 100644
--- a/apps/web/src/components/video-card-feedback-panel.tsx
+++ b/apps/web/src/components/video-card-feedback-panel.tsx
@@ -1,9 +1,8 @@
 import { useAuth } from "../hooks/use-auth";
 import { useBlocked } from "../hooks/use-blocked";
-import { sendRecommendationFeedback } from "../lib/recommendation-tracker";
 import { goto } from "../lib/route-redirect";
 import type { VideoStream } from "../types/stream";
-import { RecommendationFeedbackDropdown } from "./recommendation-feedback-dropdown";
+import { VideoBlockActionsDropdown } from "./video-block-actions-dropdown";
 
 type Props = {
   stream: VideoStream;
@@ -49,25 +48,9 @@ export function VideoCardFeedbackPanel({ stream, anchorEl, onClose }: Props) {
   }
 
   return (
-    <RecommendationFeedbackDropdown
-      stream={stream}
+    <VideoBlockActionsDropdown
       anchorEl={anchorEl}
       onClose={onClose}
-      onNotInterested={() =>
-        sendRecommendationFeedback("not_interested", {
-          id: stream.id,
-          channelUrl: stream.channelUrl,
-        })
-      }
-      onLessFromChannel={
-        stream.channelUrl
-          ? () =>
-              sendRecommendationFeedback("less_from_channel", {
-                id: stream.id,
-                channelUrl: stream.channelUrl,
-              })
-          : undefined
-      }
       onToggleVideoBlock={toggleVideoBlock}
       onToggleChannelBlock={stream.channelUrl ? toggleChannelBlock : undefined}
       videoBlocked={videoBlocked}
diff --git a/apps/web/src/components/watch-more-actions.tsx b/apps/web/src/components/watch-more-actions.tsx
index 38ebbdd..31ef727 100644
--- a/apps/web/src/components/watch-more-actions.tsx
+++ b/apps/web/src/components/watch-more-actions.tsx
@@ -1,9 +1,8 @@
 import { useRef, useState } from "react";
 import { useBlocked } from "../hooks/use-blocked";
-import { sendRecommendationFeedback } from "../lib/recommendation-tracker";
 import { goto } from "../lib/route-redirect";
 import type { VideoStream } from "../types/stream";
-import { RecommendationFeedbackDropdown } from "./recommendation-feedback-dropdown";
+import { VideoBlockActionsDropdown } from "./video-block-actions-dropdown";
 import { MoreIcon } from "./watch-icons";
 
 type Props = {
@@ -55,20 +54,6 @@ export function WatchMoreActions({ stream, isAuthed, onSaved, className }: Props
     onSaved(`Channel blocked: ${stream.channelName}`);
   }
 
-  function handleNotInterested() {
-    sendRecommendationFeedback("not_interested", { id: stream.id, channelUrl: stream.channelUrl });
-    onSaved("We'll show fewer videos like this");
-  }
-
-  function handleLessFromChannel() {
-    if (!stream.channelUrl) return;
-    sendRecommendationFeedback("less_from_channel", {
-      id: stream.id,
-      channelUrl: stream.channelUrl,
-    });
-    onSaved(`We'll show less from ${stream.channelName}`);
-  }
-
   return (
     <>
       <button
@@ -81,12 +66,9 @@ export function WatchMoreActions({ stream, isAuthed, onSaved, className }: Props
         More
       </button>
       {menuOpen && (
-        <RecommendationFeedbackDropdown
-          stream={stream}
+        <VideoBlockActionsDropdown
           anchorEl={menuAnchorRef.current}
           onClose={() => setMenuOpen(false)}
-          onNotInterested={handleNotInterested}
-          onLessFromChannel={stream.channelUrl ? handleLessFromChannel : undefined}
           onToggleVideoBlock={toggleVideoBlock}
           onToggleChannelBlock={stream.channelUrl ? toggleChannelBlock : undefined}
           videoBlocked={videoBlocked}
diff --git a/apps/web/src/hooks/use-onboarding-channel-avatars.ts b/apps/web/src/hooks/use-onboarding-channel-avatars.ts
deleted file mode 100644
index 7fea1d0..0000000
--- a/apps/web/src/hooks/use-onboarding-channel-avatars.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { useEffect, useMemo, useState } from "react";
-import { resolveChannelAvatar } from "../lib/channel-avatar-resolver";
-
-type ChannelInput = {
-  channelUrl: string;
-  avatarUrl: string;
-};
-
-export function useOnboardingChannelAvatars(channels: ChannelInput[]) {
-  const [avatars, setAvatars] = useState<Record<string, string>>({});
-  const [resolvingCount, setResolvingCount] = useState(0);
-
-  const normalized = useMemo(
-    () => channels.filter((channel) => channel.channelUrl.trim().length > 0),
-    [channels],
-  );
-
-  useEffect(() => {
-    let active = true;
-
-    async function hydrate() {
-      const directMap: Record<string, string> = {};
-      const pendingUrls: string[] = [];
-
-      for (const channel of normalized) {
-        const key = channel.channelUrl;
-        const direct = channel.avatarUrl.trim();
-        if (direct) {
-          directMap[key] = direct;
-          continue;
-        }
-        pendingUrls.push(key);
-      }
-
-      if (Object.keys(directMap).length > 0) {
-        setAvatars((current) => ({ ...current, ...directMap }));
-      }
-
-      if (pendingUrls.length === 0) return;
-
-      setResolvingCount(pendingUrls.length);
-
-      const resolved = await Promise.all(
-        pendingUrls.map(async (channelUrl) => ({
-          channelUrl,
-          avatarUrl: await resolveChannelAvatar(channelUrl),
-        })),
-      );
-
-      if (!active) return;
-
-      const resolvedMap: Record<string, string> = {};
-      for (const item of resolved) {
-        if (!item.avatarUrl) continue;
-        resolvedMap[item.channelUrl] = item.avatarUrl;
-      }
-      if (Object.keys(resolvedMap).length > 0) {
-        setAvatars((current) => ({ ...current, ...resolvedMap }));
-      }
-      setResolvingCount(0);
-    }
-
-    void hydrate();
-
-    return () => {
-      active = false;
-      setResolvingCount(0);
-    };
-  }, [normalized]);
-
-  return {
-    byChannelUrl: avatars,
-    resolving: resolvingCount > 0,
-  };
-}
diff --git a/apps/web/src/hooks/use-onboarding-channel-search.ts b/apps/web/src/hooks/use-onboarding-channel-search.ts
deleted file mode 100644
index 577cce2..0000000
--- a/apps/web/src/hooks/use-onboarding-channel-search.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { fetchSearch } from "../lib/api";
-import { useDebouncedValue } from "./use-debounced-value";
-
-export type OnboardingChannelCandidate = {
-  channelUrl: string;
-  name: string;
-  avatarUrl: string;
-};
-
-function buildCandidates(
-  items: { uploaderUrl: string; uploaderName: string; uploaderAvatarUrl: string }[],
-): OnboardingChannelCandidate[] {
-  const seen = new Set<string>();
-  const out: OnboardingChannelCandidate[] = [];
-
-  for (const item of items) {
-    const channelUrl = item.uploaderUrl.trim();
-    if (!channelUrl || seen.has(channelUrl)) continue;
-    seen.add(channelUrl);
-    out.push({
-      channelUrl,
-      name: item.uploaderName.trim() || channelUrl,
-      avatarUrl: item.uploaderAvatarUrl.trim(),
-    });
-    if (out.length >= 12) break;
-  }
-
-  return out;
-}
-
-export function useOnboardingChannelSearch(query: string, service: number) {
-  const debounced = useDebouncedValue(query.trim(), 260);
-  const enabled = debounced.length >= 2;
-
-  return useQuery({
-    queryKey: ["onboarding-channel-search", service, debounced],
-    enabled,
-    queryFn: async () => {
-      const page = await fetchSearch(debounced, service);
-      return buildCandidates(page.items);
-    },
-    staleTime: 60 * 1000,
-  });
-}
diff --git a/apps/web/src/hooks/use-onboarding-workflow-actions.ts b/apps/web/src/hooks/use-onboarding-workflow-actions.ts
deleted file mode 100644
index c53b407..0000000
--- a/apps/web/src/hooks/use-onboarding-workflow-actions.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { goto } from "../lib/route-redirect";
-import type { RecommendationOnboardingStateResponse } from "../types/api";
-import type { useRecommendationOnboardingActions } from "./use-recommendation-onboarding";
-
-type Params = {
-  state: RecommendationOnboardingStateResponse | undefined;
-  minTopics: number;
-  selectedTopics: string[];
-  selectedChannels: string[];
-  actions: ReturnType<typeof useRecommendationOnboardingActions>;
-  setError: (value: string | null) => void;
-  setToast: (value: string | null) => void;
-};
-
-export function useOnboardingWorkflowActions({
-  state,
-  minTopics,
-  selectedTopics,
-  selectedChannels,
-  actions,
-  setError,
-  setToast,
-}: Params) {
-  const pending =
-    actions.save.isPending ||
-    actions.complete.isPending ||
-    actions.skip.isPending ||
-    actions.reapply.isPending;
-
-  async function savePreferences() {
-    setError(null);
-    try {
-      await actions.save.mutateAsync({ selectedTopics, selectedChannels });
-      setToast("Preferences saved");
-    } catch {
-      setError("Unable to save preferences.");
-    }
-  }
-
-  async function saveAndReapply() {
-    setError(null);
-    try {
-      await actions.save.mutateAsync({ selectedTopics, selectedChannels });
-      if (state?.requiresOnboarding === false) {
-        await actions.reapply.mutateAsync();
-      }
-      setToast("Preferences saved");
-    } catch {
-      setError("Unable to save preferences.");
-    }
-  }
-
-  async function complete() {
-    setError(null);
-    if (selectedTopics.length < minTopics) {
-      setError(`Select at least ${minTopics} topics before continuing.`);
-      return;
-    }
-    try {
-      await actions.save.mutateAsync({ selectedTopics, selectedChannels });
-      await actions.complete.mutateAsync();
-      setToast("Onboarding completed");
-      window.location.replace("/");
-    } catch {
-      setError("Unable to complete onboarding.");
-    }
-  }
-
-  async function skip() {
-    setError(null);
-    try {
-      await actions.save.mutateAsync({ selectedTopics, selectedChannels });
-      await actions.skip.mutateAsync();
-      goto("/");
-    } catch {
-      setError("Unable to save your current choices.");
-    }
-  }
-
-  return { pending, savePreferences, saveAndReapply, complete, skip };
-}
diff --git a/apps/web/src/hooks/use-onboarding-workflow-state.ts b/apps/web/src/hooks/use-onboarding-workflow-state.ts
deleted file mode 100644
index ff69b4c..0000000
--- a/apps/web/src/hooks/use-onboarding-workflow-state.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useEffect, useRef, useState } from "react";
-import type {
-  RecommendationOnboardingStateResponse,
-  RecommendationOnboardingTopicsResponse,
-} from "../types/api";
-
-type Params = {
-  state: RecommendationOnboardingStateResponse | undefined;
-  topics: RecommendationOnboardingTopicsResponse | undefined;
-};
-
-export function useOnboardingWorkflowState({ state, topics }: Params) {
-  const [step, setStep] = useState(0);
-  const [selectedTopics, setSelectedTopics] = useState<string[]>([]);
-  const [selectedChannels, setSelectedChannels] = useState<string[]>([]);
-  const [channelQuery, setChannelQuery] = useState("");
-  const [activeGroupId, setActiveGroupId] = useState<string | null>(null);
-  const [error, setError] = useState<string | null>(null);
-  const [toast, setToast] = useState<string | null>(null);
-  const hydratedRef = useRef(false);
-
-  useEffect(() => {
-    if (!toast) return;
-    const timer = window.setTimeout(() => setToast(null), 1800);
-    return () => window.clearTimeout(timer);
-  }, [toast]);
-
-  useEffect(() => {
-    if (!topics?.groups[0] || activeGroupId) return;
-    setActiveGroupId(topics.groups[0].id);
-  }, [topics, activeGroupId]);
-
-  useEffect(() => {
-    if (!state || hydratedRef.current) return;
-    hydratedRef.current = true;
-    setSelectedTopics(state.selectedTopics);
-    setSelectedChannels(state.selectedChannels);
-  }, [state]);
-
-  function toggleTopic(topic: string) {
-    const key = topic.toLowerCase();
-    setSelectedTopics((current) => {
-      if (current.some((entry) => entry.toLowerCase() === key)) {
-        return current.filter((entry) => entry.toLowerCase() !== key);
-      }
-      return [...current, topic];
-    });
-  }
-
-  function addChannelUrl(channelUrl: string) {
-    setSelectedChannels((current) => {
-      const key = channelUrl.toLowerCase();
-      if (current.some((channel) => channel.toLowerCase() === key)) return current;
-      return [...current, channelUrl];
-    });
-  }
-
-  function toggleSuggestedChannel(channelUrl: string) {
-    setSelectedChannels((current) => {
-      const key = channelUrl.toLowerCase();
-      if (!current.some((channel) => channel.toLowerCase() === key)) {
-        return [...current, channelUrl];
-      }
-      return current.filter((channel) => channel.toLowerCase() !== key);
-    });
-  }
-
-  function removeChannel(channel: string) {
-    setSelectedChannels((current) => current.filter((item) => item !== channel));
-  }
-
-  return {
-    step,
-    selectedTopics,
-    selectedChannels,
-    channelQuery,
-    activeGroupId,
-    error,
-    toast,
-    setStep,
-    setActiveGroupId,
-    setChannelQuery,
-    setError,
-    setToast,
-    toggleTopic,
-    addChannelUrl,
-    toggleSuggestedChannel,
-    removeChannel,
-  };
-}
diff --git a/apps/web/src/hooks/use-onboarding-workflow.ts b/apps/web/src/hooks/use-onboarding-workflow.ts
deleted file mode 100644
index 1bea24b..0000000
--- a/apps/web/src/hooks/use-onboarding-workflow.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import type {
-  RecommendationOnboardingStateResponse,
-  RecommendationOnboardingTopicsResponse,
-} from "../types/api";
-import { useOnboardingChannelAvatars } from "./use-onboarding-channel-avatars";
-import { useOnboardingChannelSearch } from "./use-onboarding-channel-search";
-import { useOnboardingWorkflowActions } from "./use-onboarding-workflow-actions";
-import { useOnboardingWorkflowState } from "./use-onboarding-workflow-state";
-import type { useRecommendationOnboardingActions } from "./use-recommendation-onboarding";
-import { useSubscriptions } from "./use-subscriptions";
-
-type Params = {
-  state: RecommendationOnboardingStateResponse | undefined;
-  topics: RecommendationOnboardingTopicsResponse | undefined;
-  actions: ReturnType<typeof useRecommendationOnboardingActions>;
-};
-
-export function useOnboardingWorkflow({ state, topics, actions }: Params) {
-  const flowState = useOnboardingWorkflowState({ state, topics });
-  const subscriptions = useSubscriptions();
-  const channelSearch = useOnboardingChannelSearch(flowState.channelQuery, 0);
-  const minTopics = topics?.minTopics ?? 3;
-
-  const flowActions = useOnboardingWorkflowActions({
-    state,
-    minTopics,
-    selectedTopics: flowState.selectedTopics,
-    selectedChannels: flowState.selectedChannels,
-    actions,
-    setError: flowState.setError,
-    setToast: flowState.setToast,
-  });
-
-  const suggestedChannels = (subscriptions.query.data ?? []).slice(0, 12);
-  const channelsForAvatarHydration = [
-    ...suggestedChannels.map((channel) => ({
-      channelUrl: channel.channelUrl,
-      avatarUrl: channel.avatarUrl,
-    })),
-    ...((channelSearch.data ?? []).map((channel) => ({
-      channelUrl: channel.channelUrl,
-      avatarUrl: channel.avatarUrl,
-    })) ?? []),
-  ];
-  const hydratedAvatars = useOnboardingChannelAvatars(channelsForAvatarHydration);
-
-  const suggestedWithHydratedAvatars = suggestedChannels.map((channel) => ({
-    ...channel,
-    avatarUrl: hydratedAvatars.byChannelUrl[channel.channelUrl] ?? channel.avatarUrl,
-  }));
-
-  const searchedWithHydratedAvatars = (channelSearch.data ?? []).map((channel) => ({
-    ...channel,
-    avatarUrl: hydratedAvatars.byChannelUrl[channel.channelUrl] ?? channel.avatarUrl,
-  }));
-  const canNext = flowState.selectedTopics.length >= minTopics;
-  const canFinish = flowState.selectedTopics.length >= minTopics;
-
-  function addChannelFromCandidate(candidate: { channelUrl: string }) {
-    flowState.addChannelUrl(candidate.channelUrl);
-  }
-
-  return {
-    ...flowState,
-    ...flowActions,
-    suggestedChannels: suggestedWithHydratedAvatars,
-    searchedChannels: searchedWithHydratedAvatars,
-    canNext,
-    canFinish,
-    suggestionsLoading: subscriptions.query.isLoading,
-    searchLoading: channelSearch.isLoading,
-    avatarResolving: hydratedAvatars.resolving,
-    addChannelFromCandidate,
-  };
-}
diff --git a/apps/web/src/hooks/use-recommendation-onboarding.ts b/apps/web/src/hooks/use-recommendation-onboarding.ts
deleted file mode 100644
index d622fd7..0000000
--- a/apps/web/src/hooks/use-recommendation-onboarding.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-  completeRecommendationOnboarding,
-  fetchRecommendationOnboardingState,
-  fetchRecommendationOnboardingTopics,
-  reapplyRecommendationOnboarding,
-  saveRecommendationOnboardingPreferences,
-  skipRecommendationOnboarding,
-} from "../lib/api-recommendations";
-
-const ONBOARDING_STATE_KEY = ["recommendation-onboarding-state"];
-const ONBOARDING_TOPICS_KEY = ["recommendation-onboarding-topics"];
-
-function normalizeValues(values: string[]): string[] {
-  const seen = new Set<string>();
-  const out: string[] = [];
-  for (const raw of values) {
-    const value = raw.trim();
-    if (!value) continue;
-    const key = value.toLowerCase();
-    if (seen.has(key)) continue;
-    seen.add(key);
-    out.push(value);
-  }
-  return out;
-}
-
-export function useRecommendationOnboardingState(enabled: boolean) {
-  return useQuery({
-    queryKey: ONBOARDING_STATE_KEY,
-    queryFn: () => fetchRecommendationOnboardingState(),
-    enabled,
-    staleTime: 60 * 1000,
-  });
-}
-
-export function useRecommendationOnboardingTopics(enabled: boolean) {
-  return useQuery({
-    queryKey: ONBOARDING_TOPICS_KEY,
-    queryFn: () => fetchRecommendationOnboardingTopics(),
-    enabled,
-    staleTime: 5 * 60 * 1000,
-  });
-}
-
-export function useRecommendationOnboardingActions() {
-  const queryClient = useQueryClient();
-
-  const save = useMutation({
-    mutationFn: (payload: { selectedTopics: string[]; selectedChannels: string[] }) =>
-      saveRecommendationOnboardingPreferences({
-        selectedTopics: normalizeValues(payload.selectedTopics),
-        selectedChannels: normalizeValues(payload.selectedChannels),
-      }),
-    onSuccess: (state) => {
-      queryClient.setQueryData(ONBOARDING_STATE_KEY, state);
-    },
-  });
-
-  const complete = useMutation({
-    mutationFn: () => completeRecommendationOnboarding(),
-    onSuccess: (state) => {
-      queryClient.setQueryData(ONBOARDING_STATE_KEY, state);
-    },
-  });
-
-  const skip = useMutation({
-    mutationFn: () => skipRecommendationOnboarding(),
-    onSuccess: (state) => {
-      queryClient.setQueryData(ONBOARDING_STATE_KEY, state);
-    },
-  });
-
-  const reapply = useMutation({
-    mutationFn: () => reapplyRecommendationOnboarding(),
-    onSuccess: (state) => {
-      queryClient.setQueryData(ONBOARDING_STATE_KEY, state);
-    },
-  });
-
-  return { save, complete, skip, reapply };
-}
diff --git a/apps/web/src/hooks/use-settings.ts b/apps/web/src/hooks/use-settings.ts
index b0b9a9c..dfefaa1 100644
--- a/apps/web/src/hooks/use-settings.ts
+++ b/apps/web/src/hooks/use-settings.ts
@@ -1,7 +1,5 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { useEffect } from "react";
 import { fetchSettings, updateSettings } from "../lib/api-user";
-import { useRecommendationTrackingStore } from "../stores/recommendation-tracking-store";
 import type { SettingsItem } from "../types/user";
 import { useAuth } from "./use-auth";
 
@@ -17,13 +15,11 @@ const DEFAULTS: SettingsItem = {
   defaultSubtitleLanguage: "",
   defaultAudioLanguage: "en",
   preferOriginalLanguage: true,
-  recommendationPersonalizationEnabled: true,
 };
 
 export function useSettings() {
   const qc = useQueryClient();
   const { authReady, isAuthed } = useAuth();
-  const setTrackingEnabled = useRecommendationTrackingStore((s) => s.setEnabled);
 
   const query = useQuery({
     queryKey: KEY,
@@ -41,17 +37,11 @@ export function useSettings() {
     },
     onSuccess: (data) => {
       qc.setQueryData(KEY, data);
-      setTrackingEnabled(data.recommendationPersonalizationEnabled);
     },
     onError: (err) => {
       console.error("[settings] PUT failed", err);
     },
   });
 
-  useEffect(() => {
-    const current = query.data ?? DEFAULTS;
-    setTrackingEnabled(current.recommendationPersonalizationEnabled);
-  }, [query.data, setTrackingEnabled]);
-
   return { query, update, settings: query.data ?? DEFAULTS };
 }
diff --git a/apps/web/src/hooks/use-shorts-feed.ts b/apps/web/src/hooks/use-shorts-feed.ts
index 3af6232..f7ba54d 100644
--- a/apps/web/src/hooks/use-shorts-feed.ts
+++ b/apps/web/src/hooks/use-shorts-feed.ts
@@ -3,7 +3,6 @@ import { useMemo } from "react";
 import { fetchSearch } from "../lib/api";
 import { fetchShortsRecommendations, type RecommendationIntent } from "../lib/api-recommendations";
 import { fetchSubscriptionShorts } from "../lib/api-user";
-import { useShortsFeedbackStore } from "../stores/shorts-feedback-store";
 import type { VideoStream } from "../types/stream";
 import {
   blendRecommendationsWithSubscriptions,
@@ -31,8 +30,6 @@ export function useShortsFeed(): ShortsFeed {
   const { authReady, isAuthed } = useAuth();
   const { settings } = useSettings();
   const { filter } = useBlockedFilter();
-  const hiddenVideoIds = useShortsFeedbackStore((s) => s.hiddenVideoIds);
-  const hiddenChannelUrls = useShortsFeedbackStore((s) => s.hiddenChannelUrls);
   const intent: RecommendationIntent = "auto";
 
   const recommendations = useInfiniteQuery({
@@ -80,13 +77,7 @@ export function useShortsFeed(): ShortsFeed {
         ? blendRecommendationsWithSubscriptions(recommendationShorts, fallbackShorts)
         : fallbackShorts
       : fromDiscovery(discovery.data?.pages);
-    return filter(
-      interleaveByChannel(dedupeShorts(merged)).filter((stream) => {
-        if (hiddenVideoIds.includes(stream.id)) return false;
-        if (!stream.channelUrl) return true;
-        return !hiddenChannelUrls.includes(stream.channelUrl);
-      }),
-    );
+    return filter(interleaveByChannel(dedupeShorts(merged)));
   }, [
     isAuthed,
     hasRecommendationShorts,
@@ -94,8 +85,6 @@ export function useShortsFeed(): ShortsFeed {
     fallbackSubscriptions.data,
     discovery.data,
     filter,
-    hiddenVideoIds,
-    hiddenChannelUrls,
   ]);
 
   const useRecommendations = authReady && isAuthed && hasRecommendationShorts;
diff --git a/apps/web/src/hooks/use-watch-layout-assets.ts b/apps/web/src/hooks/use-watch-layout-assets.ts
index efc59fb..e4636d3 100644
--- a/apps/web/src/hooks/use-watch-layout-assets.ts
+++ b/apps/web/src/hooks/use-watch-layout-assets.ts
@@ -1,7 +1,6 @@
 import { useEffect, useRef } from "react";
 import { buildChaptersVtt } from "../lib/chapters-vtt";
 import { proxyUrl } from "../lib/proxy";
-import { trackRecommendationEvent } from "../lib/recommendation-tracker";
 import { buildThumbnailVtt } from "../lib/thumbnail-vtt";
 import type { VideoStream } from "../types/stream";
 
@@ -38,32 +37,3 @@ export function useWatchVttAssets(stream: VideoStream) {
     chaptersVtt: chaptersVtt.current ?? undefined,
   };
 }
-
-export function useWatchRecommendationTracking(
-  stream: VideoStream,
-  isLive: boolean,
-  positionRef: React.RefObject<number>,
-) {
-  const watchSentRef = useRef(false);
-  const trackedStreamIdRef = useRef("");
-
-  if (trackedStreamIdRef.current !== stream.id) {
-    trackedStreamIdRef.current = stream.id;
-    watchSentRef.current = false;
-  }
-
-  useEffect(() => {
-    if (isLive || stream.duration <= 0 || watchSentRef.current) return;
-    const onBeforeUnload = () => {
-      const ratio = Math.max(0, Math.min((positionRef.current ?? 0) / (stream.duration * 1000), 1));
-      if (ratio < 0.2 || watchSentRef.current) return;
-      watchSentRef.current = true;
-      trackRecommendationEvent("watch", stream, { watchRatio: ratio });
-    };
-    window.addEventListener("beforeunload", onBeforeUnload);
-    return () => {
-      onBeforeUnload();
-      window.removeEventListener("beforeunload", onBeforeUnload);
-    };
-  }, [isLive, stream, positionRef]);
-}
diff --git a/apps/web/src/lib/api-recommendations.ts b/apps/web/src/lib/api-recommendations.ts
index 2f5faf3..2835fe8 100644
--- a/apps/web/src/lib/api-recommendations.ts
+++ b/apps/web/src/lib/api-recommendations.ts
@@ -1,8 +1,4 @@
-import type {
-  HomeRecommendationsResponse,
-  RecommendationOnboardingStateResponse,
-  RecommendationOnboardingTopicsResponse,
-} from "../types/api";
+import type { HomeRecommendationsResponse } from "../types/api";
 import { authedJson } from "./authed";
 import { API_BASE as BASE } from "./env";
 
@@ -37,38 +33,3 @@ export async function fetchShortsRecommendations(
   if (cursor) search.set("cursor", cursor);
   return authedJson(`${BASE}/recommendations/shorts?${search.toString()}`);
 }
-
-type RecommendationOnboardingPreferencesRequest = {
-  selectedTopics: string[];
-  selectedChannels: string[];
-};
-
-export async function fetchRecommendationOnboardingTopics(): Promise<RecommendationOnboardingTopicsResponse> {
-  return authedJson(`${BASE}/recommendations/onboarding/topics`);
-}
-
-export async function fetchRecommendationOnboardingState(): Promise<RecommendationOnboardingStateResponse> {
-  return authedJson(`${BASE}/recommendations/onboarding/state`);
-}
-
-export async function saveRecommendationOnboardingPreferences(
-  payload: RecommendationOnboardingPreferencesRequest,
-): Promise<RecommendationOnboardingStateResponse> {
-  return authedJson(`${BASE}/recommendations/onboarding/preferences`, {
-    method: "PUT",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(payload),
-  });
-}
-
-export async function completeRecommendationOnboarding(): Promise<RecommendationOnboardingStateResponse> {
-  return authedJson(`${BASE}/recommendations/onboarding/complete`, { method: "POST" });
-}
-
-export async function skipRecommendationOnboarding(): Promise<RecommendationOnboardingStateResponse> {
-  return authedJson(`${BASE}/recommendations/onboarding/skip`, { method: "POST" });
-}
-
-export async function reapplyRecommendationOnboarding(): Promise<RecommendationOnboardingStateResponse> {
-  return authedJson(`${BASE}/recommendations/onboarding/reapply`, { method: "POST" });
-}
diff --git a/apps/web/src/lib/auth-routes.ts b/apps/web/src/lib/auth-routes.ts
index 518d95a..135d591 100644
--- a/apps/web/src/lib/auth-routes.ts
+++ b/apps/web/src/lib/auth-routes.ts
@@ -2,8 +2,6 @@ export type RedirectTarget =
   | "/"
   | "/import"
   | "/history"
-  | "/onboarding"
-  | "/settings/recommendations"
   | "/playlists"
   | "/privacy"
   | "/profile"
@@ -16,8 +14,6 @@ const SHORTS_REDIRECT_PREFIX = "/shorts?v=";
 const PROTECTED_PREFIXES = [
   "/import",
   "/history",
-  "/onboarding",
-  "/settings/recommendations",
   "/playlists",
   "/privacy",
   "/profile",
@@ -50,8 +46,6 @@ export function sanitizeRedirect(value: string | undefined): RedirectTarget {
   if (value.startsWith(SHORTS_REDIRECT_PREFIX)) return value as `/shorts?v=${string}`;
   if (value === "/import") return "/import";
   if (value === "/history") return "/history";
-  if (value === "/onboarding") return "/onboarding";
-  if (value === "/settings/recommendations") return "/settings/recommendations";
   if (value === "/privacy") return "/privacy";
   if (value === "/profile") return "/profile";
   if (value === "/settings") return "/settings";
diff --git a/apps/web/src/lib/channel-avatar-resolver.ts b/apps/web/src/lib/channel-avatar-resolver.ts
deleted file mode 100644
index a5e0c8a..0000000
--- a/apps/web/src/lib/channel-avatar-resolver.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { fetchChannel } from "./api";
-import { proxyImage } from "./proxy";
-
-const CACHE_MS = 30 * 60 * 1000;
-
-type CacheEntry = {
-  avatarUrl: string;
-  updatedAt: number;
-};
-
-const avatarCache = new Map<string, CacheEntry>();
-const pendingByChannel = new Map<string, Promise<string | null>>();
-
-function readCache(channelUrl: string): string | null {
-  const entry = avatarCache.get(channelUrl);
-  if (!entry) return null;
-  if (Date.now() - entry.updatedAt > CACHE_MS) {
-    avatarCache.delete(channelUrl);
-    return null;
-  }
-  return entry.avatarUrl;
-}
-
-function writeCache(channelUrl: string, avatarUrl: string): void {
-  avatarCache.set(channelUrl, { avatarUrl, updatedAt: Date.now() });
-}
-
-export async function resolveChannelAvatar(channelUrl: string): Promise<string | null> {
-  if (!channelUrl.startsWith("http://") && !channelUrl.startsWith("https://")) return null;
-  const cached = readCache(channelUrl);
-  if (cached) return cached;
-
-  const pending = pendingByChannel.get(channelUrl);
-  if (pending) return pending;
-
-  const task = (async () => {
-    try {
-      const channel = await fetchChannel(channelUrl);
-      const raw = channel.avatarUrl.trim();
-      if (!raw) return null;
-      const proxied = proxyImage(raw);
-      writeCache(channelUrl, proxied);
-      return proxied;
-    } catch {
-      return null;
-    } finally {
-      pendingByChannel.delete(channelUrl);
-    }
-  })();
-
-  pendingByChannel.set(channelUrl, task);
-  return task;
-}
diff --git a/apps/web/src/lib/recommendation-tracker.ts b/apps/web/src/lib/recommendation-tracker.ts
deleted file mode 100644
index 076980f..0000000
--- a/apps/web/src/lib/recommendation-tracker.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { useAuthStore } from "../stores/auth-store";
-import { useRecommendationTrackingStore } from "../stores/recommendation-tracking-store";
-import type { VideoStream } from "../types/stream";
-import { refreshSession } from "./auth-session";
-import { API_BASE as BASE } from "./env";
-
-type RecommendationEventType = "impression" | "click" | "watch" | "favorite" | "watch_later_add";
-type RecommendationFeedbackType = "not_interested" | "less_from_channel";
-type RecommendationEventTypeAll = RecommendationEventType | "short_skip";
-type EventOptions = {
-  watchRatio?: number;
-  watchDurationMs?: number;
-  serviceId?: number;
-  intent?: "quick" | "auto" | "deep";
-};
-
-const sentEvents = new Set<string>();
-const sentFeedback = new Set<string>();
-const lastEventPayloads: Record<string, unknown>[] = [];
-const lastFeedbackPayloads: Record<string, unknown>[] = [];
-
-function keepRecent(
-  bucket: Record<string, unknown>[],
-  payload: Record<string, unknown>,
-  max: number,
-) {
-  bucket.push(payload);
-  if (bucket.length > max) bucket.splice(0, bucket.length - max);
-}
-
-function trackingEnabled(): boolean {
-  return useRecommendationTrackingStore.getState().enabled;
-}
-
-function post(path: string, payload: Record<string, unknown>) {
-  if (typeof window === "undefined") return;
-  if (!trackingEnabled()) return;
-  const send = async () => {
-    let token = useAuthStore.getState().token;
-    if (!token) {
-      try {
-        token = await refreshSession();
-      } catch {
-        return;
-      }
-    }
-    await fetch(`${BASE}${path}`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${token}`,
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(payload),
-      keepalive: true,
-    });
-  };
-  void send().catch(() => {
-    return;
-  });
-}
-
-function eventKey(type: RecommendationEventTypeAll, videoUrl: string): string {
-  return `${type}:${videoUrl}`;
-}
-
-export function trackRecommendationEvent(
-  type: RecommendationEventTypeAll,
-  stream: Pick<VideoStream, "id" | "channelUrl" | "title">,
-  opts?: EventOptions,
-) {
-  if (type !== "watch") {
-    const key = eventKey(type, stream.id);
-    if (sentEvents.has(key)) return;
-    sentEvents.add(key);
-  }
-
-  const payload = {
-    eventType: type,
-    videoUrl: stream.id,
-    uploaderUrl: stream.channelUrl ?? null,
-    title: stream.title,
-    watchRatio: opts?.watchRatio ?? null,
-    watchDurationMs: opts?.watchDurationMs ?? null,
-    serviceId: opts?.serviceId ?? null,
-    intent: opts?.intent ?? null,
-    occurredAt: Date.now(),
-  };
-  keepRecent(lastEventPayloads, payload, 10);
-  post("/recommendations/events", payload);
-}
-
-export function trackShortSkip(
-  stream: Pick<VideoStream, "id" | "channelUrl" | "title">,
-  watchDurationMs: number,
-  opts?: Pick<EventOptions, "serviceId" | "intent">,
-) {
-  trackRecommendationEvent("short_skip", stream, {
-    watchDurationMs,
-    serviceId: opts?.serviceId,
-    intent: opts?.intent,
-  });
-}
-
-export function sendRecommendationFeedback(
-  type: RecommendationFeedbackType,
-  stream: Pick<VideoStream, "id" | "channelUrl">,
-) {
-  const key = `${type}:${stream.id}:${stream.channelUrl ?? ""}`;
-  if (sentFeedback.has(key)) return;
-  sentFeedback.add(key);
-
-  const payload = {
-    feedbackType: type,
-    videoUrl: stream.id,
-    uploaderUrl: stream.channelUrl ?? null,
-  };
-  keepRecent(lastFeedbackPayloads, payload, 5);
-  post("/recommendations/feedback", payload);
-}
diff --git a/apps/web/src/lib/shorts-tracking.ts b/apps/web/src/lib/shorts-tracking.ts
deleted file mode 100644
index 6ec9417..0000000
--- a/apps/web/src/lib/shorts-tracking.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useRecommendationTrackingStore } from "../stores/recommendation-tracking-store";
-import type { VideoStream } from "../types/stream";
-import { trackRecommendationEvent, trackShortSkip } from "./recommendation-tracker";
-
-type ShortsIntent = "quick" | "auto" | "deep";
-
-type WatchStats = {
-  watchDurationMs: number;
-  watchRatio: number | undefined;
-};
-
-function getWatchStats(stream: VideoStream, enteredAtMs: number): WatchStats {
-  const watchDurationMs = Math.max(0, Date.now() - enteredAtMs);
-  const durationMs = stream.duration > 0 ? stream.duration * 1000 : 0;
-  const watchRatio = durationMs > 0 ? Math.min(1, watchDurationMs / durationMs) : undefined;
-  return { watchDurationMs, watchRatio };
-}
-
-export function trackShortsUserMove(
-  stream: VideoStream,
-  enteredAtMs: number,
-  serviceId: number,
-  intent: ShortsIntent,
-) {
-  if (!useRecommendationTrackingStore.getState().enabled) return;
-  const { watchDurationMs, watchRatio } = getWatchStats(stream, enteredAtMs);
-  if (watchRatio !== undefined && watchRatio >= 0.7) {
-    trackRecommendationEvent("watch", stream, {
-      watchRatio,
-      watchDurationMs,
-      serviceId,
-      intent,
-    });
-    return;
-  }
-  trackShortSkip(stream, watchDurationMs, { serviceId, intent });
-}
-
-export function trackShortsAutoAdvance(
-  stream: VideoStream,
-  enteredAtMs: number,
-  serviceId: number,
-  intent: ShortsIntent,
-) {
-  if (!useRecommendationTrackingStore.getState().enabled) return;
-  const { watchDurationMs, watchRatio } = getWatchStats(stream, enteredAtMs);
-  if (watchRatio === undefined || watchRatio < 0.85) return;
-  trackRecommendationEvent("watch", stream, {
-    watchRatio,
-    watchDurationMs,
-    serviceId,
-    intent,
-  });
-}
diff --git a/apps/web/src/routes/onboarding.tsx b/apps/web/src/routes/onboarding.tsx
deleted file mode 100644
index a4e9c16..0000000
--- a/apps/web/src/routes/onboarding.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-import { RecommendationSettingsShell } from "../components/recommendation-settings-shell";
-
-function OnboardingPage() {
-  return <RecommendationSettingsShell />;
-}
-
-export const Route = createFileRoute("/onboarding")({ component: OnboardingPage });
diff --git a/apps/web/src/routes/privacy.tsx b/apps/web/src/routes/privacy.tsx
index d901c56..f8d2a5c 100644
--- a/apps/web/src/routes/privacy.tsx
+++ b/apps/web/src/routes/privacy.tsx
@@ -1,83 +1,35 @@
 import { createFileRoute } from "@tanstack/react-router";
-import { useSettings } from "../hooks/use-settings";
 
 function PrivacyPage() {
-  const { settings, update } = useSettings();
-  const enabled = settings.recommendationPersonalizationEnabled;
-
   return (
     <div className="mx-auto flex max-w-3xl flex-col gap-6 pt-12">
       <div className="px-1">
-        <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">
-          Recommendation privacy
-        </p>
+        <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">Privacy</p>
         <h1 className="mt-2 font-mono text-2xl font-semibold tracking-tight text-fg">
-          Control personalization signals
+          Manage stored data
         </h1>
         <p className="mt-2 text-sm leading-relaxed text-fg-muted">
-          Control whether TypeType uses your recommendation interactions to personalize your Home
-          feed.
+          Clear stored watch history, search history, subscriptions, and playback progress from this
+          account.
         </p>
       </div>
 
       <div className="rounded-xl border border-border bg-surface/40 p-5">
-        <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">
-          Recommendation personalization
-        </p>
-        <p className="mt-3 text-sm text-fg-muted">Personalization: ON</p>
-        <p className="mt-1 text-sm text-fg-muted">
-          TypeType uses recommendation interactions (impressions, clicks, watches, short skips, and
-          recommendation feedback) to tune what appears in Home recommendations.
-        </p>
-        <p className="mt-3 text-sm text-fg-muted">Personalization: OFF</p>
-        <p className="mt-1 text-sm text-fg-muted">
-          TypeType stops using recommendation interactions for personalization.
-        </p>
-        <ul className="mt-2 list-disc space-y-1 pl-5 text-sm text-fg-muted">
-          <li>POST /recommendations/events becomes a no-op (id = "disabled").</li>
-          <li>Recommendation feedback is disabled.</li>
-          <li>Home recommendations still work, but in non-personalized mode.</li>
-        </ul>
-        <div className="mt-5 inline-flex items-center gap-2">
-          <span className="text-xs text-fg-soft">Disabled</span>
-          <button
-            type="button"
-            role="switch"
-            aria-checked={enabled}
-            onClick={() => update.mutate({ recommendationPersonalizationEnabled: !enabled })}
-            className={`relative inline-flex h-7 w-14 items-center rounded-full border transition-colors ${
-              enabled ? "border-border bg-fg" : "border-border-strong bg-surface-strong"
-            }`}
-          >
-            <span
-              className={`inline-block h-5 w-5 rounded-full transition-transform ${
-                enabled ? "translate-x-8 bg-surface" : "translate-x-1 bg-surface-soft"
-              }`}
-            />
-          </button>
-          <span className="text-xs text-fg-soft">Enabled</span>
-        </div>
-      </div>
-
-      <div className="rounded-xl border border-border bg-surface/40 p-5">
-        <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">What is tracked</p>
+        <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">Stored data</p>
         <ul className="mt-3 list-disc space-y-1 pl-5 text-sm text-fg-muted">
-          <li>Event type: impression, click, watch, short_skip.</li>
-          <li>Video metadata: videoUrl, uploaderUrl, title.</li>
-          <li>Optional watch details: watchRatio, watchDurationMs.</li>
-          <li>Server timestamp: occurredAt.</li>
-          <li>Recommendation context, for example intent or context key.</li>
+          <li>Watch history.</li>
+          <li>Search history.</li>
+          <li>Subscriptions.</li>
+          <li>Playback progress.</li>
         </ul>
       </div>
 
       <div className="rounded-xl border border-border bg-surface/40 p-5">
-        <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">What is sent</p>
+        <p className="font-mono text-xs uppercase tracking-[0.2em] text-fg-soft">Controls</p>
         <ul className="mt-3 list-disc space-y-1 pl-5 text-sm text-fg-muted">
-          <li>eventType</li>
-          <li>videoUrl, uploaderUrl, title</li>
-          <li>Optional: watchRatio, watchDurationMs</li>
-          <li>Optional context hints: serviceId, intent, contextKey</li>
-          <li>Home uses intent and currently defaults to intent=auto.</li>
+          <li>Clear watch history in Settings.</li>
+          <li>Clear search history in Settings.</li>
+          <li>Unsubscribe from all channels in Settings.</li>
         </ul>
       </div>
     </div>
diff --git a/apps/web/src/routes/settings.tsx b/apps/web/src/routes/settings.tsx
index bff5dcc..454ea28 100644
--- a/apps/web/src/routes/settings.tsx
+++ b/apps/web/src/routes/settings.tsx
@@ -16,24 +16,6 @@ function SettingsPage() {
       <SettingsPlayback />
       {settings.defaultService === 0 && <SettingsLanguage />}
       <SettingsService />
-      <section className="flex flex-col gap-3">
-        <p className="text-xs font-medium text-fg-soft uppercase tracking-wider px-1">
-          Recommendations
-        </p>
-        <div className="bg-surface rounded-xl border border-border px-4 py-4 flex flex-col items-start gap-3 sm:flex-row sm:items-center sm:justify-between">
-          <div className="flex flex-col gap-1">
-            <span className="text-sm text-fg">Tune recommendation profile</span>
-            <span className="text-xs text-fg-soft">Adjust interests and favorite channels.</span>
-          </div>
-          <button
-            type="button"
-            onClick={() => goto("/settings/recommendations")}
-            className="h-9 w-full rounded-md bg-surface px-2.5 text-xs text-fg-muted transition-colors hover:text-fg sm:h-8 sm:w-auto"
-          >
-            Open
-          </button>
-        </div>
-      </section>
       <section className="flex flex-col gap-3">
         <p className="text-xs font-medium text-fg-soft uppercase tracking-wider px-1">Migration</p>
         <div className="bg-surface rounded-xl border border-border px-4 py-4 flex flex-col items-start gap-3 sm:flex-row sm:items-center sm:justify-between">
diff --git a/apps/web/src/routes/settings/recommendations.tsx b/apps/web/src/routes/settings/recommendations.tsx
deleted file mode 100644
index 46336f7..0000000
--- a/apps/web/src/routes/settings/recommendations.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-import { RecommendationSettingsShell } from "../../components/recommendation-settings-shell";
-
-function RecommendationsSettingsPage() {
-  return <RecommendationSettingsShell mode="settings" />;
-}
-
-export const Route = createFileRoute("/settings/recommendations")({
-  component: RecommendationsSettingsPage,
-});
diff --git a/apps/web/src/stores/recommendation-tracking-store.ts b/apps/web/src/stores/recommendation-tracking-store.ts
deleted file mode 100644
index 052f24c..0000000
--- a/apps/web/src/stores/recommendation-tracking-store.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { create } from "zustand";
-import { persist } from "zustand/middleware";
-
-type State = {
-  enabled: boolean;
-  setEnabled: (enabled: boolean) => void;
-};
-
-export const useRecommendationTrackingStore = create<State>()(
-  persist(
-    (set) => ({
-      enabled: true,
-      setEnabled: (enabled) => set({ enabled }),
-    }),
-    { name: "recommendation-tracking" },
-  ),
-);
diff --git a/apps/web/src/stores/shorts-feedback-store.ts b/apps/web/src/stores/shorts-feedback-store.ts
deleted file mode 100644
index 3448486..0000000
--- a/apps/web/src/stores/shorts-feedback-store.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { create } from "zustand";
-
-type ShortsFeedbackState = {
-  hiddenVideoIds: string[];
-  hiddenChannelUrls: string[];
-  hideVideo: (videoUrl: string) => void;
-  hideChannel: (channelUrl: string) => void;
-  reset: () => void;
-};
-
-export const useShortsFeedbackStore = create<ShortsFeedbackState>((set) => ({
-  hiddenVideoIds: [],
-  hiddenChannelUrls: [],
-  hideVideo: (videoUrl) =>
-    set((state) => {
-      if (state.hiddenVideoIds.includes(videoUrl)) return state;
-      return { hiddenVideoIds: [...state.hiddenVideoIds, videoUrl] };
-    }),
-  hideChannel: (channelUrl) =>
-    set((state) => {
-      if (state.hiddenChannelUrls.includes(channelUrl)) return state;
-      return { hiddenChannelUrls: [...state.hiddenChannelUrls, channelUrl] };
-    }),
-  reset: () => set({ hiddenVideoIds: [], hiddenChannelUrls: [] }),
-}));
diff --git a/apps/web/src/types/api.ts b/apps/web/src/types/api.ts
index a2afd61..88d9fa2 100644
--- a/apps/web/src/types/api.ts
+++ b/apps/web/src/types/api.ts
@@ -87,24 +87,6 @@ export type HomeRecommendationsResponse = {
   hasMore: boolean;
 };
 
-type RecommendationOnboardingTopicGroup = {
-  id: string;
-  label: string;
-  topics: string[];
-};
-
-export type RecommendationOnboardingTopicsResponse = {
-  minTopics: number;
-  groups: RecommendationOnboardingTopicGroup[];
-};
-
-export type RecommendationOnboardingStateResponse = {
-  requiresOnboarding: boolean;
-  completedAt: number | null;
-  selectedTopics: string[];
-  selectedChannels: string[];
-};
-
 export type SubscriptionFeedPage = {
   videos: VideoItem[];
   nextpage: string | null;
diff --git a/apps/web/src/types/user.ts b/apps/web/src/types/user.ts
index 441deb2..d24d3bd 100644
--- a/apps/web/src/types/user.ts
+++ b/apps/web/src/types/user.ts
@@ -53,7 +53,6 @@ export type SettingsItem = {
   defaultSubtitleLanguage: string;
   defaultAudioLanguage: string;
   preferOriginalLanguage: boolean;
-  recommendationPersonalizationEnabled: boolean;
 };
 
 export type SearchHistoryItem = {

From 4bfa9a426be4b96cf8a23603a70f358b74648398 Mon Sep 17 00:00:00 2001
From: Priveetee <brahim.benyoucefpro@proton.me>
Date: Wed, 6 May 2026 20:12:50 +0200
Subject: [PATCH 6/6] chore: update generated route tree

---
 apps/web/src/routeTree.gen.ts | 62 +++--------------------------------
 1 file changed, 5 insertions(+), 57 deletions(-)

diff --git a/apps/web/src/routeTree.gen.ts b/apps/web/src/routeTree.gen.ts
index ac0f2cf..d3008bd 100644
--- a/apps/web/src/routeTree.gen.ts
+++ b/apps/web/src/routeTree.gen.ts
@@ -19,7 +19,6 @@ import { Route as RegisterRouteImport } from './routes/register'
 import { Route as ProfileRouteImport } from './routes/profile'
 import { Route as PrivacyRouteImport } from './routes/privacy'
 import { Route as PlaylistsRouteImport } from './routes/playlists'
-import { Route as OnboardingRouteImport } from './routes/onboarding'
 import { Route as LoginRouteImport } from './routes/login'
 import { Route as ImportRouteImport } from './routes/import'
 import { Route as HistoryRouteImport } from './routes/history'
@@ -27,7 +26,6 @@ import { Route as ChannelRouteImport } from './routes/channel'
 import { Route as AdminConsoleRouteImport } from './routes/admin-console'
 import { Route as IndexRouteImport } from './routes/index'
 import { Route as ImportIndexRouteImport } from './routes/import/index'
-import { Route as SettingsRecommendationsRouteImport } from './routes/settings/recommendations'
 import { Route as PlaylistsIdRouteImport } from './routes/playlists_.$id'
 import { Route as ImportYoutubeRouteImport } from './routes/import/youtube'
 import { Route as ImportPipepipeRouteImport } from './routes/import/pipepipe'
@@ -82,11 +80,6 @@ const PlaylistsRoute = PlaylistsRouteImport.update({
   path: '/playlists',
   getParentRoute: () => rootRouteImport,
 } as any)
-const OnboardingRoute = OnboardingRouteImport.update({
-  id: '/onboarding',
-  path: '/onboarding',
-  getParentRoute: () => rootRouteImport,
-} as any)
 const LoginRoute = LoginRouteImport.update({
   id: '/login',
   path: '/login',
@@ -122,11 +115,6 @@ const ImportIndexRoute = ImportIndexRouteImport.update({
   path: '/',
   getParentRoute: () => ImportRoute,
 } as any)
-const SettingsRecommendationsRoute = SettingsRecommendationsRouteImport.update({
-  id: '/recommendations',
-  path: '/recommendations',
-  getParentRoute: () => SettingsRoute,
-} as any)
 const PlaylistsIdRoute = PlaylistsIdRouteImport.update({
   id: '/playlists_/$id',
   path: '/playlists/$id',
@@ -150,21 +138,19 @@ export interface FileRoutesByFullPath {
   '/history': typeof HistoryRoute
   '/import': typeof ImportRouteWithChildren
   '/login': typeof LoginRoute
-  '/onboarding': typeof OnboardingRoute
   '/playlists': typeof PlaylistsRoute
   '/privacy': typeof PrivacyRoute
   '/profile': typeof ProfileRoute
   '/register': typeof RegisterRoute
   '/reset-password': typeof ResetPasswordRoute
   '/search': typeof SearchRoute
-  '/settings': typeof SettingsRouteWithChildren
+  '/settings': typeof SettingsRoute
   '/shorts': typeof ShortsRoute
   '/subscriptions': typeof SubscriptionsRoute
   '/watch': typeof WatchRoute
   '/import/pipepipe': typeof ImportPipepipeRoute
   '/import/youtube': typeof ImportYoutubeRoute
   '/playlists/$id': typeof PlaylistsIdRoute
-  '/settings/recommendations': typeof SettingsRecommendationsRoute
   '/import/': typeof ImportIndexRoute
 }
 export interface FileRoutesByTo {
@@ -173,21 +159,19 @@ export interface FileRoutesByTo {
   '/channel': typeof ChannelRoute
   '/history': typeof HistoryRoute
   '/login': typeof LoginRoute
-  '/onboarding': typeof OnboardingRoute
   '/playlists': typeof PlaylistsRoute
   '/privacy': typeof PrivacyRoute
   '/profile': typeof ProfileRoute
   '/register': typeof RegisterRoute
   '/reset-password': typeof ResetPasswordRoute
   '/search': typeof SearchRoute
-  '/settings': typeof SettingsRouteWithChildren
+  '/settings': typeof SettingsRoute
   '/shorts': typeof ShortsRoute
   '/subscriptions': typeof SubscriptionsRoute
   '/watch': typeof WatchRoute
   '/import/pipepipe': typeof ImportPipepipeRoute
   '/import/youtube': typeof ImportYoutubeRoute
   '/playlists/$id': typeof PlaylistsIdRoute
-  '/settings/recommendations': typeof SettingsRecommendationsRoute
   '/import': typeof ImportIndexRoute
 }
 export interface FileRoutesById {
@@ -198,21 +182,19 @@ export interface FileRoutesById {
   '/history': typeof HistoryRoute
   '/import': typeof ImportRouteWithChildren
   '/login': typeof LoginRoute
-  '/onboarding': typeof OnboardingRoute
   '/playlists': typeof PlaylistsRoute
   '/privacy': typeof PrivacyRoute
   '/profile': typeof ProfileRoute
   '/register': typeof RegisterRoute
   '/reset-password': typeof ResetPasswordRoute
   '/search': typeof SearchRoute
-  '/settings': typeof SettingsRouteWithChildren
+  '/settings': typeof SettingsRoute
   '/shorts': typeof ShortsRoute
   '/subscriptions': typeof SubscriptionsRoute
   '/watch': typeof WatchRoute
   '/import/pipepipe': typeof ImportPipepipeRoute
   '/import/youtube': typeof ImportYoutubeRoute
   '/playlists_/$id': typeof PlaylistsIdRoute
-  '/settings/recommendations': typeof SettingsRecommendationsRoute
   '/import/': typeof ImportIndexRoute
 }
 export interface FileRouteTypes {
@@ -224,7 +206,6 @@ export interface FileRouteTypes {
     | '/history'
     | '/import'
     | '/login'
-    | '/onboarding'
     | '/playlists'
     | '/privacy'
     | '/profile'
@@ -238,7 +219,6 @@ export interface FileRouteTypes {
     | '/import/pipepipe'
     | '/import/youtube'
     | '/playlists/$id'
-    | '/settings/recommendations'
     | '/import/'
   fileRoutesByTo: FileRoutesByTo
   to:
@@ -247,7 +227,6 @@ export interface FileRouteTypes {
     | '/channel'
     | '/history'
     | '/login'
-    | '/onboarding'
     | '/playlists'
     | '/privacy'
     | '/profile'
@@ -261,7 +240,6 @@ export interface FileRouteTypes {
     | '/import/pipepipe'
     | '/import/youtube'
     | '/playlists/$id'
-    | '/settings/recommendations'
     | '/import'
   id:
     | '__root__'
@@ -271,7 +249,6 @@ export interface FileRouteTypes {
     | '/history'
     | '/import'
     | '/login'
-    | '/onboarding'
     | '/playlists'
     | '/privacy'
     | '/profile'
@@ -285,7 +262,6 @@ export interface FileRouteTypes {
     | '/import/pipepipe'
     | '/import/youtube'
     | '/playlists_/$id'
-    | '/settings/recommendations'
     | '/import/'
   fileRoutesById: FileRoutesById
 }
@@ -296,14 +272,13 @@ export interface RootRouteChildren {
   HistoryRoute: typeof HistoryRoute
   ImportRoute: typeof ImportRouteWithChildren
   LoginRoute: typeof LoginRoute
-  OnboardingRoute: typeof OnboardingRoute
   PlaylistsRoute: typeof PlaylistsRoute
   PrivacyRoute: typeof PrivacyRoute
   ProfileRoute: typeof ProfileRoute
   RegisterRoute: typeof RegisterRoute
   ResetPasswordRoute: typeof ResetPasswordRoute
   SearchRoute: typeof SearchRoute
-  SettingsRoute: typeof SettingsRouteWithChildren
+  SettingsRoute: typeof SettingsRoute
   ShortsRoute: typeof ShortsRoute
   SubscriptionsRoute: typeof SubscriptionsRoute
   WatchRoute: typeof WatchRoute
@@ -382,13 +357,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof PlaylistsRouteImport
       parentRoute: typeof rootRouteImport
     }
-    '/onboarding': {
-      id: '/onboarding'
-      path: '/onboarding'
-      fullPath: '/onboarding'
-      preLoaderRoute: typeof OnboardingRouteImport
-      parentRoute: typeof rootRouteImport
-    }
     '/login': {
       id: '/login'
       path: '/login'
@@ -438,13 +406,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ImportIndexRouteImport
       parentRoute: typeof ImportRoute
     }
-    '/settings/recommendations': {
-      id: '/settings/recommendations'
-      path: '/recommendations'
-      fullPath: '/settings/recommendations'
-      preLoaderRoute: typeof SettingsRecommendationsRouteImport
-      parentRoute: typeof SettingsRoute
-    }
     '/playlists_/$id': {
       id: '/playlists_/$id'
       path: '/playlists/$id'
@@ -484,18 +445,6 @@ const ImportRouteChildren: ImportRouteChildren = {
 const ImportRouteWithChildren =
   ImportRoute._addFileChildren(ImportRouteChildren)
 
-interface SettingsRouteChildren {
-  SettingsRecommendationsRoute: typeof SettingsRecommendationsRoute
-}
-
-const SettingsRouteChildren: SettingsRouteChildren = {
-  SettingsRecommendationsRoute: SettingsRecommendationsRoute,
-}
-
-const SettingsRouteWithChildren = SettingsRoute._addFileChildren(
-  SettingsRouteChildren,
-)
-
 const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
   AdminConsoleRoute: AdminConsoleRoute,
@@ -503,14 +452,13 @@ const rootRouteChildren: RootRouteChildren = {
   HistoryRoute: HistoryRoute,
   ImportRoute: ImportRouteWithChildren,
   LoginRoute: LoginRoute,
-  OnboardingRoute: OnboardingRoute,
   PlaylistsRoute: PlaylistsRoute,
   PrivacyRoute: PrivacyRoute,
   ProfileRoute: ProfileRoute,
   RegisterRoute: RegisterRoute,
   ResetPasswordRoute: ResetPasswordRoute,
   SearchRoute: SearchRoute,
-  SettingsRoute: SettingsRouteWithChildren,
+  SettingsRoute: SettingsRoute,
   ShortsRoute: ShortsRoute,
   SubscriptionsRoute: SubscriptionsRoute,
   WatchRoute: WatchRoute,