pump ver

Cargo.lock

@@ -1418,7 +1418,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "furumusic"
-version = "0.2.9"
+version = "0.2.14"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1441,6 +1441,7 @@ dependencies = [
  "symphonia",
  "tokio",
  "tokio-cron-scheduler",
+ "tower",
  "tracing",
  "tracing-subscriber",
  "uuid",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "furumusic"
-version = "0.2.9"
+version = "0.2.15"
 edition = "2024"
 description = "Reusable web-app boilerplate: auth, OIDC/SSO, admin panel, user management, i18n, PostgreSQL"
 
@@ -11,6 +11,7 @@ serde = { version = "1", features = ["derive"] }
 openidconnect = "4.0"
 reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] }
 tokio = { version = "1", features = ["sync", "fs", "io-util"] }
+tower = "0.5"
 base64 = "0.22"
 serde_json = "1"
 tracing = "0.1"

src/admin/mod.rs

@@ -227,6 +227,55 @@ impl App for AdminApp {
                 },
                 "admin_v2_reviews_bulk",
             ),
+            Route::with_handler_and_name(
+                "/v2/api/users",
+                {
+                    let pool = Arc::clone(&pool);
+                    let pool_config = Arc::clone(&pool_config);
+                    get(move |session: Session, db: Database,
+                              query: UrlQuery<v2::UsersQuery>| {
+                        let pool = Arc::clone(&pool);
+                        let pool_config = Arc::clone(&pool_config);
+                        async move {
+                            let pg_pool = pool
+                                .get_or_init(|| async {
+                                    sqlx::postgres::PgPoolOptions::new()
+                                        .max_connections(5)
+                                        .connect(&pool_config.database_url)
+                                        .await
+                                        .expect("admin pool")
+                                })
+                                .await;
+                            v2::users(session, db, pg_pool, query.0).await
+                        }
+                    })
+                },
+                "admin_v2_users",
+            ),
+            Route::with_handler_and_name(
+                "/v2/api/users/{id}",
+                {
+                    let pool = Arc::clone(&pool);
+                    let pool_config = Arc::clone(&pool_config);
+                    get(move |session: Session, db: Database, path: Path<PathId>| {
+                        let pool = Arc::clone(&pool);
+                        let pool_config = Arc::clone(&pool_config);
+                        async move {
+                            let pg_pool = pool
+                                .get_or_init(|| async {
+                                    sqlx::postgres::PgPoolOptions::new()
+                                        .max_connections(5)
+                                        .connect(&pool_config.database_url)
+                                        .await
+                                        .expect("admin pool")
+                                })
+                                .await;
+                            v2::user_detail(session, db, pg_pool, path.0.id).await
+                        }
+                    })
+                },
+                "admin_v2_user_detail",
+            ),
             Route::with_handler_and_name(
                 "/v2/api/reviews/{id}/approve",
                 {
@@ -282,6 +331,32 @@ impl App for AdminApp {
                 },
                 "admin_v2_jobs",
             ),
+            Route::with_handler_and_name(
+                "/v2/api/jobs/metadata_backfill/run-options",
+                cot::router::method::post({
+                    let pool = Arc::clone(&pool);
+                    let pool_config = Arc::clone(&pool_config);
+                    move |session: Session,
+                          db: Database,
+                          json: Json<v2::MetadataBackfillRunRequest>| {
+                        let pool = Arc::clone(&pool);
+                        let pool_config = Arc::clone(&pool_config);
+                        async move {
+                            let pg_pool = pool
+                                .get_or_init(|| async {
+                                    sqlx::postgres::PgPoolOptions::new()
+                                        .max_connections(5)
+                                        .connect(&pool_config.database_url)
+                                        .await
+                                        .expect("admin pool")
+                                })
+                                .await;
+                            v2::run_metadata_backfill(session, db, pg_pool, json).await
+                        }
+                    }
+                }),
+                "admin_v2_metadata_backfill_run_options",
+            ),
             Route::with_handler_and_name(
                 "/v2/api/jobs/{name}/run",
                 cot::router::method::post({

src/admin/v2.rs

@@ -1,4 +1,5 @@
 use std::collections::{HashMap, HashSet};
+use std::path::Path;
 
 use cot::db::{Database, Model};
 use cot::html::Html;
@@ -17,7 +18,7 @@ use crate::agent;
 use crate::auth::{self, AuthenticatedUser, Role};
 use crate::config::{AppConfig, ConfigEntry, ConfigSources};
 use crate::i18n::{I18n, Translations};
-use crate::scheduler::{JobRegistry, ScheduledJob};
+use crate::scheduler::{self, JobRegistry, JobRun, ScheduledJob};
 
 #[derive(Debug, Template)]
 #[template(path = "admin/v2.html")]
@@ -44,6 +45,13 @@ pub(super) struct LibraryQuery {
     pub(super) offset: Option<i64>,
 }
 
+#[derive(Debug, Deserialize)]
+pub(super) struct UsersQuery {
+    pub(super) search: Option<String>,
+    pub(super) limit: Option<i64>,
+    pub(super) offset: Option<i64>,
+}
+
 #[derive(Debug, Deserialize)]
 pub(super) struct BulkReviewsRequest {
     action: String,
@@ -61,6 +69,24 @@ pub(super) struct BulkLibraryRequest {
     filter: Option<LibraryFilter>,
 }
 
+#[derive(Debug, Deserialize)]
+pub struct MetadataBackfillRunRequest {
+    #[serde(default = "default_true")]
+    audio_bitrate: bool,
+    #[serde(default = "default_true")]
+    audio_sample_rate: bool,
+    #[serde(default = "default_true")]
+    audio_bit_depth: bool,
+    #[serde(default = "default_true")]
+    duration_seconds: bool,
+    #[serde(default = "default_true")]
+    local_genres: bool,
+    #[serde(default = "default_true")]
+    lastfm_tags: bool,
+    #[serde(default)]
+    overwrite: bool,
+}
+
 #[derive(Debug, Deserialize)]
 pub(super) struct UpdateLibraryItemRequest {
     kind: String,
@@ -132,12 +158,75 @@ struct AdminDashboardDto {
     user: AdminUserDto,
     build: BuildDto,
     stats: OverviewStatsDto,
+    runtime: RuntimeOverviewDto,
     reviews: ReviewPageDto,
     jobs: Vec<JobDto>,
     recent_runs: Vec<JobRunDto>,
     library: LibraryOverviewDto,
 }
 
+#[derive(Debug, Serialize, JsonSchema)]
+struct AdminUsersPageDto {
+    items: Vec<AdminUserRowDto>,
+    total: i64,
+    limit: i64,
+    offset: i64,
+    search: Option<String>,
+    online_count: i64,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+struct AdminUserRowDto {
+    id: i64,
+    username: String,
+    display_name: Option<String>,
+    email: Option<String>,
+    role: String,
+    is_active: bool,
+    is_online: bool,
+    last_seen_ms: Option<i64>,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+struct AdminUserDetailDto {
+    user: AdminUserRowDto,
+    stats: AdminUserStatsDto,
+    recent_plays: Vec<AdminUserPlayDto>,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+struct AdminUserStatsDto {
+    plays: i64,
+    completed_plays: i64,
+    listened_seconds: i64,
+    liked_tracks: i64,
+    followed_artists: i64,
+    own_playlists: i64,
+    saved_playlists: i64,
+    uploaded_tracks: i64,
+    torrent_sessions: i64,
+    lastfm_connected: bool,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+struct AdminUserPlayDto {
+    history_id: i64,
+    played_at: String,
+    duration_listened: Option<i32>,
+    completed: bool,
+    track_id: i64,
+    title: String,
+    artists: String,
+    release_id: i64,
+    release_title: String,
+    release_year: Option<i32>,
+    cover_url: Option<String>,
+    track_duration_seconds: f64,
+    uploader_name: String,
+    audio_format: Option<String>,
+    audio_bitrate: Option<i32>,
+}
+
 #[derive(Debug, Serialize, JsonSchema)]
 struct OverviewStatsDto {
     tracks: i64,
@@ -149,6 +238,40 @@ struct OverviewStatsDto {
     hidden_artists: i64,
 }
 
+#[derive(Debug, Serialize, JsonSchema)]
+struct RuntimeOverviewDto {
+    agent: AgentStatusDto,
+    storage: Vec<StoragePathDto>,
+    node: NodeStatsDto,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+struct AgentStatusDto {
+    status: String,
+    enabled: bool,
+    llm_configured: bool,
+    model: String,
+    concurrency: u64,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+struct StoragePathDto {
+    label: String,
+    path: String,
+    exists: bool,
+    free_bytes: Option<u64>,
+    total_bytes: Option<u64>,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+struct NodeStatsDto {
+    hostname: String,
+    os: &'static str,
+    arch: &'static str,
+    pid: u32,
+    cpu_count: usize,
+}
+
 #[derive(Debug, Serialize, JsonSchema)]
 struct StatusCountDto {
     status: String,
@@ -161,6 +284,14 @@ struct TagDto {
     kind: String,
 }
 
+#[derive(Debug, Serialize, JsonSchema)]
+struct MetadataTagDto {
+    name: String,
+    source: String,
+    weight: f64,
+    updated_at: String,
+}
+
 #[derive(Debug, Serialize, JsonSchema)]
 struct ReviewPageDto {
     items: Vec<ReviewDto>,
@@ -399,6 +530,7 @@ struct LibraryItemDetailDto {
     artists: Vec<ArtistOptionDto>,
     releases: Vec<ReleaseOptionDto>,
     available_covers: Vec<AvailableCoverDto>,
+    metadata_tags: Vec<MetadataTagDto>,
 }
 
 #[derive(Debug, Serialize, JsonSchema)]
@@ -538,6 +670,8 @@ pub async fn dashboard(
         limit: Some(80),
         offset: Some(0),
     };
+    let (config, _) = AppConfig::load_with_db(&db).await;
+    let runtime = load_runtime_overview(&config);
     let (reviews, stats, jobs, recent_runs, library) = tokio::try_join!(
         load_review_page(pool, reviews_query),
         load_overview_stats(pool),
@@ -555,6 +689,7 @@ pub async fn dashboard(
         },
         build: build_dto(),
         stats,
+        runtime,
         reviews,
         jobs,
         recent_runs,
@@ -579,6 +714,41 @@ pub async fn reviews(
     Json(page).into_response()
 }
 
+pub async fn users(
+    session: Session,
+    db: Database,
+    pool: &PgPool,
+    query: UsersQuery,
+) -> cot::Result<cot::response::Response> {
+    if let Err(response) = require_admin_json(&session, &db).await {
+        return Ok(response);
+    }
+
+    let page = load_admin_users_page(pool, query)
+        .await
+        .map_err(|e| cot::Error::internal(e.to_string()))?;
+    Json(page).into_response()
+}
+
+pub async fn user_detail(
+    session: Session,
+    db: Database,
+    pool: &PgPool,
+    user_id: i64,
+) -> cot::Result<cot::response::Response> {
+    if let Err(response) = require_admin_json(&session, &db).await {
+        return Ok(response);
+    }
+
+    let detail = load_admin_user_detail(pool, user_id)
+        .await
+        .map_err(|e| cot::Error::internal(e.to_string()))?;
+    match detail {
+        Some(detail) => Json(detail).into_response(),
+        None => Ok(json_error(StatusCode::NOT_FOUND, "user not found")),
+    }
+}
+
 pub async fn bulk_reviews(
     session: Session,
     db: Database,
@@ -889,6 +1059,70 @@ pub async fn run_job(
     }
 }
 
+pub async fn run_metadata_backfill(
+    session: Session,
+    db: Database,
+    pool: &PgPool,
+    Json(body): Json<MetadataBackfillRunRequest>,
+) -> cot::Result<cot::response::Response> {
+    if let Err(response) = require_admin_json(&session, &db).await {
+        return Ok(response);
+    }
+
+    let options = crate::jobs::metadata_backfill::MetadataBackfillOptions {
+        audio_bitrate: body.audio_bitrate,
+        audio_sample_rate: body.audio_sample_rate,
+        audio_bit_depth: body.audio_bit_depth,
+        duration_seconds: body.duration_seconds,
+        local_genres: body.local_genres,
+        lastfm_tags: body.lastfm_tags,
+        overwrite: body.overwrite,
+    };
+    if !options.any_field() {
+        return Ok(json_error(
+            StatusCode::BAD_REQUEST,
+            "select at least one metadata field",
+        ));
+    }
+
+    let mut run = JobRun::create_running(&db, "metadata_backfill", "manual")
+        .await
+        .map_err(|e| cot::Error::internal(format!("failed to create job run: {e}")))?;
+    let run_id = run.id_val();
+    let (live_config, _) = AppConfig::load_with_db(&db).await;
+    let db_for_task = db.clone();
+    let pool_for_task = pool.clone();
+
+    tokio::spawn(async move {
+        let start = std::time::Instant::now();
+        let ctx = scheduler::JobContext {
+            config: std::sync::Arc::new(live_config),
+            db: db_for_task.clone(),
+            pool: pool_for_task.clone(),
+            run_id,
+            registry: std::sync::Arc::new(JobRegistry::new()),
+        };
+        let mut log = scheduler::JobLog::with_live_flush(pool_for_task.clone(), run_id);
+        let result =
+            crate::jobs::metadata_backfill::run_with_options(&ctx, &mut log, options).await;
+        let duration_ms = start.elapsed().as_millis() as i64;
+        match result {
+            Ok(()) => {
+                let _ = run
+                    .set_completed(&db_for_task, duration_ms, &log.output())
+                    .await;
+            }
+            Err(err) => {
+                let _ = run
+                    .set_failed(&db_for_task, duration_ms, &log.output(), &err.to_string())
+                    .await;
+            }
+        }
+    });
+
+    Json(JobRunStartedDto { ok: true, run_id }).into_response()
+}
+
 pub async fn toggle_job(
     session: Session,
     db: Database,
@@ -1144,11 +1378,13 @@ pub async fn update_library_item(
                     .map_err(|e| cot::Error::internal(e.to_string()))?;
                 }
             } else {
-                sqlx::query("DELETE FROM furumusic__track_artist WHERE track_id = $1 AND role = 'main'")
+                sqlx::query(
-                    .bind(body.id)
+                    "DELETE FROM furumusic__track_artist WHERE track_id = $1 AND role = 'main'",
-                    .execute(pool)
+                )
-                    .await
+                .bind(body.id)
-                    .map_err(|e| cot::Error::internal(e.to_string()))?;
+                .execute(pool)
+                .await
+                .map_err(|e| cot::Error::internal(e.to_string()))?;
                 for (position, artist_id) in artist_ids.iter().enumerate() {
                     sqlx::query(
                         "INSERT INTO furumusic__track_artist (track_id, artist_id, role, position) VALUES ($1, $2, 'main', $3)",
@@ -1422,6 +1658,439 @@ async fn load_overview_stats(pool: &PgPool) -> anyhow::Result<OverviewStatsDto>
     })
 }
 
+#[derive(Debug, sqlx::FromRow)]
+struct AdminUserSqlRow {
+    id: i64,
+    username: String,
+    display_name: Option<String>,
+    email: Option<String>,
+    role: String,
+    is_active: bool,
+}
+
+async fn load_admin_users_page(
+    pool: &PgPool,
+    query: UsersQuery,
+) -> anyhow::Result<AdminUsersPageDto> {
+    let limit = query.limit.unwrap_or(40).clamp(10, 200);
+    let offset = query.offset.unwrap_or(0).max(0);
+    let search = query
+        .search
+        .as_deref()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .map(str::to_owned);
+    let pattern = search.as_ref().map(|value| format!("%{value}%"));
+
+    let mut count_qb =
+        QueryBuilder::<Postgres>::new("SELECT COUNT(*) FROM furumusic__user WHERE 1=1");
+    if let Some(pattern) = pattern.as_ref() {
+        count_qb.push(" AND (username ILIKE ");
+        count_qb.push_bind(pattern);
+        count_qb.push(" OR COALESCE(display_name, '') ILIKE ");
+        count_qb.push_bind(pattern);
+        count_qb.push(" OR COALESCE(email, '') ILIKE ");
+        count_qb.push_bind(pattern);
+        count_qb.push(")");
+    }
+    let total: i64 = count_qb.build_query_scalar().fetch_one(pool).await?;
+
+    let mut qb = QueryBuilder::<Postgres>::new(
+        "SELECT id, username::text, display_name, email, role::text, is_active FROM furumusic__user WHERE 1=1",
+    );
+    if let Some(pattern) = pattern.as_ref() {
+        qb.push(" AND (username ILIKE ");
+        qb.push_bind(pattern);
+        qb.push(" OR COALESCE(display_name, '') ILIKE ");
+        qb.push_bind(pattern);
+        qb.push(" OR COALESCE(email, '') ILIKE ");
+        qb.push_bind(pattern);
+        qb.push(")");
+    }
+    qb.push(" ORDER BY username ASC LIMIT ");
+    qb.push_bind(limit);
+    qb.push(" OFFSET ");
+    qb.push_bind(offset);
+    let rows: Vec<AdminUserSqlRow> = qb.build_query_as().fetch_all(pool).await?;
+
+    let active = crate::metrics::active_user_last_seen_ms();
+    let online_cutoff_ms = 60_000;
+    let items = rows
+        .into_iter()
+        .map(|row| admin_user_row(row, &active, online_cutoff_ms))
+        .collect::<Vec<_>>();
+    let online_count = active
+        .values()
+        .filter(|last_seen_ms| **last_seen_ms <= online_cutoff_ms)
+        .count() as i64;
+
+    Ok(AdminUsersPageDto {
+        items,
+        total,
+        limit,
+        offset,
+        search,
+        online_count,
+    })
+}
+
+async fn load_admin_user_detail(
+    pool: &PgPool,
+    user_id: i64,
+) -> anyhow::Result<Option<AdminUserDetailDto>> {
+    let row = sqlx::query_as::<_, AdminUserSqlRow>(
+        "SELECT id, username::text, display_name, email, role::text, is_active FROM furumusic__user WHERE id = $1",
+    )
+    .bind(user_id)
+    .fetch_optional(pool)
+    .await?;
+    let Some(row) = row else {
+        return Ok(None);
+    };
+
+    let active = crate::metrics::active_user_last_seen_ms();
+    let user = admin_user_row(row, &active, 60_000);
+    let (
+        plays,
+        completed_plays,
+        listened_seconds,
+        liked_tracks,
+        followed_artists,
+        own_playlists,
+        saved_playlists,
+        uploaded_tracks,
+        torrent_sessions,
+        lastfm_connected,
+    ) = tokio::try_join!(
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM furumusic__play_history WHERE user_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM furumusic__play_history WHERE user_id = $1 AND completed"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COALESCE(SUM(duration_listened), 0)::bigint FROM furumusic__play_history WHERE user_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM furumusic__user_liked_track WHERE user_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM furumusic__user_followed_artist WHERE user_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM furumusic__playlist WHERE owner_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM furumusic__saved_playlist WHERE user_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(DISTINCT t.id) FROM furumusic__track t JOIN furumusic__media_file mf ON mf.id = t.audio_file_id WHERE mf.uploaded_by_user_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM furumusic__torrent_session WHERE user_id = $1"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+        sqlx::query_scalar::<_, bool>(
+            "SELECT EXISTS(SELECT 1 FROM furumusic__lastfm_account WHERE user_id = $1 AND session_key <> '')"
+        )
+        .bind(user_id)
+        .fetch_one(pool),
+    )?;
+    let recent_plays = load_admin_user_recent_plays(pool, user_id, 30).await?;
+
+    Ok(Some(AdminUserDetailDto {
+        user,
+        stats: AdminUserStatsDto {
+            plays,
+            completed_plays,
+            listened_seconds,
+            liked_tracks,
+            followed_artists,
+            own_playlists,
+            saved_playlists,
+            uploaded_tracks,
+            torrent_sessions,
+            lastfm_connected,
+        },
+        recent_plays,
+    }))
+}
+
+async fn load_admin_user_recent_plays(
+    pool: &PgPool,
+    user_id: i64,
+    limit: i64,
+) -> anyhow::Result<Vec<AdminUserPlayDto>> {
+    let rows = sqlx::query_as::<_, AdminUserPlaySqlRow>(
+        r#"SELECT ph.id AS history_id,
+                  ph.played_at::text AS played_at,
+                  ph.duration_listened,
+                  ph.completed,
+                  t.id AS track_id,
+                  t.title::text AS title,
+                  COALESCE(NULLIF(STRING_AGG(a.name::text, ', ' ORDER BY ta.position), ''), 'Unknown artist') AS artists,
+                  t.release_id,
+                  COALESCE(r.title::text, '') AS release_title,
+                  r.year AS release_year,
+                  t.cover_file_id,
+                  r.cover_file_id AS release_cover_file_id,
+                  t.duration_seconds AS track_duration_seconds,
+                  COALESCE(mf.uploader_name, 'UFO')::text AS uploader_name,
+                  mf.audio_format,
+                  mf.audio_bitrate
+           FROM furumusic__play_history ph
+           JOIN furumusic__track t ON t.id = ph.track_id
+           LEFT JOIN furumusic__release r ON r.id = t.release_id
+           LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
+           LEFT JOIN furumusic__track_artist ta ON ta.track_id = t.id AND ta.role = 'main'
+           LEFT JOIN furumusic__artist a ON a.id = ta.artist_id
+           WHERE ph.user_id = $1
+           GROUP BY ph.id, ph.played_at, ph.duration_listened, ph.completed, t.id, t.title,
+                    t.release_id, r.title, r.year, t.cover_file_id, r.cover_file_id,
+                    t.duration_seconds, mf.uploader_name, mf.audio_format, mf.audio_bitrate
+           ORDER BY ph.played_at DESC, ph.id DESC
+           LIMIT $2"#,
+    )
+    .bind(user_id)
+    .bind(limit)
+    .fetch_all(pool)
+    .await?;
+
+    Ok(rows
+        .into_iter()
+        .map(|row| AdminUserPlayDto {
+            history_id: row.history_id,
+            played_at: row.played_at,
+            duration_listened: row.duration_listened,
+            completed: row.completed,
+            track_id: row.track_id,
+            title: row.title,
+            artists: row.artists,
+            release_id: row.release_id,
+            release_title: row.release_title,
+            release_year: row.release_year,
+            cover_url: admin_track_cover_url(row.cover_file_id, row.release_cover_file_id),
+            track_duration_seconds: row.track_duration_seconds,
+            uploader_name: row.uploader_name,
+            audio_format: row.audio_format,
+            audio_bitrate: row.audio_bitrate,
+        })
+        .collect())
+}
+
+#[derive(Debug, sqlx::FromRow)]
+struct AdminUserPlaySqlRow {
+    history_id: i64,
+    played_at: String,
+    duration_listened: Option<i32>,
+    completed: bool,
+    track_id: i64,
+    title: String,
+    artists: String,
+    release_id: i64,
+    release_title: String,
+    release_year: Option<i32>,
+    cover_file_id: Option<i64>,
+    release_cover_file_id: Option<i64>,
+    track_duration_seconds: f64,
+    uploader_name: String,
+    audio_format: Option<String>,
+    audio_bitrate: Option<i32>,
+}
+
+fn admin_track_cover_url(track_cover: Option<i64>, release_cover: Option<i64>) -> Option<String> {
+    track_cover
+        .or(release_cover)
+        .map(|id| format!("/api/player/cover/{id}/medium"))
+}
+
+fn admin_user_row(
+    row: AdminUserSqlRow,
+    active: &HashMap<i64, i64>,
+    online_cutoff_ms: i64,
+) -> AdminUserRowDto {
+    let last_seen_ms = active.get(&row.id).copied();
+    AdminUserRowDto {
+        id: row.id,
+        username: row.username,
+        display_name: row.display_name,
+        email: row.email,
+        role: row.role,
+        is_active: row.is_active,
+        is_online: last_seen_ms.is_some_and(|value| value <= online_cutoff_ms),
+        last_seen_ms,
+    }
+}
+
+fn load_runtime_overview(config: &AppConfig) -> RuntimeOverviewDto {
+    let llm_configured = !config.agent_llm_url.trim().is_empty();
+    let agent_status = if !config.agent_enabled {
+        "disabled"
+    } else if !llm_configured {
+        "not_configured"
+    } else {
+        "enabled"
+    };
+
+    RuntimeOverviewDto {
+        agent: AgentStatusDto {
+            status: agent_status.to_owned(),
+            enabled: config.agent_enabled,
+            llm_configured,
+            model: config.agent_llm_model.clone(),
+            concurrency: config.agent_concurrency,
+        },
+        storage: vec![
+            storage_path_dto("Inbox", &config.agent_inbox_dir),
+            storage_path_dto("Library", &config.agent_storage_dir),
+        ],
+        node: NodeStatsDto {
+            hostname: node_hostname(),
+            os: std::env::consts::OS,
+            arch: std::env::consts::ARCH,
+            pid: std::process::id(),
+            cpu_count: std::thread::available_parallelism()
+                .map(|count| count.get())
+                .unwrap_or(1),
+        },
+    }
+}
+
+fn storage_path_dto(label: &str, raw_path: &str) -> StoragePathDto {
+    let path = raw_path.trim();
+    let path_ref = Path::new(path);
+    let usage = if path.is_empty() {
+        None
+    } else {
+        disk_usage(path_ref).or_else(|| {
+            path_ref
+                .parent()
+                .filter(|parent| !parent.as_os_str().is_empty())
+                .and_then(disk_usage)
+        })
+    };
+
+    StoragePathDto {
+        label: label.to_owned(),
+        path: path.to_owned(),
+        exists: !path.is_empty() && path_ref.exists(),
+        free_bytes: usage.map(|value| value.free_bytes),
+        total_bytes: usage.map(|value| value.total_bytes),
+    }
+}
+
+fn node_hostname() -> String {
+    std::env::var("HOSTNAME")
+        .or_else(|_| std::env::var("COMPUTERNAME"))
+        .unwrap_or_else(|_| "unknown".to_owned())
+}
+
+#[derive(Debug, Clone, Copy)]
+struct DiskUsage {
+    free_bytes: u64,
+    total_bytes: u64,
+}
+
+#[cfg(windows)]
+fn disk_usage(path: &Path) -> Option<DiskUsage> {
+    use std::os::windows::ffi::OsStrExt;
+
+    #[link(name = "kernel32")]
+    unsafe extern "system" {
+        fn GetDiskFreeSpaceExW(
+            lpDirectoryName: *const u16,
+            lpFreeBytesAvailableToCaller: *mut u64,
+            lpTotalNumberOfBytes: *mut u64,
+            lpTotalNumberOfFreeBytes: *mut u64,
+        ) -> i32;
+    }
+
+    let mut wide: Vec<u16> = path.as_os_str().encode_wide().collect();
+    wide.push(0);
+
+    let mut free_available = 0_u64;
+    let mut total = 0_u64;
+    let mut total_free = 0_u64;
+    let ok = unsafe {
+        GetDiskFreeSpaceExW(
+            wide.as_ptr(),
+            &mut free_available,
+            &mut total,
+            &mut total_free,
+        )
+    };
+    (ok != 0).then_some(DiskUsage {
+        free_bytes: free_available,
+        total_bytes: total,
+    })
+}
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+fn disk_usage(path: &Path) -> Option<DiskUsage> {
+    use std::ffi::CString;
+    use std::os::unix::ffi::OsStrExt;
+
+    #[repr(C)]
+    struct Statvfs {
+        f_bsize: std::ffi::c_ulong,
+        f_frsize: std::ffi::c_ulong,
+        f_blocks: std::ffi::c_ulong,
+        f_bfree: std::ffi::c_ulong,
+        f_bavail: std::ffi::c_ulong,
+        f_files: std::ffi::c_ulong,
+        f_ffree: std::ffi::c_ulong,
+        f_favail: std::ffi::c_ulong,
+        f_fsid: std::ffi::c_ulong,
+        f_flag: std::ffi::c_ulong,
+        f_namemax: std::ffi::c_ulong,
+        __f_spare: [std::ffi::c_int; 6],
+    }
+
+    unsafe extern "C" {
+        fn statvfs(path: *const std::ffi::c_char, buf: *mut Statvfs) -> std::ffi::c_int;
+    }
+
+    let c_path = CString::new(path.as_os_str().as_bytes()).ok()?;
+    let mut stat = std::mem::MaybeUninit::<Statvfs>::uninit();
+    let ok = unsafe { statvfs(c_path.as_ptr(), stat.as_mut_ptr()) };
+    if ok != 0 {
+        return None;
+    }
+    let stat = unsafe { stat.assume_init() };
+    let fragment_size = if stat.f_frsize > 0 {
+        stat.f_frsize as u64
+    } else {
+        stat.f_bsize as u64
+    };
+
+    Some(DiskUsage {
+        free_bytes: stat.f_bavail as u64 * fragment_size,
+        total_bytes: stat.f_blocks as u64 * fragment_size,
+    })
+}
+
+#[cfg(not(any(windows, target_os = "linux", target_os = "android")))]
+fn disk_usage(_path: &Path) -> Option<DiskUsage> {
+    None
+}
+
 async fn load_library_overview(pool: &PgPool) -> anyhow::Result<LibraryOverviewDto> {
     let stats = load_overview_stats(pool).await?;
     Ok(LibraryOverviewDto {
@@ -1974,6 +2643,7 @@ async fn load_library_item_detail(
         artists: Vec::new(),
         releases: Vec::new(),
         available_covers: Vec::new(),
+        metadata_tags: load_metadata_tags(pool, kind, item.id).await?,
         item,
     };
 
@@ -2044,6 +2714,97 @@ async fn load_library_item_detail(
     Ok(detail)
 }
 
+async fn load_metadata_tags(
+    pool: &PgPool,
+    kind: &str,
+    id: i64,
+) -> anyhow::Result<Vec<MetadataTagDto>> {
+    let entity_kind = match kind {
+        "artists" => "artist",
+        "releases" => "release",
+        "tracks" => "track",
+        _ => return Ok(Vec::new()),
+    };
+    let rows = sqlx::query_as::<_, (String, String, f64, String)>(
+        r#"SELECT name, source, weight, updated_at
+           FROM (
+               SELECT g.name::text AS name,
+                      egt.source::text AS source,
+                      egt.weight,
+                      egt.updated_at::text AS updated_at
+                 FROM furumusic__entity_genre_tag egt
+                 JOIN furumusic__genre g ON g.id = egt.genre_id
+                WHERE egt.entity_kind = $1 AND egt.entity_id = $2
+               UNION ALL
+               SELECT g.name::text AS name,
+                      'track_genre'::text AS source,
+                      1.0::double precision AS weight,
+                      ''::text AS updated_at
+                 FROM furumusic__track_genre tg
+                 JOIN furumusic__genre g ON g.id = tg.genre_id
+                WHERE $1 = 'track'
+                  AND tg.track_id = $2
+                  AND NOT EXISTS (
+                      SELECT 1
+                        FROM furumusic__entity_genre_tag egt
+                       WHERE egt.entity_kind = 'track'
+                         AND egt.entity_id = tg.track_id
+                         AND egt.genre_id = tg.genre_id
+                  )
+               UNION ALL
+               SELECT g.name::text AS name,
+                      ('release_' || egt.source)::text AS source,
+                      egt.weight,
+                      egt.updated_at::text AS updated_at
+                 FROM furumusic__track t
+                 JOIN furumusic__entity_genre_tag egt
+                   ON egt.entity_kind = 'release'
+                  AND egt.entity_id = t.release_id
+                 JOIN furumusic__genre g ON g.id = egt.genre_id
+                WHERE $1 = 'track'
+                  AND t.id = $2
+                  AND NOT EXISTS (
+                      SELECT 1
+                        FROM furumusic__entity_genre_tag direct_egt
+                       WHERE direct_egt.entity_kind = 'track'
+                         AND direct_egt.entity_id = t.id
+                         AND direct_egt.genre_id = egt.genre_id
+                  )
+                  AND NOT EXISTS (
+                      SELECT 1
+                        FROM furumusic__track_genre tg
+                       WHERE tg.track_id = t.id
+                         AND tg.genre_id = egt.genre_id
+                  )
+           ) tags
+           ORDER BY CASE source
+                        WHEN 'lastfm' THEN 0
+                        WHEN 'release_lastfm' THEN 1
+                        WHEN 'review' THEN 2
+                        WHEN 'release_review' THEN 3
+                        WHEN 'file' THEN 4
+                        WHEN 'release_file' THEN 5
+                        WHEN 'track_genre' THEN 6
+                        ELSE 7
+                    END,
+                    weight DESC,
+                    name ASC"#,
+    )
+    .bind(entity_kind)
+    .bind(id)
+    .fetch_all(pool)
+    .await?;
+    Ok(rows
+        .into_iter()
+        .map(|(name, source, weight, updated_at)| MetadataTagDto {
+            name,
+            source,
+            weight,
+            updated_at,
+        })
+        .collect())
+}
+
 async fn load_artist_options(pool: &PgPool) -> anyhow::Result<Vec<ArtistOptionDto>> {
     let rows = sqlx::query_as::<_, (i64, String)>(
         "SELECT id, name::text FROM furumusic__artist ORDER BY name ASC",
@@ -2655,6 +3416,10 @@ fn tag(label: impl Into<String>, kind: impl Into<String>) -> TagDto {
     }
 }
 
+fn default_true() -> bool {
+    true
+}
+
 fn optional_job_time(value: &str) -> Option<String> {
     if value.is_empty() {
         None

src/admin/views.rs

@@ -1402,6 +1402,8 @@ pub struct MetadataBackfillForm {
     audio_sample_rate: Option<String>,
     audio_bit_depth: Option<String>,
     duration_seconds: Option<String>,
+    local_genres: Option<String>,
+    lastfm_tags: Option<String>,
     mode: Option<String>,
 }
 
@@ -1468,6 +1470,8 @@ pub async fn metadata_backfill_run(
         audio_sample_rate: data.audio_sample_rate.is_some(),
         audio_bit_depth: data.audio_bit_depth.is_some(),
         duration_seconds: data.duration_seconds.is_some(),
+        local_genres: data.local_genres.is_some(),
+        lastfm_tags: data.lastfm_tags.is_some(),
         overwrite: data.mode.as_deref() == Some("overwrite"),
     };
 

src/agent/cover_art.rs

@@ -128,13 +128,21 @@ pub async fn find_best_cover(folder: &Path, audio_files: &[PathBuf]) -> Option<C
         match tokio::fs::read(img_path).await {
             Ok(data) if !data.is_empty() => {
                 let mime = mime_for_image(img_path);
+                crate::metrics::record_agent_cover_lookup("folder", "ok", data.len());
                 return Some(CoverImage {
                     data,
                     mime_type: mime,
                     source: CoverSource::FolderFile(img_path.clone()),
                 });
             }
-            _ => continue,
+            Ok(_) => {
+                crate::metrics::record_agent_cover_lookup("folder", "empty", 0);
+                continue;
+            }
+            Err(_) => {
+                crate::metrics::record_agent_cover_lookup("folder", "error", 0);
+                continue;
+            }
         }
     }
 
@@ -143,10 +151,12 @@ pub async fn find_best_cover(folder: &Path, audio_files: &[PathBuf]) -> Option<C
         let path = audio_path.to_path_buf();
         let result = tokio::task::spawn_blocking(move || extract_embedded_cover(&path)).await;
         if let Ok(Some(cover)) = result {
+            crate::metrics::record_agent_cover_lookup("embedded", "ok", cover.data.len());
             return Some(cover);
         }
     }
 
+    crate::metrics::record_agent_cover_lookup("none", "not_found", 0);
     None
 }
 

src/agent/cover_variants.rs

@@ -74,6 +74,7 @@ fn generate_missing_variants_sync(
 
     let mut created = 0usize;
     for variant in variants {
+        let start = std::time::Instant::now();
         let path = variant_path(original_path, *variant);
         if path.exists() {
             continue;
@@ -88,12 +89,27 @@ fn generate_missing_variants_sync(
             .to_rgb8();
         let mut output = Vec::new();
         let mut encoder = JpegEncoder::new_with_quality(&mut output, variant.quality);
-        encoder.encode(
+        let result = encoder.encode(
             &resized,
             resized.width(),
             resized.height(),
             image::ExtendedColorType::Rgb8,
-        )?;
+        );
+        match result {
+            Ok(()) => crate::metrics::record_agent_cover_variant(
+                variant.name,
+                "ok",
+                start.elapsed(),
+            ),
+            Err(err) => {
+                crate::metrics::record_agent_cover_variant(
+                    variant.name,
+                    "error",
+                    start.elapsed(),
+                );
+                return Err(err.into());
+            }
+        }
         std::fs::write(path, output)?;
         created += 1;
     }

src/agent/normalize.rs

@@ -330,6 +330,7 @@ pub async fn normalize_batch(
     // If over 80% of context limit and more than 1 file, split
     let limit_80 = context_limit * 80 / 100;
     if estimated > limit_80 && files.len() > 1 {
+        crate::metrics::record_agent_llm_split("estimated_context");
         tracing::info!(
             estimated_tokens = estimated,
             context_limit,
@@ -419,6 +420,7 @@ pub async fn normalize_batch(
                 || err_str.contains("length")
                 || err_str.contains("token");
             if is_context_error {
+                crate::metrics::record_agent_llm_split("context_error");
                 tracing::warn!(
                     file_count = files.len(),
                     "LLM error suggests context overflow, splitting batch: {e}"
@@ -466,14 +468,40 @@ pub async fn normalize_batch(
             }
             return Err(e);
         }
-        Err(e) => return Err(e),
+        Err(e) => {
+            crate::metrics::record_agent_llm(
+                llm_model,
+                "error",
+                std::time::Duration::from_millis(duration_ms),
+                0,
+                0,
+                files.len(),
+                Some(estimated),
+            );
+            return Err(e);
+        }
     };
 
     let prompt_tokens = usage.prompt_tokens.unwrap_or(0) as u64;
     let completion_tokens = usage.completion_tokens.unwrap_or(0) as u64;
+    crate::metrics::record_agent_llm(
+        &resp_model,
+        "ok",
+        std::time::Duration::from_millis(duration_ms),
+        prompt_tokens,
+        completion_tokens,
+        files.len(),
+        Some(estimated),
+    );
 
     // Parse batch response
-    let results = parse_batch_response(&response_text, &files)?;
+    let results = match parse_batch_response(&response_text, &files) {
+        Ok(results) => results,
+        Err(error) => {
+            crate::metrics::record_agent_llm_parse_failure(&resp_model);
+            return Err(error);
+        }
+    };
 
     Ok(BatchNormalizeResult {
         results,

src/auth.rs

@@ -61,6 +61,7 @@ pub async fn get_session_user(session: &Session, db: &Database) -> Option<Authen
             display
         }
     };
+    crate::metrics::record_active_user(user.id_val());
     Some(AuthenticatedUser {
         id: user.id_val(),
         name,
@@ -75,9 +76,11 @@ pub async fn require_admin_or_redirect(
     db: &Database,
 ) -> Result<AuthenticatedUser, cot::response::Response> {
     let Some(user) = get_session_user(session, db).await else {
+        crate::metrics::record_authorization_denied("unauthenticated");
         return Err(redirect("/login"));
     };
     if user.role != Role::Admin {
+        crate::metrics::record_authorization_denied("forbidden");
         return Err("Forbidden"
             .with_status(cot::http::StatusCode::FORBIDDEN)
             .into_response()
@@ -96,6 +99,7 @@ pub async fn login(session: &Session, user_id: i64) -> cot::Result<()> {
         .insert(SESSION_USER_ID, user_id)
         .await
         .map_err(|e| cot::Error::internal(e.to_string()))?;
+    crate::metrics::record_active_user(user_id);
     Ok(())
 }
 

src/i18n/phrases.rs

@@ -298,6 +298,7 @@ translations! {
     player_search_placeholder: "Search artists, releases, tracks..." , "Поиск артистов, релизов, треков...";
     player_connection_lost: "Server connection lost"             , "Нет соединения с сервером";
     player_connection_lost_detail: "Player cannot reach the server. Retrying..." , "Плеер не может связаться с сервером. Повторяю...";
+    player_active_device:   "Active device"                   , "Активный девайс";
     player_no_results:       "No results found"                , "Ничего не найдено";
     player_new_playlist:     "New Playlist"                    , "Новый плейлист";
     player_rename_playlist:  "Rename Playlist"                 , "Переименовать плейлист";
@@ -346,6 +347,11 @@ translations! {
     player_lastfm_connect_failed: "Could not open Last.fm connection" , "Не удалось открыть подключение Last.fm";
     player_lastfm_disconnect_failed: "Could not disconnect Last.fm" , "Не удалось отвязать Last.fm";
     player_play:             "Play"                            , "Играть";
+    player_listen:           "Listen"                          , "Слушать";
+    player_listen_artist:    "Listen to artist"                , "Слушать артиста";
+    player_start_radio:      "Start radio"                     , "Запустить радио";
+    player_radio_failed:     "Could not start radio"           , "Не удалось запустить радио";
+    player_played_at:        "Played"                          , "Прослушано";
     player_like:             "Like"                            , "Лайк";
     player_add_to_queue:     "Add to queue"                    , "Добавить в очередь";
     player_add_to_end_queue: "Add to end of queue"             , "Добавить в конец очереди";
@@ -381,7 +387,71 @@ translations! {
     player_saved_torrents:   "Saved torrents"                  , "Сохранённые торренты";
     player_refresh:          "Refresh"                         , "Обновить";
     player_no_saved_torrents: "No saved torrents"              , "Сохранённых торрентов нет";
+    player_import:           "Import"                          , "Импорт";
     player_upload:           "Upload"                          , "Загрузить";
+    player_my_uploads:       "My uploads"                      , "Мои загрузки";
+    player_my_uploaded_tracks: "My uploaded tracks"             , "Мои загруженные треки";
+    player_no_uploaded_tracks: "No uploaded tracks yet"         , "Загруженных треков пока нет";
+    player_needs_approval:   "Needs approval"                  , "Нужно подтверждение";
+    player_pending_or_failed: "pending or failed"               , "ожидают или с ошибкой";
+    player_no_tracks_need_approval: "No tracks need approval"   , "Нет треков для подтверждения";
+    player_queued_processing: "Queued / processing"             , "В очереди / обработке";
+    player_showing:          "Showing"                         , "Показано";
+    player_status:           "Status"                          , "Статус";
+    player_file:             "File"                            , "Файл";
+    player_created:          "Created"                         , "Создано";
+    player_updated:          "Updated"                         , "Обновлено";
+    player_error:            "Error"                           , "Ошибка";
+    player_pending:          "Pending"                         , "Ожидает";
+    player_artist:           "Artist"                          , "Артист";
+    player_album:            "Album"                           , "Альбом";
+    player_album_artists:    "Album artists"                   , "Артисты альбома";
+    player_featured:         "Featured"                        , "При участии";
+    player_featured_short:   "feat."                           , "уч.";
+    player_track_number:     "Track #"                         , "Трек #";
+    player_disc_number:      "Disc #"                          , "Диск #";
+    player_genre:            "Genre"                           , "Жанр";
+    player_notes:            "Notes"                           , "Заметки";
+    player_type_unchanged:   "Type unchanged"                  , "Тип без изменений";
+    player_visibility_unchanged: "Visibility unchanged"         , "Видимость без изменений";
+    player_visible:          "Visible"                         , "Видимый";
+    player_hidden:           "Hidden"                          , "Скрыт";
+    player_no_year:          "no year"                         , "год неизвестен";
+    player_apply:            "Apply"                           , "Применить";
+    player_edit:             "Edit"                            , "Редактировать";
+    player_edit_release:     "Edit release"                    , "Редактировать релиз";
+    player_edit_track:       "Edit track"                      , "Редактировать трек";
+    player_edit_metadata:    "Edit metadata"                   , "Редактировать метаданные";
+    player_metadata:         "Metadata"                        , "Метаданные";
+    player_release_metadata: "Release metadata"                , "Метаданные релиза";
+    player_track_metadata:   "Track metadata"                  , "Метаданные трека";
+    player_approve_metadata: "Approve metadata"                , "Подтвердить метаданные";
+    player_delete_review:    "Delete review"                   , "Удалить проверку";
+    player_approve:          "Approve"                         , "Подтвердить";
+    player_save_track:       "Save track"                      , "Сохранить трек";
+    player_save_release:     "Save release"                    , "Сохранить релиз";
+    player_artists_placeholder: "Artist, Artist"               , "Артист, артист";
+    player_artist_featured_placeholder: "Artist, Featured Artist" , "Артист, приглашённый артист";
+    player_release_type_album: "Album"                         , "Альбом";
+    player_release_type_single: "Single"                       , "Сингл";
+    player_release_type_ep:  "EP"                              , "EP";
+    player_release_type_compilation: "Compilation"             , "Сборник";
+    player_release_type_mixtape: "Mixtape"                     , "Микстейп";
+    player_release_type_live: "Live"                           , "Концерт";
+    player_release_type_soundtrack: "Soundtrack"               , "Саундтрек";
+    player_release_type_remix: "Remix"                         , "Ремикс";
+    player_release_type_demo: "Demo"                           , "Демо";
+    player_failed_load_uploaded_tracks: "Failed to load uploaded tracks" , "Не удалось загрузить загруженные треки";
+    player_failed_save_track: "Failed to save track"           , "Не удалось сохранить трек";
+    player_track_metadata_saved: "Track metadata saved"         , "Метаданные трека сохранены";
+    player_failed_save_release: "Failed to save release"       , "Не удалось сохранить релиз";
+    player_release_metadata_saved: "Release metadata saved"     , "Метаданные релиза сохранены";
+    player_failed_delete_review: "Failed to delete review"     , "Не удалось удалить проверку";
+    player_review_deleted:   "Review deleted"                  , "Проверка удалена";
+    player_failed_approve_review: "Failed to approve review"   , "Не удалось подтвердить проверку";
+    player_track_approved_imported: "Track approved and imported" , "Трек подтверждён и импортирован";
+    player_failed_update_selected_tracks: "Failed to update selected tracks" , "Не удалось обновить выбранные треки";
+    player_selected_tracks_updated: "Selected tracks updated"   , "Выбранные треки обновлены";
     player_choose_saved_or_add_torrent: "Choose a saved item or upload new files." , "Выберите сохранённый элемент или загрузите новые файлы.";
     player_local_files:      "Local audio files"               , "Локальные аудиофайлы";
     player_torrent_file:     "Torrent file"                    , "Torrent-файл";

src/jobs/inbox_discover.rs

@@ -29,6 +29,8 @@ impl Job for InboxDiscoverJob {
     }
 
     async fn run(&self, ctx: &JobContext, log: &mut JobLog) -> anyhow::Result<()> {
+        let run_start = std::time::Instant::now();
+        let run_outcome = "completed";
         // Prevent overlapping discover runs
         if DISCOVER_RUNNING
             .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
@@ -44,6 +46,19 @@ impl Job for InboxDiscoverJob {
             }
         }
         let _guard = Guard;
+        struct MetricsGuard {
+            start: std::time::Instant,
+            outcome: &'static str,
+        }
+        impl Drop for MetricsGuard {
+            fn drop(&mut self) {
+                crate::metrics::record_agent_discover_run(self.outcome, self.start.elapsed());
+            }
+        }
+        let mut metrics_guard = MetricsGuard {
+            start: run_start,
+            outcome: run_outcome,
+        };
 
         let config = &ctx.config;
 
@@ -97,6 +112,7 @@ impl Job for InboxDiscoverJob {
 
                 // Compute SHA-256 hash
                 let path_clone = file_path.to_path_buf();
+                let hash_start = std::time::Instant::now();
                 let (hash, file_size) =
                     match tokio::task::spawn_blocking(move || -> anyhow::Result<(String, i64)> {
                         let data = std::fs::read(&path_clone)?;
@@ -107,8 +123,12 @@ impl Job for InboxDiscoverJob {
                     })
                     .await?
                     {
-                        Ok(v) => v,
+                        Ok(v) => {
+                            crate::metrics::record_agent_file_hash(hash_start.elapsed(), v.1, "ok");
+                            v
+                        }
                         Err(e) => {
+                            crate::metrics::record_agent_file_hash(hash_start.elapsed(), 0, "error");
                             log.warn(&format!("Failed to hash {}: {e}", file_path.display()));
                             continue;
                         }
@@ -125,13 +145,18 @@ impl Job for InboxDiscoverJob {
 
                 // Extract raw metadata
                 let path_for_meta = file_path.to_path_buf();
+                let metadata_start = std::time::Instant::now();
                 let raw_meta = match tokio::task::spawn_blocking(move || {
                     crate::agent::metadata::extract(&path_for_meta)
                 })
                 .await?
                 {
-                    Ok(m) => m,
+                    Ok(m) => {
+                        crate::metrics::record_agent_metadata(metadata_start.elapsed(), "ok");
+                        m
+                    }
                     Err(e) => {
+                        crate::metrics::record_agent_metadata(metadata_start.elapsed(), "error");
                         log.warn(&format!(
                             "Failed to extract metadata from {}: {e}",
                             file_path.display()
@@ -189,6 +214,12 @@ impl Job for InboxDiscoverJob {
             "Discovered {} new files, skipped {} (hash known), skipped {} (already queued)",
             discovered, skipped_hash, skipped_existing
         ));
+        crate::metrics::record_agent_discover_files(
+            audio_files.len() as u64,
+            discovered,
+            skipped_hash,
+            skipped_existing,
+        );
 
         // Trigger inbox_process in background if new files were discovered
         // and no orchestrator is already running
@@ -219,6 +250,7 @@ impl Job for InboxDiscoverJob {
             }
         }
 
+        metrics_guard.outcome = run_outcome;
         Ok(())
     }
 }

src/jobs/inbox_process.rs

@@ -17,28 +17,99 @@ pub fn is_orchestrator_running() -> bool {
     ORCHESTRATOR_RUNNING.load(Ordering::SeqCst)
 }
 
-/// Try to acquire the PostgreSQL advisory lock for the orchestrator.
+struct OrchestratorAdvisoryGuard {
-/// Returns true if the lock was acquired (no other orchestrator is running).
+    conn: Option<sqlx::pool::PoolConnection<sqlx::Postgres>>,
-async fn try_acquire_orchestrator_lock(pool: &sqlx::PgPool) -> bool {
+}
-    match sqlx::query_scalar::<_, bool>("SELECT pg_try_advisory_lock($1)")
+
-        .bind(ORCHESTRATOR_ADVISORY_LOCK_ID)
+impl Drop for OrchestratorAdvisoryGuard {
-        .fetch_one(pool)
+    fn drop(&mut self) {
-        .await
+        let Some(mut conn) = self.conn.take() else {
-    {
+            return;
-        Ok(acquired) => acquired,
+        };
-        Err(e) => {
+
-            tracing::error!("Failed to acquire advisory lock: {e}");
+        tokio::spawn(async move {
-            false
+            match sqlx::query_scalar::<_, bool>("SELECT pg_advisory_unlock($1)")
-        }
+                .bind(ORCHESTRATOR_ADVISORY_LOCK_ID)
+                .fetch_one(&mut *conn)
+                .await
+            {
+                Ok(true) => tracing::info!("inbox_process: advisory lock released"),
+                Ok(false) => tracing::warn!(
+                    "inbox_process: advisory lock was not held by the guard connection"
+                ),
+                Err(e) => tracing::error!("inbox_process: failed to release advisory lock: {e}"),
+            }
+        });
     }
 }
 
-/// Release the PostgreSQL advisory lock for the orchestrator.
+async fn connection_holds_orchestrator_lock(
-async fn release_orchestrator_lock(pool: &sqlx::PgPool) {
+    conn: &mut sqlx::pool::PoolConnection<sqlx::Postgres>,
-    let _ = sqlx::query("SELECT pg_advisory_unlock($1)")
+) -> anyhow::Result<bool> {
+    let holds_lock = sqlx::query_scalar::<_, bool>(
+        r#"
+        SELECT EXISTS (
+            SELECT 1
+            FROM pg_locks
+            WHERE locktype = 'advisory'
+              AND pid = pg_backend_pid()
+              AND mode = 'ExclusiveLock'
+              AND granted
+              AND objsubid = 1
+              AND classid::bigint = (($1::bigint >> 32) & 4294967295::bigint)
+              AND objid::bigint = ($1::bigint & 4294967295::bigint)
+        )
+        "#,
+    )
+    .bind(ORCHESTRATOR_ADVISORY_LOCK_ID)
+    .fetch_one(&mut **conn)
+    .await?;
+
+    Ok(holds_lock)
+}
+
+/// Try to acquire the PostgreSQL advisory lock for the orchestrator.
+///
+/// The guard owns the same pooled connection that acquired the session-level
+/// lock. This matters because PostgreSQL session advisory locks must be
+/// released on the same connection, not just through the same pool.
+async fn try_acquire_orchestrator_lock(
+    pool: &sqlx::PgPool,
+) -> anyhow::Result<Option<OrchestratorAdvisoryGuard>> {
+    let mut conn = pool.acquire().await?;
+
+    // Older versions acquired the lock through the pool and could return a
+    // locked idle connection. If we get such a connection, drain that stale
+    // re-entrant lock before taking the new guarded lock.
+    let mut cleaned_stale_locks = 0u8;
+    while connection_holds_orchestrator_lock(&mut conn).await? {
+        let unlocked = sqlx::query_scalar::<_, bool>("SELECT pg_advisory_unlock($1)")
+            .bind(ORCHESTRATOR_ADVISORY_LOCK_ID)
+            .fetch_one(&mut *conn)
+            .await?;
+
+        cleaned_stale_locks = cleaned_stale_locks.saturating_add(u8::from(unlocked));
+        if cleaned_stale_locks >= 8 {
+            break;
+        }
+    }
+    if cleaned_stale_locks > 0 {
+        tracing::warn!(
+            count = cleaned_stale_locks,
+            "inbox_process: released stale advisory lock(s) from an idle pooled connection"
+        );
+    }
+
+    let acquired = sqlx::query_scalar::<_, bool>("SELECT pg_try_advisory_lock($1)")
         .bind(ORCHESTRATOR_ADVISORY_LOCK_ID)
-        .execute(pool)
+        .fetch_one(&mut *conn)
-        .await;
+        .await?;
+
+    if acquired {
+        Ok(Some(OrchestratorAdvisoryGuard { conn: Some(conn) }))
+    } else {
+        Ok(None)
+    }
 }
 
 use crate::agent::dto::{FolderContext, NormalizedFields, PathHints, RawMetadata};
@@ -83,10 +154,10 @@ impl Job for InboxProcessJob {
             .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
             .is_err()
         {
-            log.info(
+            log.warn(
                 "Another inbox_process orchestrator is already running (AtomicBool), skipping",
             );
-            return Ok(());
+            anyhow::bail!("another inbox_process orchestrator is already running in this process");
         }
         struct AtomicGuard;
         impl Drop for AtomicGuard {
@@ -98,27 +169,16 @@ impl Job for InboxProcessJob {
         let _atomic_guard = AtomicGuard;
 
         // --- Guard 2: PostgreSQL advisory lock (cross-process/binary safe) ---
-        if !try_acquire_orchestrator_lock(&ctx.pool).await {
+        let _advisory_guard = match try_acquire_orchestrator_lock(&ctx.pool).await? {
-            log.info("Another inbox_process orchestrator holds the advisory lock, skipping");
+            Some(guard) => guard,
-            return Ok(());
+            None => {
-        }
+                log.warn("Another inbox_process orchestrator holds the advisory lock");
-        tracing::info!("inbox_process: advisory lock acquired");
+                anyhow::bail!(
-        let pool_for_unlock = ctx.pool.clone();
+                    "inbox_process advisory lock is held by another database session; no in-process orchestrator is running"
-        struct AdvisoryGuard {
+                );
-            pool: sqlx::PgPool,
-        }
-        impl Drop for AdvisoryGuard {
-            fn drop(&mut self) {
-                let pool = self.pool.clone();
-                tokio::spawn(async move {
-                    release_orchestrator_lock(&pool).await;
-                    tracing::info!("inbox_process: advisory lock released");
-                });
             }
-        }
-        let _advisory_guard = AdvisoryGuard {
-            pool: pool_for_unlock,
         };
+        tracing::info!("inbox_process: advisory lock acquired");
 
         let config = Arc::clone(&ctx.config);
         let mut total_ok = 0u64;
@@ -307,12 +367,18 @@ async fn process_folder_batch(
 
         // Extract metadata (with 60s timeout)
         let path_for_meta = file_path.to_path_buf();
+        let metadata_start = std::time::Instant::now();
         let meta_future =
             tokio::task::spawn_blocking(move || crate::agent::metadata::extract(&path_for_meta));
         let raw_meta =
             match tokio::time::timeout(std::time::Duration::from_secs(60), meta_future).await {
-                Ok(Ok(Ok(m))) => m,
+                Ok(Ok(Ok(m))) => {
+                    crate::metrics::record_agent_metadata(metadata_start.elapsed(), "ok");
+                    m
+                }
                 Ok(Ok(Err(e))) => {
+                    crate::metrics::record_agent_metadata(metadata_start.elapsed(), "error");
+                    crate::metrics::record_agent_failed("metadata");
                     let msg = format!("{filename}: metadata error: {e}");
                     log.error(&msg);
                     let _ = review.set_failed(db, &msg).await;
@@ -320,6 +386,8 @@ async fn process_folder_batch(
                     continue;
                 }
                 Ok(Err(e)) => {
+                    crate::metrics::record_agent_metadata(metadata_start.elapsed(), "panic");
+                    crate::metrics::record_agent_failed("metadata");
                     let msg = format!("{filename}: metadata panic: {e}");
                     log.error(&msg);
                     let _ = review.set_failed(db, &msg).await;
@@ -327,6 +395,8 @@ async fn process_folder_batch(
                     continue;
                 }
                 Err(_) => {
+                    crate::metrics::record_agent_metadata(metadata_start.elapsed(), "timeout");
+                    crate::metrics::record_agent_failed("metadata");
                     let msg = format!("{filename}: metadata timeout (60s)");
                     log.error(&msg);
                     let _ = review.set_failed(db, &msg).await;
@@ -416,6 +486,7 @@ async fn process_folder_batch(
     // Lookup all unique artist queries
     let mut all_similar_artists = Vec::new();
     for q in &artist_queries {
+        let rag_start = std::time::Instant::now();
         match tokio::time::timeout(
             std::time::Duration::from_secs(30),
             crate::agent::rag::find_similar_artists(pool, q, 5),
@@ -423,6 +494,7 @@ async fn process_folder_batch(
         .await
         {
             Ok(Ok(results)) => {
+                crate::metrics::record_agent_rag("artist", "ok", rag_start.elapsed(), results.len());
                 for a in results {
                     if !all_similar_artists
                         .iter()
@@ -432,13 +504,20 @@ async fn process_folder_batch(
                     }
                 }
             }
-            Ok(Err(e)) => log.warn(&format!("RAG artist lookup failed for \"{q}\": {e}")),
+            Ok(Err(e)) => {
-            Err(_) => log.warn(&format!("RAG artist lookup timed out for \"{q}\"")),
+                crate::metrics::record_agent_rag("artist", "error", rag_start.elapsed(), 0);
+                log.warn(&format!("RAG artist lookup failed for \"{q}\": {e}"))
+            }
+            Err(_) => {
+                crate::metrics::record_agent_rag("artist", "timeout", rag_start.elapsed(), 0);
+                log.warn(&format!("RAG artist lookup timed out for \"{q}\""))
+            }
         }
     }
 
     let mut all_similar_releases = Vec::new();
     for q in &album_queries {
+        let rag_start = std::time::Instant::now();
         match tokio::time::timeout(
             std::time::Duration::from_secs(30),
             crate::agent::rag::find_similar_releases(pool, q, 5),
@@ -446,6 +525,7 @@ async fn process_folder_batch(
         .await
         {
             Ok(Ok(results)) => {
+                crate::metrics::record_agent_rag("release", "ok", rag_start.elapsed(), results.len());
                 for r in results {
                     if !all_similar_releases
                         .iter()
@@ -455,8 +535,14 @@ async fn process_folder_batch(
                     }
                 }
             }
-            Ok(Err(e)) => log.warn(&format!("RAG release lookup failed for \"{q}\": {e}")),
+            Ok(Err(e)) => {
-            Err(_) => log.warn(&format!("RAG release lookup timed out for \"{q}\"")),
+                crate::metrics::record_agent_rag("release", "error", rag_start.elapsed(), 0);
+                log.warn(&format!("RAG release lookup failed for \"{q}\": {e}"))
+            }
+            Err(_) => {
+                crate::metrics::record_agent_rag("release", "timeout", rag_start.elapsed(), 0);
+                log.warn(&format!("RAG release lookup timed out for \"{q}\""))
+            }
         }
     }
 
@@ -547,11 +633,14 @@ async fn process_folder_batch(
     let batch_result = match llm_result {
         Ok(r) => r,
         Err(e) => {
+            crate::metrics::record_agent_failed("llm");
+            crate::metrics::record_agent_folder_batch("failed", file_count, batch_start.elapsed());
             let err_msg = format!("Batch LLM call failed: {e}");
             log.error(&err_msg);
             // Mark all files as failed
             for mut p in prepared {
                 let _ = p.review.set_failed(db, &err_msg).await;
+                crate::metrics::record_agent_file_processed("failed", "failed");
             }
             let total_fail_count = failed_reviews.len() as u64 + file_count as u64;
             let duration_ms = batch_start.elapsed().as_millis() as i64;
@@ -612,6 +701,7 @@ async fn process_folder_batch(
 
         let result_json = serde_json::to_string(normalized).unwrap_or_default();
         let confidence = normalized.confidence.unwrap_or(0.0);
+        crate::metrics::observe_agent_confidence(confidence);
 
         let feat = if normalized.featured_artists.is_empty() {
             String::new()
@@ -655,9 +745,12 @@ async fn process_folder_batch(
             {
                 Ok(()) => {
                     let _ = p.review.set_auto_approved(db).await;
+                    crate::metrics::record_agent_file_processed("ok", "auto_approved");
                     ok_count += 1;
                 }
                 Err(e) => {
+                    crate::metrics::record_agent_failed("finalize");
+                    crate::metrics::record_agent_file_processed("failed", "failed");
                     let msg = format!("{filename}: finalize failed: {e}");
                     log.error(&msg);
                     let _ = p.review.set_failed(db, &msg).await;
@@ -671,6 +764,7 @@ async fn process_folder_batch(
             )
             .unwrap();
             let _ = p.review.save(db).await;
+            crate::metrics::record_agent_file_processed("ok", "pending_review");
             log.info(&format!(
                 "{filename}: manual review (confidence {confidence} < {})",
                 config.agent_confidence_threshold,
@@ -682,9 +776,11 @@ async fn process_folder_batch(
     let duration_ms = batch_start.elapsed().as_millis() as i64;
     if fail_count == 0 {
         let _ = run.set_completed(db, duration_ms, &log.output()).await;
+        crate::metrics::record_agent_folder_batch("completed", file_count, batch_start.elapsed());
     } else {
         let msg = format!("{fail_count} file(s) failed");
         let _ = run.set_failed(db, duration_ms, &log.output(), &msg).await;
+        crate::metrics::record_agent_folder_batch("failed", file_count, batch_start.elapsed());
     }
 
     (ok_count, fail_count)
@@ -878,6 +974,26 @@ pub async fn finalize_approved(
         .await;
     }
 
+    let approved_genre = normalized
+        .genre
+        .as_deref()
+        .or_else(|| context.get("raw_genre").and_then(|v| v.as_str()))
+        .map(str::trim)
+        .filter(|value| !value.is_empty());
+    if let Some(genre) = approved_genre {
+        if let Err(err) =
+            crate::jobs::metadata_backfill::save_approved_track_genres(pool, track.id_val(), genre)
+                .await
+        {
+            tracing::warn!(
+                track_id = track.id_val(),
+                genre,
+                error = %err,
+                "failed to save approved track genre metadata"
+            );
+        }
+    }
+
     // Cover art: if the release has no cover yet, try to find one
     if release.cover_file_id.is_none() {
         let source_folder = Path::new(input_path_str).parent().unwrap_or(Path::new("."));

src/main.rs

@@ -7,6 +7,7 @@ mod i18n;
 mod jobs;
 mod lastfm;
 mod media_paths;
+mod metrics;
 mod music;
 mod oidc;
 mod player;
@@ -139,12 +140,41 @@ async fn logout_handler(session: Session) -> cot::Result<cot::response::Response
     Ok(auth::redirect("/login"))
 }
 
+async fn metrics_handler(
+    config: Arc<AppConfig>,
+    pool: Arc<tokio::sync::OnceCell<sqlx::PgPool>>,
+) -> cot::Result<cot::http::Response<Body>> {
+    if config.database_url.is_empty() {
+        return Ok(cot::http::Response::builder()
+            .status(cot::http::StatusCode::SERVICE_UNAVAILABLE)
+            .header(cot::http::header::CONTENT_TYPE, "text/plain; version=0.0.4")
+            .body(Body::fixed("furumusic_metrics_unavailable 1\n"))
+            .expect("valid response"));
+    }
+    let pg_pool = pool
+        .get_or_init(|| async {
+            sqlx::postgres::PgPoolOptions::new()
+                .max_connections(2)
+                .connect(&config.database_url)
+                .await
+                .expect("metrics pool")
+        })
+        .await;
+    let body = metrics::render(pg_pool, &config).await;
+    Ok(cot::http::Response::builder()
+        .status(cot::http::StatusCode::OK)
+        .header(cot::http::header::CONTENT_TYPE, "text/plain; version=0.0.4")
+        .body(Body::fixed(body))
+        .expect("valid response"))
+}
+
 // ---------------------------------------------------------------------------
 // App
 // ---------------------------------------------------------------------------
 
 struct FuruApp {
     config: Arc<AppConfig>,
+    pool: Arc<tokio::sync::OnceCell<sqlx::PgPool>>,
 }
 
 impl App for FuruApp {
@@ -171,6 +201,19 @@ impl App for FuruApp {
                 },
                 "index",
             ),
+            Route::with_handler_and_name(
+                "/metrics",
+                get({
+                    let config = Arc::clone(&self.config);
+                    let pool = Arc::clone(&self.pool);
+                    move || {
+                        let config = Arc::clone(&config);
+                        let pool = Arc::clone(&pool);
+                        async move { metrics_handler(config, pool).await }
+                    }
+                }),
+                "metrics",
+            ),
             Route::with_handler_and_name(
                 "/login",
                 get({
@@ -200,6 +243,11 @@ impl App for FuruApp {
                             let data = match result {
                                 FormResult::Ok(data) => data,
                                 FormResult::ValidationError(_) => {
+                                    metrics::record_auth_attempt(
+                                        "password",
+                                        "failure",
+                                        "validation_error",
+                                    );
                                     let msg = i18n.t.login_invalid.to_owned();
                                     return login_page_handler(i18n, &config, db, msg)
                                         .await?
@@ -216,6 +264,10 @@ impl App for FuruApp {
                                         PasswordVerificationResult::Ok
                                         | PasswordVerificationResult::OkObsolete(_) => {
                                             auth::login(&session, user.id_val()).await?;
+                                            metrics::record_auth_attempt(
+                                                "password", "success", "ok",
+                                            );
+                                            metrics::record_session_created("password");
                                             return Ok(auth::redirect("/"));
                                         }
                                         PasswordVerificationResult::Invalid => {}
@@ -223,6 +275,11 @@ impl App for FuruApp {
                                 }
                             }
 
+                            metrics::record_auth_attempt(
+                                "password",
+                                "failure",
+                                "bad_credentials",
+                            );
                             let msg = i18n.t.login_invalid.to_owned();
                             login_page_handler(i18n, &config, db, msg)
                                 .await?
@@ -332,6 +389,7 @@ impl Project for FuruProject {
         context: &cot::project::MiddlewareContext,
     ) -> cot::project::RootHandler {
         handler
+            .middleware(metrics::MetricsLayer)
             .middleware(StaticFilesMiddleware::from_context(context))
             .middleware(SessionMiddleware::from_context(context))
             .build()
@@ -361,6 +419,7 @@ impl Project for FuruProject {
         apps.register_with_views(
             FuruApp {
                 config: Arc::clone(&self.app_config),
+                pool: Arc::new(tokio::sync::OnceCell::new()),
             },
             "",
         );

src/metrics.rs

@@ -0,0 +1,851 @@
+use std::collections::{BTreeMap, HashMap};
+use std::future::Future;
+use std::path::Path;
+use std::pin::Pin;
+use std::sync::{LazyLock, Mutex};
+use std::task::{Context, Poll};
+use std::time::{Duration, Instant};
+
+use cot::http::header::CONTENT_LENGTH;
+use cot::http::Method;
+use cot::request::Request;
+use cot::response::Response;
+use cot::Error;
+use sqlx::PgPool;
+use tower::{Layer, Service};
+
+use crate::config::AppConfig;
+
+const HTTP_BUCKETS: &[f64] = &[
+    0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0, 10.0,
+];
+const JOB_BUCKETS: &[f64] = &[0.1, 0.5, 1.0, 2.5, 5.0, 10.0, 30.0, 60.0, 300.0, 600.0];
+const FILE_BUCKETS: &[f64] = &[
+    0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0, 15.0, 60.0,
+];
+
+static REGISTRY: LazyLock<Registry> = LazyLock::new(Registry::default);
+static ACTIVE_USERS: LazyLock<Mutex<HashMap<i64, Instant>>> =
+    LazyLock::new(|| Mutex::new(HashMap::new()));
+
+#[derive(Default)]
+struct Registry {
+    counters: Mutex<BTreeMap<MetricKey, f64>>,
+    gauges: Mutex<BTreeMap<MetricKey, f64>>,
+    histograms: Mutex<BTreeMap<MetricKey, HistogramState>>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+struct MetricKey {
+    name: &'static str,
+    labels: Vec<(&'static str, String)>,
+}
+
+#[derive(Debug, Clone)]
+struct HistogramState {
+    buckets: Vec<f64>,
+    counts: Vec<u64>,
+    sum: f64,
+    count: u64,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct MetricsLayer;
+
+#[derive(Debug, Clone)]
+pub struct MetricsService<S> {
+    inner: S,
+}
+
+impl<S> Layer<S> for MetricsLayer {
+    type Service = MetricsService<S>;
+
+    fn layer(&self, inner: S) -> Self::Service {
+        MetricsService { inner }
+    }
+}
+
+impl<S> Service<Request> for MetricsService<S>
+where
+    S: Service<Request, Response = Response, Error = Error> + Send + 'static,
+    S::Future: Send + 'static,
+{
+    type Response = Response;
+    type Error = Error;
+    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+
+    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        self.inner.poll_ready(cx)
+    }
+
+    fn call(&mut self, request: Request) -> Self::Future {
+        let method = request.method().clone();
+        let route = normalize_route(request.uri().path());
+        let request_bytes = request
+            .headers()
+            .get(CONTENT_LENGTH)
+            .and_then(|value| value.to_str().ok())
+            .and_then(|value| value.parse::<f64>().ok())
+            .unwrap_or(0.0);
+        let labels = http_labels(&method, &route, "in_flight");
+        REGISTRY.inc_gauge("furumusic_http_in_flight_requests", labels, 1.0);
+        REGISTRY.inc_counter(
+            "furumusic_http_request_body_bytes_total",
+            vec![
+                ("method", method.as_str().to_owned()),
+                ("route", route.clone()),
+            ],
+            request_bytes,
+        );
+
+        let start = Instant::now();
+        let fut = self.inner.call(request);
+        Box::pin(async move {
+            let result = fut.await;
+            let elapsed = start.elapsed().as_secs_f64();
+            REGISTRY.inc_gauge(
+                "furumusic_http_in_flight_requests",
+                http_labels(&method, &route, "in_flight"),
+                -1.0,
+            );
+
+            match result {
+                Ok(response) => {
+                    let status = response.status().as_u16().to_string();
+                    let labels = http_labels(&method, &route, &status);
+                    REGISTRY.inc_counter("furumusic_http_requests_total", labels.clone(), 1.0);
+                    REGISTRY.observe_histogram(
+                        "furumusic_http_request_duration_seconds",
+                        labels,
+                        elapsed,
+                        HTTP_BUCKETS,
+                    );
+                    if let Some(length) = response
+                        .headers()
+                        .get(CONTENT_LENGTH)
+                        .and_then(|value| value.to_str().ok())
+                        .and_then(|value| value.parse::<f64>().ok())
+                    {
+                        REGISTRY.inc_counter(
+                            "furumusic_http_response_body_bytes_total",
+                            vec![
+                                ("method", method.as_str().to_owned()),
+                                ("route", route.clone()),
+                                ("status", status),
+                            ],
+                            length,
+                        );
+                    }
+                    Ok(response)
+                }
+                Err(error) => {
+                    let labels = http_labels(&method, &route, "500");
+                    REGISTRY.inc_counter("furumusic_http_requests_total", labels.clone(), 1.0);
+                    REGISTRY.observe_histogram(
+                        "furumusic_http_request_duration_seconds",
+                        labels,
+                        elapsed,
+                        HTTP_BUCKETS,
+                    );
+                    Err(error)
+                }
+            }
+        })
+    }
+}
+
+pub fn record_active_user(user_id: i64) {
+    let mut users = ACTIVE_USERS.lock().expect("active user lock");
+    users.insert(user_id, Instant::now());
+}
+
+pub fn active_user_last_seen_ms() -> HashMap<i64, i64> {
+    let users = ACTIVE_USERS.lock().expect("active user lock");
+    users
+        .iter()
+        .map(|(user_id, last_seen)| (*user_id, last_seen.elapsed().as_millis() as i64))
+        .collect()
+}
+
+pub fn record_auth_attempt(method: &'static str, outcome: &'static str, reason: &'static str) {
+    REGISTRY.inc_counter(
+        "furumusic_auth_login_attempts_total",
+        vec![
+            ("method", method.to_owned()),
+            ("outcome", outcome.to_owned()),
+            ("reason", reason.to_owned()),
+        ],
+        1.0,
+    );
+}
+
+pub fn record_session_created(method: &'static str) {
+    REGISTRY.inc_counter(
+        "furumusic_auth_sessions_created_total",
+        vec![("method", method.to_owned())],
+        1.0,
+    );
+}
+
+pub fn record_authorization_denied(kind: &'static str) {
+    REGISTRY.inc_counter(
+        "furumusic_auth_denied_total",
+        vec![("kind", kind.to_owned())],
+        1.0,
+    );
+}
+
+pub fn record_play_history(duration_listened: Option<i32>, completed: bool) {
+    REGISTRY.inc_counter(
+        "furumusic_listens_total",
+        vec![(
+            "completed",
+            if completed { "true" } else { "false" }.to_owned(),
+        )],
+        1.0,
+    );
+    if let Some(seconds) = duration_listened {
+        REGISTRY.inc_counter(
+            "furumusic_listened_seconds_total",
+            Vec::new(),
+            seconds.max(0) as f64,
+        );
+    }
+}
+
+pub fn record_stream_request(range: bool, bytes: u64) {
+    REGISTRY.inc_counter(
+        "furumusic_stream_requests_total",
+        vec![("range", if range { "true" } else { "false" }.to_owned())],
+        1.0,
+    );
+    REGISTRY.inc_counter("furumusic_stream_bytes_total", Vec::new(), bytes as f64);
+}
+
+pub fn record_agent_discover_run(outcome: &'static str, duration: Duration) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_discover_runs_total",
+        vec![("outcome", outcome.to_owned())],
+        1.0,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_discover_duration_seconds",
+        vec![("outcome", outcome.to_owned())],
+        duration.as_secs_f64(),
+        JOB_BUCKETS,
+    );
+}
+
+pub fn record_agent_discover_files(seen: u64, queued: u64, skipped_hash: u64, skipped_existing: u64) {
+    REGISTRY.inc_counter("furumusic_agent_discover_files_seen_total", Vec::new(), seen as f64);
+    REGISTRY.inc_counter(
+        "furumusic_agent_discover_files_queued_total",
+        Vec::new(),
+        queued as f64,
+    );
+    REGISTRY.inc_counter(
+        "furumusic_agent_discover_files_skipped_total",
+        vec![("reason", "hash_known".to_owned())],
+        skipped_hash as f64,
+    );
+    REGISTRY.inc_counter(
+        "furumusic_agent_discover_files_skipped_total",
+        vec![("reason", "already_queued".to_owned())],
+        skipped_existing as f64,
+    );
+}
+
+pub fn record_agent_file_hash(duration: Duration, bytes: i64, outcome: &'static str) {
+    REGISTRY.observe_histogram(
+        "furumusic_agent_discover_hash_duration_seconds",
+        vec![("outcome", outcome.to_owned())],
+        duration.as_secs_f64(),
+        FILE_BUCKETS,
+    );
+    if bytes > 0 {
+        REGISTRY.inc_counter(
+            "furumusic_agent_discover_file_bytes_total",
+            vec![("outcome", outcome.to_owned())],
+            bytes as f64,
+        );
+    }
+}
+
+pub fn record_agent_metadata(duration: Duration, outcome: &'static str) {
+    REGISTRY.observe_histogram(
+        "furumusic_agent_discover_metadata_duration_seconds",
+        vec![("outcome", outcome.to_owned())],
+        duration.as_secs_f64(),
+        FILE_BUCKETS,
+    );
+}
+
+pub fn record_agent_folder_batch(outcome: &'static str, size: usize, duration: Duration) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_folder_batches_total",
+        vec![("outcome", outcome.to_owned())],
+        1.0,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_folder_batch_duration_seconds",
+        vec![("outcome", outcome.to_owned())],
+        duration.as_secs_f64(),
+        JOB_BUCKETS,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_folder_batch_size",
+        vec![("outcome", outcome.to_owned())],
+        size as f64,
+        &[1.0, 2.0, 5.0, 10.0, 20.0, 50.0, 100.0],
+    );
+}
+
+pub fn record_agent_file_processed(outcome: &'static str, decision: &'static str) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_files_processed_total",
+        vec![
+            ("outcome", outcome.to_owned()),
+            ("decision", decision.to_owned()),
+        ],
+        1.0,
+    );
+}
+
+pub fn record_agent_failed(stage: &'static str) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_failed_total",
+        vec![("stage", stage.to_owned())],
+        1.0,
+    );
+}
+
+pub fn observe_agent_confidence(confidence: f64) {
+    REGISTRY.observe_histogram(
+        "furumusic_agent_confidence",
+        Vec::new(),
+        confidence,
+        &[0.1, 0.2, 0.4, 0.6, 0.75, 0.85, 0.95, 1.0],
+    );
+}
+
+pub fn record_agent_llm(
+    model: &str,
+    outcome: &'static str,
+    duration: Duration,
+    prompt_tokens: u64,
+    completion_tokens: u64,
+    batch_size: usize,
+    estimated_tokens: Option<u64>,
+) {
+    let model = normalize_model_label(model);
+    REGISTRY.inc_counter(
+        "furumusic_agent_llm_requests_total",
+        vec![
+            ("model", model.clone()),
+            ("outcome", outcome.to_owned()),
+        ],
+        1.0,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_llm_duration_seconds",
+        vec![
+            ("model", model.clone()),
+            ("outcome", outcome.to_owned()),
+        ],
+        duration.as_secs_f64(),
+        JOB_BUCKETS,
+    );
+    REGISTRY.inc_counter(
+        "furumusic_agent_llm_tokens_total",
+        vec![("model", model.clone()), ("type", "prompt".to_owned())],
+        prompt_tokens as f64,
+    );
+    REGISTRY.inc_counter(
+        "furumusic_agent_llm_tokens_total",
+        vec![
+            ("model", model.clone()),
+            ("type", "completion".to_owned()),
+        ],
+        completion_tokens as f64,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_llm_batch_size",
+        vec![("model", model.clone())],
+        batch_size as f64,
+        &[1.0, 2.0, 5.0, 10.0, 20.0, 50.0, 100.0],
+    );
+    if let Some(estimated) = estimated_tokens {
+        REGISTRY.observe_histogram(
+            "furumusic_agent_llm_context_estimated_tokens",
+            vec![("model", model)],
+            estimated as f64,
+            &[512.0, 1024.0, 2048.0, 4096.0, 8192.0, 16384.0, 32768.0],
+        );
+    }
+}
+
+pub fn record_agent_llm_split(reason: &'static str) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_llm_batch_splits_total",
+        vec![("reason", reason.to_owned())],
+        1.0,
+    );
+}
+
+pub fn record_agent_llm_parse_failure(model: &str) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_llm_parse_failures_total",
+        vec![("model", normalize_model_label(model))],
+        1.0,
+    );
+}
+
+pub fn record_agent_rag(kind: &'static str, outcome: &'static str, duration: Duration, results: usize) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_rag_queries_total",
+        vec![("kind", kind.to_owned()), ("outcome", outcome.to_owned())],
+        1.0,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_rag_duration_seconds",
+        vec![("kind", kind.to_owned()), ("outcome", outcome.to_owned())],
+        duration.as_secs_f64(),
+        FILE_BUCKETS,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_rag_results",
+        vec![("kind", kind.to_owned())],
+        results as f64,
+        &[0.0, 1.0, 2.0, 5.0, 10.0],
+    );
+}
+
+pub fn record_agent_cover_lookup(source: &'static str, outcome: &'static str, bytes: usize) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_cover_lookup_total",
+        vec![("source", source.to_owned()), ("outcome", outcome.to_owned())],
+        1.0,
+    );
+    REGISTRY.inc_counter(
+        "furumusic_agent_cover_bytes_total",
+        vec![("source", source.to_owned())],
+        bytes as f64,
+    );
+}
+
+pub fn record_agent_cover_variant(variant: &'static str, outcome: &'static str, duration: Duration) {
+    REGISTRY.inc_counter(
+        "furumusic_agent_cover_variant_generation_total",
+        vec![
+            ("variant", variant.to_owned()),
+            ("outcome", outcome.to_owned()),
+        ],
+        1.0,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_agent_cover_variant_duration_seconds",
+        vec![
+            ("variant", variant.to_owned()),
+            ("outcome", outcome.to_owned()),
+        ],
+        duration.as_secs_f64(),
+        FILE_BUCKETS,
+    );
+}
+
+pub fn record_scheduler_job(job: &str, trigger: &str, outcome: &'static str, duration_ms: i64) {
+    let labels = vec![
+        ("job", job.to_owned()),
+        ("trigger", trigger.to_owned()),
+        ("outcome", outcome.to_owned()),
+    ];
+    REGISTRY.inc_counter("furumusic_scheduler_job_runs_total", labels.clone(), 1.0);
+    REGISTRY.observe_histogram(
+        "furumusic_scheduler_job_duration_seconds",
+        labels,
+        (duration_ms.max(0) as f64) / 1000.0,
+        JOB_BUCKETS,
+    );
+}
+
+pub fn record_torrent_download(outcome: &'static str, selected_bytes: u64, duration: Duration) {
+    REGISTRY.inc_counter(
+        "furumusic_torrent_downloads_total",
+        vec![("outcome", outcome.to_owned())],
+        1.0,
+    );
+    REGISTRY.inc_counter(
+        "furumusic_torrent_selected_bytes_total",
+        vec![("outcome", outcome.to_owned())],
+        selected_bytes as f64,
+    );
+    REGISTRY.observe_histogram(
+        "furumusic_torrent_download_duration_seconds",
+        vec![("outcome", outcome.to_owned())],
+        duration.as_secs_f64(),
+        JOB_BUCKETS,
+    );
+}
+
+pub async fn render(pool: &PgPool, config: &AppConfig) -> String {
+    let mut out = String::new();
+    emit_static_gauge(&mut out, "furumusic_build_info", &[("version", env!("CARGO_PKG_VERSION"))], 1.0);
+    render_active_users(&mut out);
+    render_storage(&mut out, config);
+    render_db_metrics(&mut out, pool).await;
+    out.push_str(&REGISTRY.render());
+    out
+}
+
+fn render_active_users(out: &mut String) {
+    let mut users = ACTIVE_USERS.lock().expect("active user lock");
+    let now = Instant::now();
+    users.retain(|_, seen| now.duration_since(*seen) <= Duration::from_secs(3600));
+    for (window, seconds) in [("5m", 300), ("15m", 900), ("1h", 3600)] {
+        let count = users
+            .values()
+            .filter(|seen| now.duration_since(**seen) <= Duration::from_secs(seconds))
+            .count();
+        emit_static_gauge(
+            out,
+            "furumusic_active_users",
+            &[("window", window)],
+            count as f64,
+        );
+    }
+}
+
+fn render_storage(out: &mut String, config: &AppConfig) {
+    for (kind, path) in [
+        ("inbox", config.agent_inbox_dir.as_str()),
+        ("library", config.agent_storage_dir.as_str()),
+    ] {
+        if let Some(usage) = disk_usage(Path::new(path.trim())) {
+            emit_static_gauge(
+                out,
+                "furumusic_storage_free_bytes",
+                &[("path_kind", kind)],
+                usage.free_bytes as f64,
+            );
+            emit_static_gauge(
+                out,
+                "furumusic_storage_total_bytes",
+                &[("path_kind", kind)],
+                usage.total_bytes as f64,
+            );
+        }
+    }
+}
+
+async fn render_db_metrics(out: &mut String, pool: &PgPool) {
+    render_group_counts(out, pool, "furumusic_users_total", "SELECT role::text AS label, COUNT(*) AS count FROM furumusic__user GROUP BY role", "role").await;
+    render_single_count(out, pool, "furumusic_library_tracks_total", "SELECT COUNT(*) FROM furumusic__track").await;
+    render_single_count(out, pool, "furumusic_library_releases_total", "SELECT COUNT(*) FROM furumusic__release").await;
+    render_single_count(out, pool, "furumusic_library_artists_total", "SELECT COUNT(*) FROM furumusic__artist").await;
+    render_single_count(out, pool, "furumusic_library_playlists_total", "SELECT COUNT(*) FROM furumusic__playlist").await;
+    render_group_counts(out, pool, "furumusic_media_files_total", "SELECT file_type::text AS label, COUNT(*) AS count FROM furumusic__media_file GROUP BY file_type", "type").await;
+    render_group_sums(out, pool, "furumusic_media_file_bytes_total", "SELECT file_type::text AS label, COALESCE(SUM(file_size_bytes), 0)::bigint AS value FROM furumusic__media_file GROUP BY file_type", "type").await;
+    render_group_counts(out, pool, "furumusic_agent_reviews_total", "SELECT status::text AS label, COUNT(*) AS count FROM furumusic__pending_review GROUP BY status", "status").await;
+    render_group_counts(out, pool, "furumusic_agent_queue_depth", "SELECT status::text AS label, COUNT(*) AS count FROM furumusic__pending_review GROUP BY status", "status").await;
+    render_group_counts(out, pool, "furumusic_scheduler_job_running", "SELECT job_name::text AS label, COUNT(*) AS count FROM furumusic__job_run WHERE status = 'running' GROUP BY job_name", "job").await;
+    render_group_sums(out, pool, "furumusic_scheduler_job_enabled", "SELECT name::text AS label, (CASE WHEN enabled THEN 1 ELSE 0 END)::bigint AS value FROM furumusic__scheduled_job", "job").await;
+    render_group_counts(out, pool, "furumusic_torrent_sessions_total", "SELECT status::text AS label, COUNT(*) AS count FROM furumusic__torrent_session GROUP BY status", "status").await;
+    render_single_count(out, pool, "furumusic_play_history_total", "SELECT COUNT(*) FROM furumusic__play_history").await;
+}
+
+async fn render_single_count(out: &mut String, pool: &PgPool, metric: &'static str, sql: &str) {
+    if let Ok(value) = sqlx::query_scalar::<_, i64>(sql).fetch_one(pool).await {
+        emit_static_gauge(out, metric, &[], value as f64);
+    }
+}
+
+async fn render_group_counts(
+    out: &mut String,
+    pool: &PgPool,
+    metric: &'static str,
+    sql: &str,
+    label_name: &'static str,
+) {
+    if let Ok(rows) = sqlx::query_as::<_, (String, i64)>(sql).fetch_all(pool).await {
+        for (label, count) in rows {
+            emit_static_gauge(out, metric, &[(label_name, label.as_str())], count as f64);
+        }
+    }
+}
+
+async fn render_group_sums(
+    out: &mut String,
+    pool: &PgPool,
+    metric: &'static str,
+    sql: &str,
+    label_name: &'static str,
+) {
+    if let Ok(rows) = sqlx::query_as::<_, (String, i64)>(sql).fetch_all(pool).await {
+        for (label, value) in rows {
+            emit_static_gauge(out, metric, &[(label_name, label.as_str())], value as f64);
+        }
+    }
+}
+
+impl Registry {
+    fn inc_counter(&self, name: &'static str, labels: Vec<(&'static str, String)>, value: f64) {
+        if value <= 0.0 {
+            return;
+        }
+        let mut counters = self.counters.lock().expect("counter lock");
+        *counters.entry(MetricKey::new(name, labels)).or_default() += value;
+    }
+
+    fn inc_gauge(&self, name: &'static str, labels: Vec<(&'static str, String)>, value: f64) {
+        let mut gauges = self.gauges.lock().expect("gauge lock");
+        *gauges.entry(MetricKey::new(name, labels)).or_default() += value;
+    }
+
+    fn observe_histogram(
+        &self,
+        name: &'static str,
+        labels: Vec<(&'static str, String)>,
+        value: f64,
+        buckets: &[f64],
+    ) {
+        let mut histograms = self.histograms.lock().expect("histogram lock");
+        let state = histograms
+            .entry(MetricKey::new(name, labels))
+            .or_insert_with(|| HistogramState {
+                buckets: buckets.to_vec(),
+                counts: vec![0; buckets.len()],
+                sum: 0.0,
+                count: 0,
+            });
+        for (index, bucket) in state.buckets.iter().enumerate() {
+            if value <= *bucket {
+                state.counts[index] += 1;
+            }
+        }
+        state.sum += value;
+        state.count += 1;
+    }
+
+    fn render(&self) -> String {
+        let mut out = String::new();
+        for (key, value) in self.counters.lock().expect("counter lock").iter() {
+            emit_type(&mut out, key.name, "counter");
+            emit_metric(&mut out, key.name, &key.labels, *value);
+        }
+        for (key, value) in self.gauges.lock().expect("gauge lock").iter() {
+            emit_type(&mut out, key.name, "gauge");
+            emit_metric(&mut out, key.name, &key.labels, (*value).max(0.0));
+        }
+        for (key, state) in self.histograms.lock().expect("histogram lock").iter() {
+            emit_type(&mut out, key.name, "histogram");
+            for (bucket, count) in state.buckets.iter().zip(state.counts.iter()) {
+                let mut labels = key.labels.clone();
+                labels.push(("le", bucket.to_string()));
+                emit_metric(&mut out, &format!("{}_bucket", key.name), &labels, *count as f64);
+            }
+            let mut inf_labels = key.labels.clone();
+            inf_labels.push(("le", "+Inf".to_owned()));
+            emit_metric(
+                &mut out,
+                &format!("{}_bucket", key.name),
+                &inf_labels,
+                state.count as f64,
+            );
+            emit_metric(
+                &mut out,
+                &format!("{}_sum", key.name),
+                &key.labels,
+                state.sum,
+            );
+            emit_metric(
+                &mut out,
+                &format!("{}_count", key.name),
+                &key.labels,
+                state.count as f64,
+            );
+        }
+        out
+    }
+}
+
+impl MetricKey {
+    fn new(name: &'static str, mut labels: Vec<(&'static str, String)>) -> Self {
+        labels.sort_by(|a, b| a.0.cmp(b.0));
+        Self { name, labels }
+    }
+}
+
+fn http_labels(method: &Method, route: &str, status: &str) -> Vec<(&'static str, String)> {
+    vec![
+        ("method", method.as_str().to_owned()),
+        ("route", route.to_owned()),
+        ("status", status.to_owned()),
+    ]
+}
+
+fn normalize_route(path: &str) -> String {
+    let mut route = String::with_capacity(path.len());
+    for segment in path.split('/') {
+        if segment.is_empty() {
+            continue;
+        }
+        route.push('/');
+        if segment.parse::<i64>().is_ok() || looks_like_uuid(segment) {
+            route.push_str("{id}");
+        } else {
+            route.push_str(segment);
+        }
+    }
+    if route.is_empty() {
+        "/".to_owned()
+    } else {
+        route
+    }
+}
+
+fn looks_like_uuid(value: &str) -> bool {
+    value.len() == 36
+        && value
+            .chars()
+            .all(|ch| ch.is_ascii_hexdigit() || ch == '-')
+}
+
+fn normalize_model_label(value: &str) -> String {
+    let trimmed = value.trim();
+    if trimmed.is_empty() {
+        "unknown".to_owned()
+    } else {
+        trimmed.chars().take(80).collect()
+    }
+}
+
+fn emit_static_gauge(out: &mut String, name: &str, labels: &[(&str, &str)], value: f64) {
+    emit_type(out, name, "gauge");
+    let labels = labels
+        .iter()
+        .map(|(key, value)| (*key, (*value).to_owned()))
+        .collect::<Vec<_>>();
+    emit_metric(out, name, &labels, value);
+}
+
+fn emit_type(out: &mut String, name: &str, metric_type: &str) {
+    let _ = (out, name, metric_type);
+}
+
+fn emit_metric(out: &mut String, name: &str, labels: &[(&str, String)], value: f64) {
+    out.push_str(name);
+    if !labels.is_empty() {
+        out.push('{');
+        for (index, (key, value)) in labels.iter().enumerate() {
+            if index > 0 {
+                out.push(',');
+            }
+            out.push_str(key);
+            out.push_str("=\"");
+            escape_label(out, value);
+            out.push('"');
+        }
+        out.push('}');
+    }
+    out.push(' ');
+    out.push_str(&format!("{value:.6}"));
+    out.push('\n');
+}
+
+fn escape_label(out: &mut String, value: &str) {
+    for ch in value.chars() {
+        match ch {
+            '\\' => out.push_str("\\\\"),
+            '"' => out.push_str("\\\""),
+            '\n' => out.push_str("\\n"),
+            _ => out.push(ch),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+struct DiskUsage {
+    free_bytes: u64,
+    total_bytes: u64,
+}
+
+#[cfg(windows)]
+fn disk_usage(path: &Path) -> Option<DiskUsage> {
+    use std::os::windows::ffi::OsStrExt;
+
+    #[link(name = "kernel32")]
+    unsafe extern "system" {
+        fn GetDiskFreeSpaceExW(
+            lpDirectoryName: *const u16,
+            lpFreeBytesAvailableToCaller: *mut u64,
+            lpTotalNumberOfBytes: *mut u64,
+            lpTotalNumberOfFreeBytes: *mut u64,
+        ) -> i32;
+    }
+
+    let mut wide: Vec<u16> = path.as_os_str().encode_wide().collect();
+    wide.push(0);
+    let mut free_available = 0_u64;
+    let mut total = 0_u64;
+    let mut total_free = 0_u64;
+    let ok = unsafe {
+        GetDiskFreeSpaceExW(
+            wide.as_ptr(),
+            &mut free_available,
+            &mut total,
+            &mut total_free,
+        )
+    };
+    (ok != 0).then_some(DiskUsage {
+        free_bytes: free_available,
+        total_bytes: total,
+    })
+}
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+fn disk_usage(path: &Path) -> Option<DiskUsage> {
+    use std::ffi::CString;
+    use std::os::unix::ffi::OsStrExt;
+
+    #[repr(C)]
+    struct Statvfs {
+        f_bsize: std::ffi::c_ulong,
+        f_frsize: std::ffi::c_ulong,
+        f_blocks: std::ffi::c_ulong,
+        f_bfree: std::ffi::c_ulong,
+        f_bavail: std::ffi::c_ulong,
+        f_files: std::ffi::c_ulong,
+        f_ffree: std::ffi::c_ulong,
+        f_favail: std::ffi::c_ulong,
+        f_fsid: std::ffi::c_ulong,
+        f_flag: std::ffi::c_ulong,
+        f_namemax: std::ffi::c_ulong,
+        __f_spare: [std::ffi::c_int; 6],
+    }
+
+    unsafe extern "C" {
+        fn statvfs(path: *const std::ffi::c_char, buf: *mut Statvfs) -> std::ffi::c_int;
+    }
+
+    let c_path = CString::new(path.as_os_str().as_bytes()).ok()?;
+    let mut stat = std::mem::MaybeUninit::<Statvfs>::uninit();
+    let ok = unsafe { statvfs(c_path.as_ptr(), stat.as_mut_ptr()) };
+    if ok != 0 {
+        return None;
+    }
+    let stat = unsafe { stat.assume_init() };
+    let fragment_size = if stat.f_frsize > 0 {
+        stat.f_frsize as u64
+    } else {
+        stat.f_bsize as u64
+    };
+    Some(DiskUsage {
+        free_bytes: stat.f_bavail as u64 * fragment_size,
+        total_bytes: stat.f_blocks as u64 * fragment_size,
+    })
+}
+
+#[cfg(not(any(windows, target_os = "linux", target_os = "android")))]
+fn disk_usage(_path: &Path) -> Option<DiskUsage> {
+    None
+}

src/music/mod.rs

@@ -1815,6 +1815,56 @@ pub mod db_migrations {
             &[Operation::custom(create_artwork_lookup_state).build()];
     }
 
+    // -- M0035: Weighted metadata tags for tracks, releases, and artists ----
+
+    #[cot::db::migrations::migration_op]
+    async fn create_entity_genre_tags(
+        ctx: migrations::MigrationContext<'_>,
+    ) -> cot::db::Result<()> {
+        ctx.db
+            .raw(
+                "CREATE TABLE IF NOT EXISTS furumusic__entity_genre_tag (
+                    id BIGSERIAL PRIMARY KEY,
+                    entity_kind VARCHAR(32) NOT NULL,
+                    entity_id BIGINT NOT NULL,
+                    genre_id BIGINT NOT NULL,
+                    source VARCHAR(32) NOT NULL,
+                    weight DOUBLE PRECISION NOT NULL DEFAULT 1,
+                    updated_at VARCHAR(32) NOT NULL,
+                    UNIQUE(entity_kind, entity_id, genre_id, source)
+                )",
+            )
+            .await?;
+        ctx.db
+            .raw(
+                "CREATE INDEX IF NOT EXISTS idx_entity_genre_tag_entity
+                   ON furumusic__entity_genre_tag (entity_kind, entity_id, source)",
+            )
+            .await?;
+        ctx.db
+            .raw(
+                "CREATE INDEX IF NOT EXISTS idx_entity_genre_tag_genre
+                   ON furumusic__entity_genre_tag (genre_id, entity_kind)",
+            )
+            .await?;
+        Ok(())
+    }
+
+    #[derive(Debug, Copy, Clone)]
+    pub struct M0035CreateEntityGenreTags;
+
+    impl migrations::Migration for M0035CreateEntityGenreTags {
+        const APP_NAME: &'static str = "furumusic";
+        const MIGRATION_NAME: &'static str = "m_0035_create_entity_genre_tags";
+        const DEPENDENCIES: &'static [migrations::MigrationDependency] =
+            &[migrations::MigrationDependency::migration(
+                "furumusic",
+                "m_0034_create_artwork_lookup_state",
+            )];
+        const OPERATIONS: &'static [Operation] =
+            &[Operation::custom(create_entity_genre_tags).build()];
+    }
+
     pub const MIGRATIONS: &[&SyncDynMigration] = &[
         &M0006CreateMediaFile,
         &M0007CreateArtist,
@@ -1840,5 +1890,6 @@ pub mod db_migrations {
         &M0032CreateLastfmTrackPopularity,
         &M0033CreateLastfmScrobbling,
         &M0034CreateArtworkLookupState,
+        &M0035CreateEntityGenreTags,
     ];
 }

src/oidc.rs

@@ -172,6 +172,7 @@ pub async fn oidc_start_handler(
         || config.oidc_client_secret.is_empty()
     {
         tracing::warn!("OIDC start requested but SSO is not configured");
+        crate::metrics::record_auth_attempt("oidc", "failure", "not_configured");
         return redirect_login_with_error(i18n.t.login_sso_disabled);
     }
 
@@ -180,6 +181,7 @@ pub async fn oidc_start_handler(
         Ok(c) => c,
         Err(e) => {
             tracing::error!("OIDC provider error: {e}");
+            crate::metrics::record_auth_attempt("oidc", "failure", "provider_error");
             return redirect_login_with_error(i18n.t.login_oidc_error);
         }
     };
@@ -276,19 +278,23 @@ pub async fn oidc_callback_handler(
     // Validate CSRF state.
     let Some(saved_csrf) = saved_csrf else {
         tracing::warn!("OIDC callback: no CSRF state in session");
+        crate::metrics::record_auth_attempt("oidc", "failure", "missing_state");
         return redirect_login_with_error(i18n.t.login_oidc_error);
     };
     if query.state != saved_csrf {
         tracing::warn!("OIDC callback: CSRF state mismatch");
+        crate::metrics::record_auth_attempt("oidc", "failure", "csrf");
         return redirect_login_with_error(i18n.t.login_oidc_error);
     }
 
     let Some(nonce_str) = saved_nonce else {
         tracing::warn!("OIDC callback: no nonce in session");
+        crate::metrics::record_auth_attempt("oidc", "failure", "missing_nonce");
         return redirect_login_with_error(i18n.t.login_oidc_error);
     };
     let Some(pkce_str) = saved_pkce else {
         tracing::warn!("OIDC callback: no PKCE verifier in session");
+        crate::metrics::record_auth_attempt("oidc", "failure", "missing_pkce");
         return redirect_login_with_error(i18n.t.login_oidc_error);
     };
 
@@ -300,6 +306,7 @@ pub async fn oidc_callback_handler(
         Ok(c) => c,
         Err(e) => {
             tracing::error!("OIDC provider error during callback: {e}");
+            crate::metrics::record_auth_attempt("oidc", "failure", "provider_error");
             return redirect_login_with_error(i18n.t.login_oidc_error);
         }
     };
@@ -318,6 +325,7 @@ pub async fn oidc_callback_handler(
         Ok(req) => req,
         Err(e) => {
             tracing::error!("OIDC token endpoint not configured: {e}");
+            crate::metrics::record_auth_attempt("oidc", "failure", "token_config");
             return redirect_login_with_error(i18n.t.login_oidc_error);
         }
     };
@@ -330,6 +338,7 @@ pub async fn oidc_callback_handler(
         Ok(t) => t,
         Err(e) => {
             tracing::error!("OIDC token exchange failed: {e}");
+            crate::metrics::record_auth_attempt("oidc", "failure", "token_exchange");
             return redirect_login_with_error(i18n.t.login_oidc_error);
         }
     };
@@ -340,6 +349,7 @@ pub async fn oidc_callback_handler(
         Some(t) => t,
         None => {
             tracing::error!("OIDC response missing ID token");
+            crate::metrics::record_auth_attempt("oidc", "failure", "missing_id_token");
             return redirect_login_with_error(i18n.t.login_oidc_error);
         }
     };
@@ -348,6 +358,7 @@ pub async fn oidc_callback_handler(
         Ok(c) => c,
         Err(e) => {
             tracing::error!("OIDC ID token verification failed: {e}");
+            crate::metrics::record_auth_attempt("oidc", "failure", "id_token_verify");
             return redirect_login_with_error(i18n.t.login_oidc_error);
         }
     };
@@ -395,6 +406,7 @@ pub async fn oidc_callback_handler(
             config.oidc_user_groups,
             config.oidc_admin_groups,
         );
+        crate::metrics::record_auth_attempt("oidc", "failure", "not_in_group");
         return redirect_login_with_error(i18n.t.login_access_denied);
     }
 
@@ -413,12 +425,15 @@ pub async fn oidc_callback_handler(
         Ok(u) => u,
         Err(e) => {
             tracing::error!("OIDC user provisioning failed: {e}");
+            crate::metrics::record_auth_attempt("oidc", "failure", "provisioning");
             return redirect_login_with_error(i18n.t.login_oidc_error);
         }
     };
 
     // Log the user in.
     auth::login(&session, user.id_val()).await?;
+    crate::metrics::record_auth_attempt("oidc", "success", "ok");
+    crate::metrics::record_session_created("oidc");
 
     // Clear OIDC session keys.
     let _: Option<String> = session

src/player/dto.rs

@@ -36,6 +36,7 @@ pub(super) struct ArtistDetail {
     pub(super) image_url: Option<String>,
     pub(super) total_track_count: i64,
     pub(super) total_play_count: i64,
+    pub(super) top_tracks: Vec<TrackItem>,
     pub(super) releases: Vec<ReleaseCard>,
     pub(super) featured_tracks: Vec<ArtistAppearanceTrack>,
 }
@@ -463,6 +464,7 @@ pub(super) struct PlayHistoryItem {
     pub(super) track_id: i64,
     pub(super) track_title: String,
     pub(super) release_title: Option<String>,
+    pub(super) track: TrackItem,
     pub(super) played_at: String,
     pub(super) duration_listened: Option<i32>,
     pub(super) completed: bool,

src/player/queries.rs

@@ -49,6 +49,7 @@ pub(super) struct RemoveTrackRequest {
 pub(super) struct PaginationQuery {
     pub(super) page: Option<i32>,
     pub(super) limit: Option<i32>,
+    pub(super) mine: Option<bool>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -61,6 +62,12 @@ pub(super) struct PathStringId {
     pub(super) id: String,
 }
 
+#[derive(Debug, Deserialize)]
+pub(super) struct PathRadioSeed {
+    pub(super) kind: String,
+    pub(super) id: i64,
+}
+
 #[derive(Debug, Deserialize)]
 pub(super) struct SearchQuery {
     pub(super) q: String,

src/player/rows.rs

@@ -36,30 +36,6 @@ pub(super) struct ArtistBriefRow {
     pub(super) name: String,
 }
 
-#[derive(sqlx::FromRow)]
-pub(super) struct TrackRow {
-    pub(super) id: i64,
-    pub(super) title: String,
-    pub(super) track_number: Option<i32>,
-    pub(super) disc_number: Option<i32>,
-    pub(super) duration_seconds: f64,
-    pub(super) cover_file_id: Option<i64>,
-    pub(super) release_cover_file_id: Option<i64>,
-    pub(super) release_id: i64,
-    pub(super) release_title: String,
-    pub(super) release_year: Option<i32>,
-    pub(super) uploader_name: String,
-    pub(super) audio_format: Option<String>,
-    pub(super) audio_bitrate: Option<i32>,
-    pub(super) audio_sample_rate: Option<i32>,
-    pub(super) audio_bit_depth: Option<i32>,
-    pub(super) file_size_bytes: Option<i64>,
-    pub(super) lastfm_listeners: Option<i64>,
-    pub(super) lastfm_playcount: Option<i64>,
-    pub(super) lastfm_rating: Option<f64>,
-    pub(super) lastfm_updated_at: Option<String>,
-}
-
 #[derive(sqlx::FromRow)]
 pub(super) struct TrackArtistRow {
     pub(super) track_id: i64,
@@ -276,14 +252,31 @@ pub(super) struct ReleaseUploaderRow {
 }
 
 #[derive(sqlx::FromRow)]
-pub(super) struct PlayHistoryRow {
+pub(super) struct PlayHistoryTrackRow {
-    pub(super) id: i64,
+    pub(super) history_id: i64,
-    pub(super) track_id: i64,
-    pub(super) track_title: String,
-    pub(super) release_title: Option<String>,
     pub(super) played_at: String,
     pub(super) duration_listened: Option<i32>,
     pub(super) completed: bool,
+    pub(super) id: i64,
+    pub(super) title: String,
+    pub(super) track_number: Option<i32>,
+    pub(super) disc_number: Option<i32>,
+    pub(super) duration_seconds: f64,
+    pub(super) cover_file_id: Option<i64>,
+    pub(super) release_cover_file_id: Option<i64>,
+    pub(super) release_id: i64,
+    pub(super) release_title: String,
+    pub(super) release_year: Option<i32>,
+    pub(super) uploader_name: String,
+    pub(super) audio_format: Option<String>,
+    pub(super) audio_bitrate: Option<i32>,
+    pub(super) audio_sample_rate: Option<i32>,
+    pub(super) audio_bit_depth: Option<i32>,
+    pub(super) file_size_bytes: Option<i64>,
+    pub(super) lastfm_listeners: Option<i64>,
+    pub(super) lastfm_playcount: Option<i64>,
+    pub(super) lastfm_rating: Option<f64>,
+    pub(super) lastfm_updated_at: Option<String>,
 }
 
 #[derive(sqlx::FromRow)]

src/scheduler/mod.rs

@@ -200,6 +200,12 @@ impl JobRun {
         duration_ms: i64,
         log: &str,
     ) -> cot::db::Result<()> {
+        crate::metrics::record_scheduler_job(
+            self.job_name.as_str(),
+            self.trigger.as_str(),
+            "completed",
+            duration_ms,
+        );
         self.status = LimitedString::new("completed").unwrap();
         self.finished_at = Some(now_iso().to_string());
         self.duration_ms = Some(duration_ms);
@@ -214,6 +220,12 @@ impl JobRun {
         log: &str,
         error: &str,
     ) -> cot::db::Result<()> {
+        crate::metrics::record_scheduler_job(
+            self.job_name.as_str(),
+            self.trigger.as_str(),
+            "failed",
+            duration_ms,
+        );
         self.status = LimitedString::new("failed").unwrap();
         self.finished_at = Some(now_iso().to_string());
         self.duration_ms = Some(duration_ms);

src/torrents.rs

@@ -777,7 +777,7 @@ impl TorrentService {
 
         self.ensure_memory_job(pool, uploader_user_id, id).await?;
 
-        let (torrent_bytes, output_dir) = {
+        let (torrent_bytes, output_dir, selected_size) = {
             let mut jobs = self.jobs.lock().await;
             let job = jobs.get_mut(id).context("torrent job not found")?;
             if job.user_id != uploader_user_id {
@@ -800,7 +800,11 @@ impl TorrentService {
             job.error = None;
             job.completed_at = None;
             job.updated_at = now_string();
-            (job.torrent_bytes.clone(), job.output_dir.clone())
+            (
+                job.torrent_bytes.clone(),
+                job.output_dir.clone(),
+                job.selected_size(),
+            )
         };
 
         tokio::fs::create_dir_all(&output_dir).await?;
@@ -846,6 +850,7 @@ impl TorrentService {
         let service = Arc::clone(self);
         let pool = pool.clone();
         let id = id.to_string();
+        let download_start = std::time::Instant::now();
         tokio::spawn(async move {
             if let Err(err) = handle.wait_until_completed().await {
                 if service.is_paused(&id).await {
@@ -853,6 +858,11 @@ impl TorrentService {
                 }
                 service.stop_torrent(&handle).await;
                 service.fail_job(&pool, &id, err.to_string()).await;
+                crate::metrics::record_torrent_download(
+                    "failed",
+                    selected_size,
+                    download_start.elapsed(),
+                );
                 return;
             }
             service.stop_torrent(&handle).await;
@@ -861,6 +871,17 @@ impl TorrentService {
                 .await
             {
                 service.fail_job(&pool, &id, err.to_string()).await;
+                crate::metrics::record_torrent_download(
+                    "failed",
+                    selected_size,
+                    download_start.elapsed(),
+                );
+            } else {
+                crate::metrics::record_torrent_download(
+                    "completed",
+                    selected_size,
+                    download_start.elapsed(),
+                );
             }
         });
 

templates/admin/job_detail.html

@@ -46,6 +46,12 @@
         <label style="display:inline-flex; gap:.35rem; align-items:center; margin-right:1rem; margin-bottom:.4rem;">
             <input type="checkbox" name="duration_seconds" checked> duration_seconds
         </label>
+        <label style="display:inline-flex; gap:.35rem; align-items:center; margin-right:1rem; margin-bottom:.4rem;">
+            <input type="checkbox" name="local_genres" checked> local genres from files
+        </label>
+        <label style="display:inline-flex; gap:.35rem; align-items:center; margin-right:1rem; margin-bottom:.4rem;">
+            <input type="checkbox" name="lastfm_tags" checked> Last.fm tags
+        </label>
     </fieldset>
     <div style="display:flex; gap:1rem; align-items:center; margin-bottom:.9rem;">
         <label style="display:inline-flex; gap:.35rem; align-items:center;">

templates/player/modals.html

@@ -11,6 +11,13 @@
                         </svg>
                     </button>
                 </div>
+                <div class="info-actions" x-show="$store.info.modal.actions && $store.info.modal.actions.length">
+                    <template x-for="(action, idx) in $store.info.modal.actions" :key="action.label + '-' + idx">
+                        <button class="info-action-btn" type="button" @click.stop.prevent="$store.info.runAction(idx)" :disabled="action.busy === true">
+                            <span x-text="action.busy ? '{{ t.player_resolving }}' : action.label"></span>
+                        </button>
+                    </template>
+                </div>
                 <div class="info-modal-body">
                     <template x-if="$store.info.modal.rows && $store.info.modal.rows.length">
                         <table class="info-table">
@@ -115,11 +122,11 @@
                 <div class="torrent-tabs">
                     <button class="torrent-tab-btn"
                             :class="{ active: $store.torrents.activeTab === 'import' }"
-                            @click="$store.torrents.showImportTab()">Import</button>
+                            @click="$store.torrents.showImportTab()">{{ t.player_import }}</button>
                     <button class="torrent-tab-btn"
                             :class="{ active: $store.torrents.activeTab === 'uploads' }"
                             @click="$store.torrents.showUploadsTab()">
-                        <span>My uploads</span>
+                        <span>{{ t.player_my_uploads }}</span>
                         <span class="torrent-tab-count"
                               x-show="$store.torrents.uploadPendingTotal + $store.torrents.uploadQueuedTotal > 0"
                               x-text="$store.torrents.uploadPendingTotal + $store.torrents.uploadQueuedTotal"></span>
@@ -340,7 +347,7 @@
                     <section class="upload-manager-panel">
                         <div class="upload-manager-head">
                             <div>
-                                <h4>My uploaded tracks</h4>
+                                <h4>{{ t.player_my_uploaded_tracks }}</h4>
                                 <p x-text="$store.torrents.uploadSummary()"></p>
                             </div>
                             <button class="modal-btn modal-btn-ghost"
@@ -350,22 +357,22 @@
 
                         <template x-if="$store.torrents.uploadLoaded && $store.torrents.uploadTracks.length === 0 && $store.torrents.uploadPending.length === 0 && $store.torrents.uploadQueued.length === 0">
                             <div class="empty-state torrent-workspace-empty">
-                                <p>No uploaded tracks yet</p>
+                                <p>{{ t.player_no_uploaded_tracks }}</p>
                             </div>
                         </template>
 
                         <div class="upload-manager-grid">
                             <aside class="upload-review-column">
                                 <div class="upload-panel-card">
-                                    <div class="upload-panel-title">Needs approval</div>
+                                    <div class="upload-panel-title">{{ t.player_needs_approval }}</div>
-                                    <p class="upload-panel-subtitle" x-text="$store.torrents.uploadPendingTotal + ' pending or failed'"></p>
+                                    <p class="upload-panel-subtitle" x-text="$store.torrents.uploadPendingTotal + ' {{ t.player_pending_or_failed }}'"></p>
                                     <template x-if="$store.torrents.uploadPending.length === 0">
-                                        <div class="upload-mini-empty">No tracks need approval</div>
+                                        <div class="upload-mini-empty">{{ t.player_no_tracks_need_approval }}</div>
                                     </template>
                                     <div class="upload-review-list">
                                         <template x-for="item in $store.torrents.uploadPending" :key="item.id">
                                             <button class="upload-review-row" :class="{ active: $store.torrents.uploadReviewEditId === item.id, failed: item.status === 'failed' }" @click="$store.torrents.editUploadReview(item)">
-                                                <span class="torrent-status-badge" :class="'status-' + item.status" x-text="item.status"></span>
+                                                <span class="torrent-status-badge" :class="'status-' + item.status" x-text="$store.torrents.uploadStatusLabel(item.status)"></span>
                                                 <span class="upload-review-name" x-text="item.filename"></span>
                                                 <span class="upload-review-error" x-show="item.error_message" x-text="item.error_message"></span>
                                             </button>
@@ -374,67 +381,94 @@
                                 </div>
                                 <template x-if="$store.torrents.uploadQueuedTotal > 0">
                                     <div class="upload-panel-card upload-queue-panel">
-                                        <div class="upload-panel-title">Queued / processing</div>
+                                        <div class="upload-panel-title upload-panel-title-row">
+                                            <span>{{ t.player_queued_processing }}</span>
+                                            <div class="upload-queue-nav" x-show="$store.torrents.uploadQueued.length > $store.torrents.uploadQueuePageSize">
+                                                <span class="upload-queue-range" x-text="$store.torrents.uploadQueueRangeText()"></span>
+                                                <button type="button"
+                                                        class="upload-queue-nav-btn"
+                                                        @click="$store.torrents.uploadQueuePrev()"
+                                                        :disabled="!$store.torrents.uploadQueueCanPrev()"
+                                                        title="{{ t.player_previous }}">
+                                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4"><polyline points="15 18 9 12 15 6"/></svg>
+                                                </button>
+                                                <button type="button"
+                                                        class="upload-queue-nav-btn"
+                                                        @click="$store.torrents.uploadQueueNext()"
+                                                        :disabled="!$store.torrents.uploadQueueCanNext()"
+                                                        title="{{ t.player_next }}">
+                                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4"><polyline points="9 18 15 12 9 6"/></svg>
+                                                </button>
+                                            </div>
+                                        </div>
                                         <template x-for="item in $store.torrents.compactQueuedUploads()" :key="item.id">
-                                            <div class="upload-queue-row">
+                                            <div class="upload-queue-row" :title="$store.torrents.uploadQueueTooltip(item)">
-                                                <span class="torrent-status-badge" :class="'status-' + item.status" x-text="item.status"></span>
+                                                <span class="torrent-status-badge" :class="'status-' + item.status" x-text="$store.torrents.uploadStatusLabel(item.status)"></span>
                                                 <span class="upload-queue-name" x-text="item.filename"></span>
                                             </div>
                                         </template>
-                                        <div class="upload-mini-empty" x-show="$store.torrents.uploadQueuedTotal > $store.torrents.uploadQueued.length" x-text="'Showing ' + $store.torrents.uploadQueued.length + ' of ' + $store.torrents.uploadQueuedTotal"></div>
+                                        <div class="upload-mini-empty" x-show="$store.torrents.uploadQueuedTotal > $store.torrents.uploadQueued.length" x-text="$store.torrents.uploadQueueOverflowText()"></div>
                                     </div>
                                 </template>
                             </aside>
                             <section class="upload-library-column">
                                 <div class="upload-bulk-bar" x-show="$store.torrents.uploadSelectedCount() > 0">
-                                    <div class="upload-bulk-title" x-text="$store.torrents.uploadSelectedCount() + ' selected'"></div>
+                                    <div class="upload-bulk-title" x-text="$store.torrents.uploadSelectedCount() + ' {{ t.player_selected }}'"></div>
-                                    <input type="text" placeholder="Artists" x-model="$store.torrents.uploadBulkDraft.artists">
+                                    <input type="text" placeholder="{{ t.player_artists }}" x-model="$store.torrents.uploadBulkDraft.artists">
-                                    <input type="text" placeholder="Featured" x-model="$store.torrents.uploadBulkDraft.featured_artists">
+                                    <input type="text" placeholder="{{ t.player_featured }}" x-model="$store.torrents.uploadBulkDraft.featured_artists">
-                                    <input type="text" placeholder="Album" x-model="$store.torrents.uploadBulkDraft.release_title">
+                                    <input type="text" placeholder="{{ t.player_album }}" x-model="$store.torrents.uploadBulkDraft.release_title">
-                                    <input type="number" placeholder="Year" x-model="$store.torrents.uploadBulkDraft.release_year">
+                                    <input type="number" placeholder="{{ t.player_year }}" x-model="$store.torrents.uploadBulkDraft.release_year">
                                     <select x-model="$store.torrents.uploadBulkDraft.release_type">
-                                        <option value="">Type unchanged</option><option value="album">Album</option><option value="single">Single</option><option value="ep">EP</option><option value="compilation">Compilation</option><option value="mixtape">Mixtape</option><option value="live">Live</option><option value="soundtrack">Soundtrack</option><option value="remix">Remix</option><option value="demo">Demo</option>
+                                        <option value="">{{ t.player_type_unchanged }}</option><option value="album">{{ t.player_release_type_album }}</option><option value="single">{{ t.player_release_type_single }}</option><option value="ep">{{ t.player_release_type_ep }}</option><option value="compilation">{{ t.player_release_type_compilation }}</option><option value="mixtape">{{ t.player_release_type_mixtape }}</option><option value="live">{{ t.player_release_type_live }}</option><option value="soundtrack">{{ t.player_release_type_soundtrack }}</option><option value="remix">{{ t.player_release_type_remix }}</option><option value="demo">{{ t.player_release_type_demo }}</option>
                                     </select>
                                     <select x-model="$store.torrents.uploadBulkDraft.hidden">
-                                        <option value="">Visibility unchanged</option><option value="false">Visible</option><option value="true">Hidden</option>
+                                        <option value="">{{ t.player_visibility_unchanged }}</option><option value="false">{{ t.player_visible }}</option><option value="true">{{ t.player_hidden }}</option>
                                     </select>
-                                    <button class="modal-btn modal-btn-primary" @click="$store.torrents.saveUploadBulkEdit()" :disabled="$store.torrents.uploadBulkSaving">Apply</button>
+                                    <button class="modal-btn modal-btn-primary" @click="$store.torrents.saveUploadBulkEdit()" :disabled="$store.torrents.uploadBulkSaving">{{ t.player_apply }}</button>
-                                    <button class="modal-btn modal-btn-ghost" @click="$store.torrents.clearUploadSelection()">Clear</button>
+                                    <button class="modal-btn modal-btn-ghost" @click="$store.torrents.clearUploadSelection()">{{ t.player_clear }}</button>
                                 </div>
                                 <div class="upload-release-tree">
-                                    <template x-for="release in $store.torrents.uploadReleases" :key="release.id">
+                                    <template x-for="group in $store.torrents.uploadArtistGroups()" :key="group.key">
-                                        <div class="upload-release-node" :class="{ hidden: release.is_hidden }">
+                                        <section class="upload-artist-group">
-                                            <div class="upload-release-row">
+                                            <div class="upload-artist-row">
-                                                <button class="torrent-tree-check" :class="$store.torrents.uploadReleaseSelectionState(release)" @click="$store.torrents.toggleUploadReleaseSelection(release)">
+                                                <div class="upload-artist-name" x-text="group.name"></div>
-                                                    <template x-if="$store.torrents.uploadReleaseSelectionState(release) === 'checked'"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><polyline points="20 6 9 17 4 12"/></svg></template>
+                                                <div class="upload-artist-meta" x-text="group.releases.length + ' {{ t.player_releases_count }} - ' + group.trackCount + ' {{ t.player_tracks_count }}'"></div>
-                                                    <template x-if="$store.torrents.uploadReleaseSelectionState(release) === 'partial'"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><line x1="5" y1="12" x2="19" y2="12"/></svg></template>
-                                                </button>
-                                                <button class="torrent-tree-toggle" :class="{ expanded: $store.torrents.uploadReleaseExpanded(release.id) }" @click="$store.torrents.toggleUploadRelease(release.id)"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="9 18 15 12 9 6"/></svg></button>
-                                                <div class="upload-release-main">
-                                                    <div class="upload-release-title"><span x-text="release.title"></span><span class="upload-hidden-pill" x-show="release.is_hidden">hidden</span></div>
-                                                    <div class="upload-track-meta"><span x-text="$store.torrents.uploadReleaseArtistsText(release)"></span><span>-</span><span x-text="release.year || 'no year'"></span><span>-</span><span x-text="release.tracks.length + ' tracks'"></span></div>
-                                                </div>
-                                                <button class="modal-btn modal-btn-ghost" @click="$store.torrents.editUploadRelease(release)">Edit release</button>
                                             </div>
-                                            <div class="upload-track-children" x-show="$store.torrents.uploadReleaseExpanded(release.id)">
+                                            <template x-for="release in group.releases" :key="release.id">
-                                                <template x-for="item in release.tracks" :key="item.track.id">
+                                                <div class="upload-release-node" :class="{ hidden: release.is_hidden }">
-                                                    <div class="upload-tree-track" :class="{ hidden: item.is_hidden, selected: $store.torrents.selectedUploadTracks.has(item.track.id) }">
+                                                    <div class="upload-release-row">
-                                                        <button class="torrent-tree-check" :class="{ checked: $store.torrents.selectedUploadTracks.has(item.track.id) }" @click="$store.torrents.toggleUploadTrackSelection(item.track.id)">
+                                                        <button class="torrent-tree-check" :class="$store.torrents.uploadReleaseSelectionState(release)" @click="$store.torrents.toggleUploadReleaseSelection(release)">
-                                                            <template x-if="$store.torrents.selectedUploadTracks.has(item.track.id)"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><polyline points="20 6 9 17 4 12"/></svg></template>
+                                                            <template x-if="$store.torrents.uploadReleaseSelectionState(release) === 'checked'"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><polyline points="20 6 9 17 4 12"/></svg></template>
+                                                            <template x-if="$store.torrents.uploadReleaseSelectionState(release) === 'partial'"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><line x1="5" y1="12" x2="19" y2="12"/></svg></template>
                                                         </button>
-                                                        <div class="upload-track-main">
+                                                        <button class="torrent-tree-toggle" :class="{ expanded: $store.torrents.uploadReleaseExpanded(release.id) }" @click="$store.torrents.toggleUploadRelease(release.id)"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="9 18 15 12 9 6"/></svg></button>
-                                                            <div class="upload-track-title"><span x-text="item.track.track_number ? item.track.track_number + '. ' + item.track.title : item.track.title"></span><span class="upload-hidden-pill" x-show="item.is_hidden">hidden</span></div>
+                                                        <div class="upload-release-main">
-                                                            <div class="upload-track-meta"><span x-text="$store.torrents.uploadArtistsText(item)"></span><span x-show="$store.torrents.uploadFeaturedArtistsText(item)">feat.</span><span x-show="$store.torrents.uploadFeaturedArtistsText(item)" x-text="$store.torrents.uploadFeaturedArtistsText(item)"></span></div>
+                                                            <div class="upload-release-title"><span x-text="release.title"></span><span class="upload-hidden-pill" x-show="release.is_hidden">{{ t.player_hidden }}</span></div>
-                                                        </div>
+                                                            <div class="upload-track-meta"><span x-text="$store.torrents.uploadReleaseArtistsText(release)"></span><span>-</span><span x-text="release.year || T.noYear"></span><span>-</span><span x-text="release.tracks.length + ' {{ t.player_tracks_count }}'"></span></div>
-                                                        <div class="upload-track-actions">
-                                                            <button class="track-action-btn queue-insert-btn queue-next-btn" @click="$store.queue.addNextInQueue([item.track])" title="{{ t.player_play_next }}"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h10M5 12h7M5 18h10"/><path d="M17 9l4 3-4 3" fill="currentColor" stroke="none"/></svg></button>
-                                                            <button class="track-action-btn queue-insert-btn queue-end-btn" @click="$store.queue.addToEnd([item.track])" title="{{ t.player_add_to_queue }}"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg></button>
-                                                            <button class="modal-btn modal-btn-ghost" @click="$store.torrents.editUpload(item)">Edit</button>
                                                         </div>
+                                                        <button class="modal-btn modal-btn-ghost" @click="$store.torrents.editUploadRelease(release)">{{ t.player_edit_release }}</button>
                                                     </div>
-                                                </template>
+                                                    <div class="upload-track-children" x-show="$store.torrents.uploadReleaseExpanded(release.id)">
-                                            </div>
+                                                        <template x-for="item in release.tracks" :key="item.track.id">
-                                        </div>
+                                                            <div class="upload-tree-track" :class="{ hidden: item.is_hidden, selected: $store.torrents.selectedUploadTracks.has(item.track.id) }">
+                                                                <button class="torrent-tree-check" :class="{ checked: $store.torrents.selectedUploadTracks.has(item.track.id) }" @click="$store.torrents.toggleUploadTrackSelection(item.track.id)">
+                                                                    <template x-if="$store.torrents.selectedUploadTracks.has(item.track.id)"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3"><polyline points="20 6 9 17 4 12"/></svg></template>
+                                                                </button>
+                                                                <div class="upload-track-main">
+                                                                    <div class="upload-track-title"><span x-text="item.track.track_number ? item.track.track_number + '. ' + item.track.title : item.track.title"></span><span class="upload-hidden-pill" x-show="item.is_hidden">{{ t.player_hidden }}</span></div>
+                                                                    <div class="upload-track-meta"><span x-text="$store.torrents.uploadArtistsText(item)"></span><span x-show="$store.torrents.uploadFeaturedArtistsText(item)" x-text="T.featuredShort"></span><span x-show="$store.torrents.uploadFeaturedArtistsText(item)" x-text="$store.torrents.uploadFeaturedArtistsText(item)"></span></div>
+                                                                </div>
+                                                                <div class="upload-track-actions">
+                                                                    <button class="track-action-btn queue-insert-btn queue-next-btn" @click="$store.queue.addNextInQueue([item.track])" title="{{ t.player_play_next }}"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h10M5 12h7M5 18h10"/><path d="M17 9l4 3-4 3" fill="currentColor" stroke="none"/></svg></button>
+                                                                    <button class="track-action-btn queue-insert-btn queue-end-btn" @click="$store.queue.addToEnd([item.track])" title="{{ t.player_add_to_queue }}"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg></button>
+                                                                    <button class="modal-btn modal-btn-ghost" @click="$store.torrents.editUpload(item)">{{ t.player_edit }}</button>
+                                                                </div>
+                                                            </div>
+                                                        </template>
+                                                    </div>
+                                                </div>
+                                            </template>
+                                        </section>
                                     </template>
                                 </div>
                             </section>
@@ -448,7 +482,7 @@
                                             <div class="upload-panel-title" x-text="$store.torrents.uploadEditorKicker()"></div>
                                             <h4 x-text="$store.torrents.uploadEditorTitle()"></h4>
                                         </div>
-                                        <button class="track-action-btn" @click="$store.torrents.closeUploadEditor()" title="Close">
+                                        <button class="track-action-btn" @click="$store.torrents.closeUploadEditor()" title="{{ t.player_close }}">
                                             <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4">
                                                 <path d="M18 6L6 18M6 6l12 12"/>
                                             </svg>
@@ -457,53 +491,53 @@
 
                                     <template x-if="$store.torrents.uploadReviewDraft">
                                         <div class="upload-editor-form">
-                                            <label class="upload-field upload-field-half"><span>Title</span><input type="text" x-model="$store.torrents.uploadReviewDraft.title"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_title }}</span><input type="text" x-model="$store.torrents.uploadReviewDraft.title"></label>
-                                            <label class="upload-field upload-field-half"><span>Artist</span><input type="text" x-model="$store.torrents.uploadReviewDraft.artist"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_artist }}</span><input type="text" x-model="$store.torrents.uploadReviewDraft.artist"></label>
-                                            <label class="upload-field upload-field-half"><span>Album</span><input type="text" x-model="$store.torrents.uploadReviewDraft.album"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_album }}</span><input type="text" x-model="$store.torrents.uploadReviewDraft.album"></label>
-                                            <label class="upload-field upload-field-half"><span>Featured</span><input type="text" x-model="$store.torrents.uploadReviewDraft.featured_artists" placeholder="Artist, Artist"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_featured }}</span><input type="text" x-model="$store.torrents.uploadReviewDraft.featured_artists" placeholder="{{ t.player_artists_placeholder }}"></label>
-                                            <label class="upload-field upload-field-compact"><span>Year</span><input type="number" x-model="$store.torrents.uploadReviewDraft.year"></label>
+                                            <label class="upload-field upload-field-compact"><span>{{ t.player_year }}</span><input type="number" x-model="$store.torrents.uploadReviewDraft.year"></label>
-                                            <label class="upload-field upload-field-compact"><span>Track #</span><input type="number" min="1" x-model="$store.torrents.uploadReviewDraft.track_number"></label>
+                                            <label class="upload-field upload-field-compact"><span>{{ t.player_track_number }}</span><input type="number" min="1" x-model="$store.torrents.uploadReviewDraft.track_number"></label>
-                                            <label class="upload-field upload-field-compact"><span>Genre</span><input type="text" x-model="$store.torrents.uploadReviewDraft.genre"></label>
+                                            <label class="upload-field upload-field-compact"><span>{{ t.player_genre }}</span><input type="text" x-model="$store.torrents.uploadReviewDraft.genre"></label>
                                             <label class="upload-field upload-field-compact">
-                                                <span>Type</span>
+                                                <span>{{ t.player_type }}</span>
                                                 <select x-model="$store.torrents.uploadReviewDraft.release_type">
-                                                    <option value="album">Album</option><option value="single">Single</option><option value="ep">EP</option><option value="compilation">Compilation</option><option value="mixtape">Mixtape</option><option value="live">Live</option><option value="soundtrack">Soundtrack</option><option value="remix">Remix</option><option value="demo">Demo</option>
+                                                    <option value="album">{{ t.player_release_type_album }}</option><option value="single">{{ t.player_release_type_single }}</option><option value="ep">{{ t.player_release_type_ep }}</option><option value="compilation">{{ t.player_release_type_compilation }}</option><option value="mixtape">{{ t.player_release_type_mixtape }}</option><option value="live">{{ t.player_release_type_live }}</option><option value="soundtrack">{{ t.player_release_type_soundtrack }}</option><option value="remix">{{ t.player_release_type_remix }}</option><option value="demo">{{ t.player_release_type_demo }}</option>
                                                 </select>
                                             </label>
-                                            <label class="upload-field upload-field-wide"><span>Notes</span><textarea rows="4" x-model="$store.torrents.uploadReviewDraft.notes"></textarea></label>
+                                            <label class="upload-field upload-field-wide"><span>{{ t.player_notes }}</span><textarea rows="4" x-model="$store.torrents.uploadReviewDraft.notes"></textarea></label>
                                             <div class="upload-editor-actions">
-                                                <button class="modal-btn modal-btn-danger" @click="$store.torrents.deleteUploadReview()" :disabled="$store.torrents.uploadReviewSavingId === $store.torrents.uploadReviewEditId">Delete review</button>
+                                                <button class="modal-btn modal-btn-danger" @click="$store.torrents.deleteUploadReview()" :disabled="$store.torrents.uploadReviewSavingId === $store.torrents.uploadReviewEditId">{{ t.player_delete_review }}</button>
-                                                <button class="modal-btn modal-btn-primary" @click="$store.torrents.approveUploadReview()" :disabled="$store.torrents.uploadReviewSavingId === $store.torrents.uploadReviewEditId">Approve</button>
+                                                <button class="modal-btn modal-btn-primary" @click="$store.torrents.approveUploadReview()" :disabled="$store.torrents.uploadReviewSavingId === $store.torrents.uploadReviewEditId">{{ t.player_approve }}</button>
                                             </div>
                                         </div>
                                     </template>
 
                                     <template x-if="$store.torrents.uploadReleaseDraft">
                                         <div class="upload-editor-form">
-                                            <label class="upload-field upload-field-wide"><span>Album</span><input type="text" x-model="$store.torrents.uploadReleaseDraft.title"></label>
+                                            <label class="upload-field upload-field-wide"><span>{{ t.player_album }}</span><input type="text" x-model="$store.torrents.uploadReleaseDraft.title"></label>
-                                            <label class="upload-field upload-field-wide"><span>Album artists</span><input type="text" x-model="$store.torrents.uploadReleaseDraft.artists"></label>
+                                            <label class="upload-field upload-field-wide"><span>{{ t.player_album_artists }}</span><input type="text" x-model="$store.torrents.uploadReleaseDraft.artists"></label>
-                                            <label class="upload-field upload-field-half"><span>Year</span><input type="number" x-model="$store.torrents.uploadReleaseDraft.year"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_year }}</span><input type="number" x-model="$store.torrents.uploadReleaseDraft.year"></label>
-                                            <label class="upload-field upload-field-half"><span>Type</span><select x-model="$store.torrents.uploadReleaseDraft.release_type"><option value="album">Album</option><option value="single">Single</option><option value="ep">EP</option><option value="compilation">Compilation</option><option value="mixtape">Mixtape</option><option value="live">Live</option><option value="soundtrack">Soundtrack</option><option value="remix">Remix</option><option value="demo">Demo</option></select></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_type }}</span><select x-model="$store.torrents.uploadReleaseDraft.release_type"><option value="album">{{ t.player_release_type_album }}</option><option value="single">{{ t.player_release_type_single }}</option><option value="ep">{{ t.player_release_type_ep }}</option><option value="compilation">{{ t.player_release_type_compilation }}</option><option value="mixtape">{{ t.player_release_type_mixtape }}</option><option value="live">{{ t.player_release_type_live }}</option><option value="soundtrack">{{ t.player_release_type_soundtrack }}</option><option value="remix">{{ t.player_release_type_remix }}</option><option value="demo">{{ t.player_release_type_demo }}</option></select></label>
-                                            <label class="upload-field upload-field-toggle"><input type="checkbox" x-model="$store.torrents.uploadReleaseDraft.is_hidden"><span>Hidden</span></label>
+                                            <label class="upload-field upload-field-toggle"><input type="checkbox" x-model="$store.torrents.uploadReleaseDraft.is_hidden"><span>{{ t.player_hidden }}</span></label>
                                             <div class="upload-editor-actions">
-                                                <button class="modal-btn modal-btn-primary" @click="$store.torrents.saveUploadReleaseEdit()" :disabled="$store.torrents.uploadReleaseSavingId === $store.torrents.uploadReleaseEditId">Save release</button>
+                                                <button class="modal-btn modal-btn-primary" @click="$store.torrents.saveUploadReleaseEdit()" :disabled="$store.torrents.uploadReleaseSavingId === $store.torrents.uploadReleaseEditId">{{ t.player_save_release }}</button>
                                             </div>
                                         </div>
                                     </template>
 
                                     <template x-if="$store.torrents.uploadDraft">
                                         <div class="upload-editor-form">
-                                            <label class="upload-field upload-field-wide"><span>Title</span><input type="text" x-model="$store.torrents.uploadDraft.title"></label>
+                                            <label class="upload-field upload-field-wide"><span>{{ t.player_title }}</span><input type="text" x-model="$store.torrents.uploadDraft.title"></label>
-                                            <label class="upload-field upload-field-half"><span>Artists</span><input type="text" x-model="$store.torrents.uploadDraft.artists"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_artists }}</span><input type="text" x-model="$store.torrents.uploadDraft.artists"></label>
-                                            <label class="upload-field upload-field-half"><span>Featured</span><input type="text" x-model="$store.torrents.uploadDraft.featured_artists"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_featured }}</span><input type="text" x-model="$store.torrents.uploadDraft.featured_artists"></label>
-                                            <label class="upload-field upload-field-half"><span>Album</span><input type="text" x-model="$store.torrents.uploadDraft.release_title"></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_album }}</span><input type="text" x-model="$store.torrents.uploadDraft.release_title"></label>
-                                            <label class="upload-field upload-field-half"><span>Type</span><select x-model="$store.torrents.uploadDraft.release_type"><option value="album">Album</option><option value="single">Single</option><option value="ep">EP</option><option value="compilation">Compilation</option><option value="mixtape">Mixtape</option><option value="live">Live</option><option value="soundtrack">Soundtrack</option><option value="remix">Remix</option><option value="demo">Demo</option></select></label>
+                                            <label class="upload-field upload-field-half"><span>{{ t.player_type }}</span><select x-model="$store.torrents.uploadDraft.release_type"><option value="album">{{ t.player_release_type_album }}</option><option value="single">{{ t.player_release_type_single }}</option><option value="ep">{{ t.player_release_type_ep }}</option><option value="compilation">{{ t.player_release_type_compilation }}</option><option value="mixtape">{{ t.player_release_type_mixtape }}</option><option value="live">{{ t.player_release_type_live }}</option><option value="soundtrack">{{ t.player_release_type_soundtrack }}</option><option value="remix">{{ t.player_release_type_remix }}</option><option value="demo">{{ t.player_release_type_demo }}</option></select></label>
-                                            <label class="upload-field upload-field-compact"><span>Year</span><input type="number" x-model="$store.torrents.uploadDraft.release_year"></label>
+                                            <label class="upload-field upload-field-compact"><span>{{ t.player_year }}</span><input type="number" x-model="$store.torrents.uploadDraft.release_year"></label>
-                                            <label class="upload-field upload-field-compact"><span>Track #</span><input type="number" min="1" x-model="$store.torrents.uploadDraft.track_number"></label>
+                                            <label class="upload-field upload-field-compact"><span>{{ t.player_track_number }}</span><input type="number" min="1" x-model="$store.torrents.uploadDraft.track_number"></label>
-                                            <label class="upload-field upload-field-compact"><span>Disc #</span><input type="number" min="1" x-model="$store.torrents.uploadDraft.disc_number"></label>
+                                            <label class="upload-field upload-field-compact"><span>{{ t.player_disc_number }}</span><input type="number" min="1" x-model="$store.torrents.uploadDraft.disc_number"></label>
-                                            <label class="upload-field upload-field-toggle"><input type="checkbox" x-model="$store.torrents.uploadDraft.is_hidden"><span>Hidden</span></label>
+                                            <label class="upload-field upload-field-toggle"><input type="checkbox" x-model="$store.torrents.uploadDraft.is_hidden"><span>{{ t.player_hidden }}</span></label>
                                             <div class="upload-editor-actions">
-                                                <button class="modal-btn modal-btn-primary" @click="$store.torrents.saveUploadEdit()" :disabled="$store.torrents.uploadSavingId === $store.torrents.uploadEditId">Save track</button>
+                                                <button class="modal-btn modal-btn-primary" @click="$store.torrents.saveUploadEdit()" :disabled="$store.torrents.uploadSavingId === $store.torrents.uploadEditId">{{ t.player_save_track }}</button>
                                             </div>
                                         </div>
                                     </template>
@@ -519,7 +553,7 @@
                                             <div class="upload-track-main">
                                                 <div class="upload-track-title">
                                                     <span x-text="item.track.title"></span>
-                                                    <span class="upload-hidden-pill" x-show="item.is_hidden">hidden</span>
+                                                    <span class="upload-hidden-pill" x-show="item.is_hidden">{{ t.player_hidden }}</span>
                                                 </div>
                                                 <div class="upload-track-meta">
                                                     <span x-text="$store.torrents.uploadArtistsText(item)"></span>
@@ -536,7 +570,7 @@
                                                 <button class="track-action-btn queue-insert-btn queue-end-btn" @click="$store.queue.addToEnd([item.track])" title="{{ t.player_add_to_queue }}">
                                                     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
                                                 </button>
-                                                <button class="modal-btn modal-btn-ghost" @click="$store.torrents.editUpload(item)">Edit</button>
+                                                <button class="modal-btn modal-btn-ghost" @click="$store.torrents.editUpload(item)">{{ t.player_edit }}</button>
                                             </div>
                                         </div>
                                     </template>
@@ -544,52 +578,52 @@
                                     <template x-if="$store.torrents.uploadEditId === item.track.id">
                                         <div class="upload-edit-form">
                                             <label>
-                                                <span>Title</span>
+                                                <span>{{ t.player_title }}</span>
                                                 <input type="text" x-model="$store.torrents.uploadDraft.title">
                                             </label>
                                             <label>
-                                                <span>Artists</span>
+                                                <span>{{ t.player_artists }}</span>
-                                                <input type="text" x-model="$store.torrents.uploadDraft.artists" placeholder="Artist, Featured Artist">
+                                                <input type="text" x-model="$store.torrents.uploadDraft.artists" placeholder="{{ t.player_artist_featured_placeholder }}">
                                             </label>
                                             <label>
-                                                <span>Release</span>
+                                                <span>{{ t.player_release }}</span>
                                                 <input type="text" x-model="$store.torrents.uploadDraft.release_title">
                                             </label>
                                             <label>
-                                                <span>Type</span>
+                                                <span>{{ t.player_type }}</span>
                                                 <select x-model="$store.torrents.uploadDraft.release_type">
-                                                    <option value="album">Album</option>
+                                                    <option value="album">{{ t.player_release_type_album }}</option>
-                                                    <option value="single">Single</option>
+                                                    <option value="single">{{ t.player_release_type_single }}</option>
-                                                    <option value="ep">EP</option>
+                                                    <option value="ep">{{ t.player_release_type_ep }}</option>
-                                                    <option value="compilation">Compilation</option>
+                                                    <option value="compilation">{{ t.player_release_type_compilation }}</option>
-                                                    <option value="mixtape">Mixtape</option>
+                                                    <option value="mixtape">{{ t.player_release_type_mixtape }}</option>
-                                                    <option value="live">Live</option>
+                                                    <option value="live">{{ t.player_release_type_live }}</option>
-                                                    <option value="soundtrack">Soundtrack</option>
+                                                    <option value="soundtrack">{{ t.player_release_type_soundtrack }}</option>
-                                                    <option value="remix">Remix</option>
+                                                    <option value="remix">{{ t.player_release_type_remix }}</option>
-                                                    <option value="demo">Demo</option>
+                                                    <option value="demo">{{ t.player_release_type_demo }}</option>
                                                 </select>
                                             </label>
                                             <label>
-                                                <span>Year</span>
+                                                <span>{{ t.player_year }}</span>
                                                 <input type="number" x-model="$store.torrents.uploadDraft.release_year">
                                             </label>
                                             <label>
-                                                <span>Track #</span>
+                                                <span>{{ t.player_track_number }}</span>
                                                 <input type="number" min="1" x-model="$store.torrents.uploadDraft.track_number">
                                             </label>
                                             <label>
-                                                <span>Disc #</span>
+                                                <span>{{ t.player_disc_number }}</span>
                                                 <input type="number" min="1" x-model="$store.torrents.uploadDraft.disc_number">
                                             </label>
                                             <label class="upload-hidden-toggle">
                                                 <input type="checkbox" x-model="$store.torrents.uploadDraft.is_hidden">
-                                                <span>Hidden</span>
+                                                <span>{{ t.player_hidden }}</span>
                                             </label>
                                             <div class="upload-edit-actions">
                                                 <button class="modal-btn modal-btn-primary"
                                                         @click="$store.torrents.saveUploadEdit()"
-                                                        :disabled="$store.torrents.uploadSavingId === item.track.id">Save</button>
+                                                        :disabled="$store.torrents.uploadSavingId === item.track.id">{{ t.player_save }}</button>
-                                                <button class="modal-btn modal-btn-ghost" @click="$store.torrents.cancelUploadEdit()">Cancel</button>
+                                                <button class="modal-btn modal-btn-ghost" @click="$store.torrents.cancelUploadEdit()">{{ t.player_cancel }}</button>
                                             </div>
                                         </div>
                                     </template>
@@ -606,25 +640,93 @@
     <template x-if="$store.history.modal">
         <div class="modal-overlay" @click.self="$store.history.close()">
             <div class="modal-box history-modal">
-                <h3>{{ t.player_play_history }}</h3>
+                <div class="history-head">
-                <p class="torrent-message" :class="{ error: $store.history.error }"
+                    <div>
-                   x-text="$store.history.message"></p>
+                        <h3>{{ t.player_play_history }}</h3>
+                        <p class="torrent-message" :class="{ error: $store.history.error }"
+                           x-text="$store.history.message"></p>
+                    </div>
+                    <button class="mobile-list-action" @click="$store.history.close()" title="{{ t.player_close }}">
+                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <line x1="18" y1="6" x2="6" y2="18"/>
+                            <line x1="6" y1="6" x2="18" y2="18"/>
+                        </svg>
+                    </button>
+                </div>
                 <div class="history-list">
                     <template x-if="!$store.history.loading && $store.history.items.length === 0">
                         <div class="empty-state" style="padding:32px 16px">
                             <p>{{ t.player_no_plays_yet }}</p>
                         </div>
                     </template>
-                    <template x-for="item in $store.history.items" :key="item.id">
+                    <template x-if="$store.history.items.length > 0">
-                        <div class="history-row">
+                        <div class="history-table-head">
-                            <div style="min-width:0">
+                            <span></span>
-                                <div class="history-title" x-text="item.track_title"></div>
+                            <span>{{ t.player_title }}</span>
-                                <div class="history-release" x-text="item.release_title || '{{ t.player_unknown_release }}'"></div>
+                            <span>{{ t.player_played_at }}</span>
+                            <span></span>
+                            <span style="text-align:right">{{ t.player_listened }}</span>
+                        </div>
+                    </template>
+                    <template x-for="(item, idx) in $store.history.items" :key="item.id">
+                        <div class="history-row track-row"
+                             :class="{ playing: $store.player.currentTrack && item.track && $store.player.currentTrack.id === item.track.id }"
+                             @dblclick="$store.history.playFrom(idx)">
+                            <button class="history-cover"
+                                    @click.stop="$store.history.playFrom(idx)"
+                                    :title="item.track?.title || item.track_title">
+                                <template x-if="item.track && item.track.cover_url">
+                                    <img :src="item.track.cover_url" :alt="item.track.title" loading="lazy">
+                                </template>
+                                <template x-if="!item.track || !item.track.cover_url">
+                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="4"/></svg>
+                                </template>
+                            </button>
+                            <div class="track-info">
+                                <div class="track-title" x-text="item.track?.title || item.track_title"></div>
+                                <div class="track-artists-inline">
+                                    <template x-for="(artist, artistIdx) in $store.library.trackArtistLinks(item.track)" :key="artist.label + '-' + artist.id + '-' + artistIdx">
+                                        <span>
+                                            <template x-if="artistIdx > 0"><span>, </span></template>
+                                            <a class="artist-link" @click.stop="$store.history.close(); $store.library.openArtist(artist.id)" x-text="artist.label"></a>
+                                        </span>
+                                    </template>
+                                    <template x-if="!item.track || !$store.library.trackArtistLinks(item.track).length">
+                                        <span x-text="item.release_title || '{{ t.player_unknown_release }}'"></span>
+                                    </template>
+                                </div>
+                                <div class="history-release-line">
+                                    <a class="artist-link"
+                                       x-show="item.track && item.track.release_id"
+                                       @click.stop="$store.history.close(); $store.library.openRelease(item.track.release_id)"
+                                       x-text="item.track?.release_title || item.release_title || '{{ t.player_unknown_release }}'"></a>
+                                </div>
                             </div>
-                            <div>
+                            <div class="history-date" x-text="$store.history.date(item.played_at)"></div>
-                                <div class="history-date" x-text="$store.history.date(item.played_at)"></div>
+                            <div class="track-actions">
-                                <div class="history-duration" x-text="$store.history.duration(item.duration_listened)"></div>
+                                <button class="track-action-btn info-btn popularity-info-btn"
+                                        :class="{ 'has-popularity': $store.library.hasPopularity(item.track), 'no-popularity': !$store.library.hasPopularity(item.track) }"
+                                        :style="$store.library.popularityStyle(item.track)"
+                                        @click.stop="$store.library.openTrackInfo(item.track)"
+                                        :title="$store.library.trackInfoTitle(item.track)"
+                                        aria-label="{{ t.player_track_info }}">
+                                    <span x-show="$store.library.hasPopularity(item.track)" x-text="$store.library.popularityLabel(item.track)"></span>
+                                    <span x-show="!$store.library.hasPopularity(item.track)" class="info-letter">i</span>
+                                </button>
+                                <button class="like-btn" :class="{ liked: $store.likes.has(item.track_id) }" @click.stop="$store.likes.toggle(item.track_id)" title="{{ t.player_like }}">
+                                    <svg viewBox="0 0 24 24" :fill="$store.likes.has(item.track_id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
+                                </button>
+                                <button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([item.track])" title="{{ t.player_play_next }}">
+                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h10M5 12h7M5 18h10"/><path d="M17 9l4 3-4 3" fill="currentColor" stroke="none"/></svg>
+                                </button>
+                                <button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([item.track])" title="{{ t.player_add_to_queue }}">
+                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
+                                </button>
+                                <button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([item.track_id])" title="{{ t.player_add_to_playlist }}">
+                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
+                                </button>
                             </div>
+                            <span class="history-duration" x-text="$store.history.duration(item.duration_listened)"></span>
                         </div>
                     </template>
                 </div>

templates/player/scripts.html

@@ -42,9 +42,42 @@ const T = {
     lastfmDisconnectConfirm: "{{ t.player_lastfm_disconnect_confirm }}",
     lastfmConnectFailed: "{{ t.player_lastfm_connect_failed }}",
     lastfmDisconnectFailed: "{{ t.player_lastfm_disconnect_failed }}",
+    startRadio: "{{ t.player_start_radio }}",
+    radioFailed: "{{ t.player_radio_failed }}",
     connectionLost: "{{ t.player_connection_lost }}",
     connectionLostDetail: "{{ t.player_connection_lost_detail }}",
+    activeDevice: "{{ t.player_active_device }}",
     trackWord: "{{ t.player_tracks_count }}",
+    releaseWord: "{{ t.player_releases_count }}",
+    ofWord: "{{ t.player_of }}",
+    needsApproval: "{{ t.player_needs_approval }}",
+    showing: "{{ t.player_showing }}",
+    statusLabelText: "{{ t.player_status }}",
+    fileLabel: "{{ t.player_file }}",
+    createdLabel: "{{ t.player_created }}",
+    updatedLabel: "{{ t.player_updated }}",
+    errorLabel: "{{ t.player_error }}",
+    pending: "{{ t.player_pending }}",
+    featuredShort: "{{ t.player_featured_short }}",
+    noYear: "{{ t.player_no_year }}",
+    loadUploadsFailed: "{{ t.player_failed_load_uploaded_tracks }}",
+    releaseMetadata: "{{ t.player_release_metadata }}",
+    trackMetadata: "{{ t.player_track_metadata }}",
+    metadata: "{{ t.player_metadata }}",
+    approveMetadata: "{{ t.player_approve_metadata }}",
+    editRelease: "{{ t.player_edit_release }}",
+    editTrack: "{{ t.player_edit_track }}",
+    editMetadata: "{{ t.player_edit_metadata }}",
+    failedSaveTrack: "{{ t.player_failed_save_track }}",
+    trackMetadataSaved: "{{ t.player_track_metadata_saved }}",
+    failedSaveRelease: "{{ t.player_failed_save_release }}",
+    releaseMetadataSaved: "{{ t.player_release_metadata_saved }}",
+    failedDeleteReview: "{{ t.player_failed_delete_review }}",
+    reviewDeleted: "{{ t.player_review_deleted }}",
+    failedApproveReview: "{{ t.player_failed_approve_review }}",
+    trackApprovedImported: "{{ t.player_track_approved_imported }}",
+    failedUpdateSelectedTracks: "{{ t.player_failed_update_selected_tracks }}",
+    selectedTracksUpdated: "{{ t.player_selected_tracks_updated }}",
     clientIdle: "{{ t.player_client_idle }}",
     active: "{{ t.player_active }}",
     aiIdle: "{{ t.player_ai_idle }}",
@@ -166,18 +199,6 @@ document.addEventListener('alpine:init', () => {
     Alpine.store('mobile', {
         libraryOpen: false,
         playerExpanded: false,
-        playerDragging: false,
-        playerDragOffset: 0,
-        playerCloseOffset: 0,
-        _playerDragStartY: 0,
-        _playerDragStartX: 0,
-        _playerDragTracking: false,
-        _playerDragMode: null,
-        _playerDragPointerId: null,
-        _playerDragElement: null,
-        _playerDragMove: null,
-        _playerDragEnd: null,
-        _playerSuppressClickUntil: 0,
         toggleLibrary() {
             this.libraryOpen = !this.libraryOpen;
             if (this.libraryOpen) Alpine.store('user').menuOpen = false;
@@ -186,145 +207,75 @@ document.addEventListener('alpine:init', () => {
             this.libraryOpen = false;
         },
         isMobilePlayer() {
-            return window.matchMedia && window.matchMedia('(max-width: 720px)').matches;
+            if (!window.matchMedia) return false;
+            return window.matchMedia('(max-width: 900px)').matches
+                || window.matchMedia('(pointer: coarse) and (max-width: 1024px)').matches;
         },
         openPlayerFullscreen() {
             if (!this.isMobilePlayer() || !Alpine.store('player').currentTrack) return;
             this.playerExpanded = true;
-            this.playerDragging = false;
-            this.playerDragOffset = 0;
-            this.playerCloseOffset = 0;
             Alpine.store('queue').visible = false;
             Alpine.store('devices').open = false;
+            this.resetPlayerFullscreenScroll();
         },
         closePlayerFullscreen() {
             this.playerExpanded = false;
-            this.playerDragging = false;
+            Alpine.store('queue').visible = false;
-            this.playerDragOffset = 0;
+            Alpine.store('devices').open = false;
-            this.playerCloseOffset = 0;
         },
-        playerDragStyle() {
+        resetPlayerFullscreenScroll() {
-            return `--mobile-player-drag:${this.playerDragOffset}px; --mobile-player-close-drag:${this.playerCloseOffset}px;`;
+            requestAnimationFrame(() => {
-        },
+                const full = document.querySelector('.player-bar .mobile-full-player');
-        handlePlayerClick(event) {
+                if (full) {
-            if (Date.now() <= this._playerSuppressClickUntil) {
+                    full.scrollTop = 0;
-                event.preventDefault();
+                    full.scrollLeft = 0;
-                event.stopPropagation();
-                this._playerSuppressClickUntil = 0;
-            }
-        },
-        startPlayerDrag(event, force = false) {
-            if (!this.isMobilePlayer() || !Alpine.store('player').currentTrack) return;
-            if (event.button && event.button !== 0) return;
-            const target = event.target;
-            const isDragBlocked = target.closest('input, select, textarea, .volume-slider, .device-popover, .mobile-expanded-queue');
-            if (!force) {
-                if (this.playerExpanded) {
-                    const isCloseHandle = target.closest('.player-now-playing');
-                    const scroller = event.currentTarget?.classList?.contains('player-bar') ? event.currentTarget : null;
-                    if (!isCloseHandle || isDragBlocked || (scroller && scroller.scrollTop > 4)) return;
-                } else if (isDragBlocked) {
-                    return;
                 }
-            }
+            });
-            if (this._playerDragTracking) this.endPlayerDrag({ type: 'pointercancel' });
-            this.playerDragging = false;
-            this._playerDragTracking = true;
-            this._playerDragMode = this.playerExpanded ? 'close' : 'open';
-            this._playerDragStartY = event.clientY;
-            this._playerDragStartX = event.clientX;
-            this._playerDragPointerId = event.pointerId;
-            this._playerDragElement = event.currentTarget;
-            this.playerDragOffset = 0;
-            this.playerCloseOffset = 0;
-            this._playerDragMove = e => this.movePlayerDrag(e);
-            this._playerDragEnd = e => this.endPlayerDrag(e);
-            window.addEventListener('pointermove', this._playerDragMove, { passive: false });
-            window.addEventListener('pointerup', this._playerDragEnd, { passive: false });
-            window.addEventListener('pointercancel', this._playerDragEnd, { passive: false });
-        },
-        movePlayerDrag(event) {
-            if (!this._playerDragTracking) return;
-            const delta = this._playerDragStartY - event.clientY;
-            const absDelta = Math.abs(delta);
-            if (!this.playerDragging) {
-                const horizontalDelta = Math.abs(event.clientX - this._playerDragStartX);
-                const wantsOpen = this._playerDragMode === 'open' && delta > 0;
-                const wantsClose = this._playerDragMode === 'close' && delta < 0;
-                if (absDelta < 8 || absDelta < horizontalDelta * 1.15 || (!wantsOpen && !wantsClose)) return;
-                this.playerDragging = true;
-                try {
-                    this._playerDragElement?.setPointerCapture?.(this._playerDragPointerId);
-                } catch (_) {}
-            }
-            event.preventDefault();
-            if (this._playerDragMode === 'close') {
-                this.playerCloseOffset = Math.max(0, Math.min(window.innerHeight, -delta));
-            } else {
-                const max = Math.max(0, window.innerHeight - 132);
-                this.playerDragOffset = Math.max(0, Math.min(max, delta));
-            }
-        },
-        endPlayerDrag(event) {
-            const openThreshold = Math.min(180, Math.max(90, window.innerHeight * 0.18));
-            const closeThreshold = Math.min(110, Math.max(64, window.innerHeight * 0.1));
-            const wasCancelled = event?.type === 'pointercancel';
-            const wasDragging = this.playerDragging;
-            if (wasDragging) this._playerSuppressClickUntil = Date.now() + 450;
-            if (this._playerDragMode === 'close') {
-                if (!wasCancelled && this.playerCloseOffset > closeThreshold) this.closePlayerFullscreen();
-                else {
-                    this.playerCloseOffset = 0;
-                    this.playerDragging = false;
-                }
-            } else if (this._playerDragMode === 'open' && !wasCancelled && this.playerDragOffset > openThreshold) {
-                this.openPlayerFullscreen();
-            } else {
-                this.playerDragOffset = 0;
-                this.playerDragging = false;
-            }
-            try {
-                if (this._playerDragPointerId !== null && this._playerDragElement?.hasPointerCapture?.(this._playerDragPointerId)) {
-                    this._playerDragElement.releasePointerCapture(this._playerDragPointerId);
-                }
-            } catch (_) {}
-            if (this._playerDragMove) window.removeEventListener('pointermove', this._playerDragMove);
-            if (this._playerDragEnd) {
-                window.removeEventListener('pointerup', this._playerDragEnd);
-                window.removeEventListener('pointercancel', this._playerDragEnd);
-            }
-            this._playerDragTracking = false;
-            this._playerDragMode = null;
-            this._playerDragPointerId = null;
-            this._playerDragElement = null;
-            this._playerDragMove = null;
-            this._playerDragEnd = null;
         },
     });
 
     Alpine.store('info', {
         modal: null,
-        open(title, body) {
+        open(title, body, actions = []) {
             if (Array.isArray(body)) {
-                this.openRows(title, body);
+                this.openRows(title, body, actions);
                 return;
             }
             this.modal = {
                 title: title || T.info,
                 body: body || T.noDetails,
                 rows: null,
+                actions: actions || [],
             };
         },
-        openRows(title, rows) {
+        openRows(title, rows, actions = []) {
             this.modal = {
                 title: title || T.info,
                 body: '',
                 rows: (rows || []).filter(row => row && ((row.value !== undefined && row.value !== null && row.value !== '') || (row.links && row.links.length))),
+                actions: actions || [],
             };
         },
         close() {
             this.modal = null;
         },
+        async runAction(actionOrIndex) {
+            const index = Number.isInteger(actionOrIndex) ? actionOrIndex : this.modal?.actions?.indexOf(actionOrIndex);
+            const action = index >= 0 ? this.modal?.actions?.[index] : actionOrIndex;
+            if (!action || action.busy === true || typeof action.run !== 'function') return;
+            if (index >= 0 && this.modal?.actions) {
+                this.modal.actions[index] = { ...action, busy: true };
+                this.modal.actions = [...this.modal.actions];
+            }
+            try {
+                await action.run();
+            } finally {
+                if (index >= 0 && this.modal?.actions?.[index]) {
+                    this.modal.actions[index] = { ...this.modal.actions[index], busy: false };
+                    this.modal.actions = [...this.modal.actions];
+                }
+            }
+        },
         navigate(link) {
             if (!link || !link.id) return;
             this.close();
@@ -488,6 +439,16 @@ document.addEventListener('alpine:init', () => {
             return Math.max(1, Math.ceil(this.total / this.perPage));
         },
 
+        tracks() {
+            return (this.items || []).map(item => item.track).filter(Boolean);
+        },
+
+        playFrom(index) {
+            const tracks = this.tracks();
+            if (!tracks.length || index < 0 || index >= tracks.length) return;
+            Alpine.store('queue').playRelease(tracks, index);
+        },
+
         async load(page) {
             page = Math.max(1, page || 1);
             this.loading = true;
@@ -1216,6 +1177,10 @@ document.addEventListener('alpine:init', () => {
         jamUsers: [],
         jamSelectedUsers: [],
         jamSearching: false,
+        remoteHintVisible: false,
+        remoteHintDeviceName: '',
+        _remoteHintShown: false,
+        _remoteHintTimer: null,
         _pollTimer: null,
         _jamSearchTimer: null,
         _stateRefreshTick: 0,
@@ -1305,6 +1270,34 @@ document.addEventListener('alpine:init', () => {
             if (wasActive && !this.isActive()) {
                 Alpine.store('player')?._pauseLocal();
             }
+            this._maybeShowRemoteHint();
+        },
+
+        remoteActiveDevice() {
+            if (!this.activeDeviceId || this.activeDeviceId === this.id) return null;
+            return this.devices.find(device => device.id === this.activeDeviceId) || null;
+        },
+
+        _maybeShowRemoteHint() {
+            if (this._remoteHintShown || this.remoteHintVisible || this.open) return;
+            const active = this.remoteActiveDevice();
+            if (!active) return;
+            this.remoteHintDeviceName = active.name || 'Devices';
+            this.remoteHintVisible = true;
+            this._remoteHintShown = true;
+            clearTimeout(this._remoteHintTimer);
+            this._remoteHintTimer = setTimeout(() => this.dismissRemoteHint(), 60000);
+        },
+
+        dismissRemoteHint() {
+            this.remoteHintVisible = false;
+            this._remoteHintShown = true;
+            clearTimeout(this._remoteHintTimer);
+            this._remoteHintTimer = null;
+        },
+
+        remoteHintText() {
+            return `${T.activeDevice}: ${this.remoteHintDeviceName || this.activeLabel()}`;
         },
 
         selectedJam() {
@@ -1370,6 +1363,7 @@ document.addEventListener('alpine:init', () => {
         },
 
         toggle() {
+            this.dismissRemoteHint();
             this.open = !this.open;
             if (this.open) this.poll();
         },
@@ -1853,11 +1847,13 @@ document.addEventListener('alpine:init', () => {
     // -----------------------------------------------------------------------
     Alpine.store('library', {
         view: 'artists',
+        artistFilter: 'all',
         artists: [],
         artistsPage: 0,
         artistsTotal: 0,
         loading: false,
         _allLoaded: false,
+        _artistsLoadToken: 0,
         currentArtist: null,
         currentRelease: null,
         currentPlaylist: null,
@@ -1872,7 +1868,6 @@ document.addEventListener('alpine:init', () => {
         _hashNav: false, // guard against circular hash updates
 
         init() {
-            this.loadArtists(1);
             this._setupScroll();
 
             // Listen for browser back/forward
@@ -1909,7 +1904,10 @@ document.addEventListener('alpine:init', () => {
             const params = match[3] || '';
 
             if (view === 'artists' && !id) {
-                if (this.view !== 'artists') this.goArtists(options);
+                if (this.view !== 'artists' || this.artistsPage === 0) this.goArtists(options);
+                else if (options.restoreScroll) this._restoreScrollPosition(hash);
+            } else if (view === 'uploads' && !id) {
+                if (this.view !== 'my_uploads' || this.artistsPage === 0) this.goMyUploads(options);
                 else if (options.restoreScroll) this._restoreScrollPosition(hash);
             } else if (view === 'artist' && id) {
                 this.openArtist(id, options);
@@ -1975,8 +1973,22 @@ document.addEventListener('alpine:init', () => {
             }
         },
 
+        _resetArtistList(filter) {
+            this.artistFilter = filter;
+            this.artists = [];
+            this.artistsPage = 0;
+            this.artistsTotal = 0;
+            this._allLoaded = false;
+            this.loading = false;
+            this._artistsLoadToken += 1;
+        },
+
         goArtists(options = {}) {
             this._beginNavigation('#artists', options);
+            if (this.artistFilter !== 'all' || this.artistsPage === 0) {
+                this._resetArtistList('all');
+                this.loadArtists(1);
+            }
             this.view = 'artists';
             this.currentArtist = null;
             this.currentRelease = null;
@@ -1988,13 +2000,35 @@ document.addEventListener('alpine:init', () => {
             this._afterNavigation(options);
         },
 
+        goMyUploads(options = {}) {
+            this._beginNavigation('#uploads', options);
+            if (this.artistFilter !== 'uploads' || this.artistsPage === 0) {
+                this._resetArtistList('uploads');
+                this.loadArtists(1);
+            }
+            this.view = 'my_uploads';
+            this.currentArtist = null;
+            this.currentRelease = null;
+            this.currentPlaylist = null;
+            this.searchQuery = '';
+            this.searchResults = null;
+            this._previousView = 'my_uploads';
+            this.$nextTick(() => { this._setupScroll(); });
+            this._afterNavigation(options);
+        },
+
         async loadArtists(page) {
             if (this.loading || this._allLoaded) return;
             this.loading = true;
+            const filter = this.artistFilter;
+            const token = this._artistsLoadToken + 1;
+            this._artistsLoadToken = token;
             try {
-                const res = await fetch(`/api/player/artists?page=${page}&limit=60`);
+                const mine = filter === 'uploads' ? '&mine=true' : '';
+                const res = await fetch(`/api/player/artists?page=${page}&limit=60${mine}`);
                 if (!res.ok) throw new Error('failed');
                 const data = await res.json();
+                if (token !== this._artistsLoadToken || filter !== this.artistFilter) return;
                 if (page === 1) {
                     this.artists = data.items;
                 } else {
@@ -2006,7 +2040,9 @@ document.addEventListener('alpine:init', () => {
                     this._allLoaded = true;
                 }
             } catch {}
-            this.loading = false;
+            if (token === this._artistsLoadToken) {
+                this.loading = false;
+            }
         },
 
         async openArtist(id, options = {}) {
@@ -2117,8 +2153,25 @@ document.addEventListener('alpine:init', () => {
             return `${T.lastfmRating}: ${Math.round(value)}\n${this.trackInfo(track)}`;
         },
 
+        async startRadio(kind, id) {
+            if (!kind || !id) return;
+            try {
+                const res = await fetch(`/api/player/radio/${encodeURIComponent(kind)}/${encodeURIComponent(id)}`);
+                if (!res.ok) throw new Error('radio failed');
+                const tracks = await res.json();
+                if (!Array.isArray(tracks) || tracks.length === 0) throw new Error('radio empty');
+                Alpine.store('queue').playRelease(tracks, 0);
+                Alpine.store('info').close();
+            } catch (err) {
+                console.warn(err);
+                window.alert(T.radioFailed);
+            }
+        },
+
         openTrackInfo(track) {
-            Alpine.store('info').openRows(T.trackInfoTitle, this.trackInfoRows(track));
+            Alpine.store('info').openRows(T.trackInfoTitle, this.trackInfoRows(track), [
+                { label: T.startRadio, run: () => this.startRadio('track', track?.id) },
+            ]);
         },
 
         uploadersInfo(uploaders) {
@@ -2142,7 +2195,9 @@ document.addEventListener('alpine:init', () => {
         },
 
         openReleaseInfo(release) {
-            Alpine.store('info').openRows(T.releaseInfoTitle, this.releaseInfoRows(release));
+            Alpine.store('info').openRows(T.releaseInfoTitle, this.releaseInfoRows(release), [
+                { label: T.startRadio, run: () => this.startRadio('release', release?.id) },
+            ]);
         },
 
         infoLinks(items, type) {
@@ -2230,6 +2285,12 @@ document.addEventListener('alpine:init', () => {
             return rows;
         },
 
+        playArtistTopTracks() {
+            const tracks = this.currentArtist?.top_tracks || [];
+            if (!tracks.length) return;
+            Alpine.store('queue').playRelease(tracks, 0);
+        },
+
         async openRelease(id, options = {}) {
             this._beginNavigation('#release/' + id, options);
             this.searchQuery = '';
@@ -2318,8 +2379,8 @@ document.addEventListener('alpine:init', () => {
             this.searchLoading = false;
             if (this.view === 'search') {
                 this.view = this._previousView || 'artists';
-                this._setHash('#artists');
+                this._setHash(this.view === 'my_uploads' ? '#uploads' : '#artists');
-                if (this.view === 'artists') {
+                if (this.view === 'artists' || this.view === 'my_uploads') {
                     this.$nextTick(() => { this._setupScroll(); });
                 }
             }
@@ -2520,6 +2581,8 @@ document.addEventListener('alpine:init', () => {
         uploadQueued: [],
         uploadPendingTotal: 0,
         uploadQueuedTotal: 0,
+        uploadQueueOffset: 0,
+        uploadQueuePageSize: 6,
         uploadLoaded: false,
         uploadLoading: false,
         uploadEditId: null,
@@ -2790,7 +2853,7 @@ document.addEventListener('alpine:init', () => {
             try {
                 const res = await fetch('/api/player/uploads/tracks');
                 const data = await res.json();
-                if (!res.ok) throw new Error(data.error || 'Failed to load uploaded tracks');
+                if (!res.ok) throw new Error(data.error || T.loadUploadsFailed);
                 this.applyUploadPage(data);
                 this.uploadLoaded = true;
                 if (this.uploadEditId && !this.uploadTracks.some(item => item.track.id === this.uploadEditId)) {
@@ -2814,9 +2877,9 @@ document.addEventListener('alpine:init', () => {
         uploadSummary() {
             const trackCount = this.uploadTracks.length;
             const releaseCount = this.uploadReleases.length;
-            const parts = [trackCount + ' tracks', releaseCount + ' releases'];
+            const parts = [trackCount + ' ' + T.trackWord, releaseCount + ' ' + T.releaseWord];
-            if (this.uploadPendingTotal > 0) parts.push(this.uploadPendingTotal + ' need approval');
+            if (this.uploadPendingTotal > 0) parts.push(this.uploadPendingTotal + ' ' + T.needsApproval);
-            if (this.uploadQueuedTotal > 0) parts.push(this.uploadQueuedTotal + ' queued');
+            if (this.uploadQueuedTotal > 0) parts.push(this.uploadQueuedTotal + ' ' + T.queued);
             return parts.join(' / ');
         },
 
@@ -2824,7 +2887,7 @@ document.addEventListener('alpine:init', () => {
             const track = item?.track || item;
             const names = [
                 ...((track?.artists || []).map(artist => artist.name)),
-                ...((track?.featured_artists || []).map(artist => 'ft. ' + artist.name)),
+                ...((track?.featured_artists || []).map(artist => T.featuredShort + ' ' + artist.name)),
             ];
             return names.join(', ') || T.unknown;
         },
@@ -2834,13 +2897,99 @@ document.addEventListener('alpine:init', () => {
             return names.join(', ') || T.unknown;
         },
 
+        uploadArtistGroups() {
+            const collator = new Intl.Collator(undefined, { sensitivity: 'base', numeric: true });
+            const groups = new Map();
+            for (const release of this.uploadReleases) {
+                const artists = Array.isArray(release?.artists) ? release.artists : [];
+                const artistKey = artists
+                    .map(artist => artist?.id != null ? 'id:' + artist.id : 'name:' + String(artist?.name || '').trim().toLowerCase())
+                    .filter(Boolean)
+                    .join('|') || 'unknown';
+                if (!groups.has(artistKey)) {
+                    groups.set(artistKey, {
+                        key: artistKey,
+                        name: this.uploadReleaseArtistsText(release),
+                        releases: [],
+                        trackCount: 0,
+                    });
+                }
+                const group = groups.get(artistKey);
+                group.releases.push(release);
+                group.trackCount += Array.isArray(release?.tracks) ? release.tracks.length : 0;
+            }
+            return [...groups.values()]
+                .map(group => ({
+                    ...group,
+                    releases: group.releases.slice().sort((a, b) => {
+                        const aDate = String(a?.tracks?.[0]?.uploaded_at || '');
+                        const bDate = String(b?.tracks?.[0]?.uploaded_at || '');
+                        return bDate.localeCompare(aDate) || collator.compare(a?.title || '', b?.title || '');
+                    }),
+                }))
+                .sort((a, b) => collator.compare(a.name, b.name));
+        },
+
         uploadFeaturedArtistsText(item) {
             const track = item?.track || item;
             return (track?.featured_artists || []).map(artist => artist.name).join(', ');
         },
 
         compactQueuedUploads() {
-            return this.uploadQueued.slice(0, 6);
+            const maxOffset = Math.max(0, this.uploadQueued.length - this.uploadQueuePageSize);
+            this.uploadQueueOffset = Math.max(0, Math.min(this.uploadQueueOffset, maxOffset));
+            return this.uploadQueued.slice(this.uploadQueueOffset, this.uploadQueueOffset + this.uploadQueuePageSize);
+        },
+
+        uploadQueueCanPrev() {
+            return this.uploadQueueOffset > 0;
+        },
+
+        uploadQueueCanNext() {
+            return this.uploadQueueOffset + this.uploadQueuePageSize < this.uploadQueued.length;
+        },
+
+        uploadQueuePrev() {
+            this.uploadQueueOffset = Math.max(0, this.uploadQueueOffset - this.uploadQueuePageSize);
+        },
+
+        uploadQueueNext() {
+            const maxOffset = Math.max(0, this.uploadQueued.length - this.uploadQueuePageSize);
+            this.uploadQueueOffset = Math.min(maxOffset, this.uploadQueueOffset + this.uploadQueuePageSize);
+        },
+
+        uploadQueueRangeText() {
+            if (this.uploadQueued.length === 0) return '';
+            const start = this.uploadQueueOffset + 1;
+            const end = Math.min(this.uploadQueueOffset + this.uploadQueuePageSize, this.uploadQueued.length);
+            const total = Math.max(this.uploadQueuedTotal || 0, this.uploadQueued.length);
+            return start + '-' + end + ' / ' + total;
+        },
+
+        uploadQueueOverflowText() {
+            const total = Math.max(this.uploadQueuedTotal || 0, this.uploadQueued.length);
+            return T.showing + ' ' + this.uploadQueued.length + ' ' + T.ofWord + ' ' + total;
+        },
+
+        uploadQueueTooltip(item) {
+            if (!item) return '';
+            const lines = [];
+            if (item.filename) lines.push(T.fileLabel + ': ' + item.filename);
+            if (item.status) lines.push(T.statusLabelText + ': ' + item.status);
+            if (item.created_at) lines.push(T.createdLabel + ': ' + item.created_at);
+            if (item.updated_at) lines.push(T.updatedLabel + ': ' + item.updated_at);
+            if (item.error_message) lines.push(T.errorLabel + ': ' + item.error_message);
+            return lines.join('\n');
+        },
+
+        uploadStatusLabel(status) {
+            const labels = {
+                pending: T.pending,
+                queued: T.queued,
+                processing: T.processing,
+                failed: T.failed,
+            };
+            return labels[String(status || '').toLowerCase()] || status || T.unknown;
         },
 
         uploadHasEditorOpen() {
@@ -2848,17 +2997,17 @@ document.addEventListener('alpine:init', () => {
         },
 
         uploadEditorKicker() {
-            if (this.uploadReviewDraft) return 'Needs approval';
+            if (this.uploadReviewDraft) return T.needsApproval;
-            if (this.uploadReleaseDraft) return 'Release metadata';
+            if (this.uploadReleaseDraft) return T.releaseMetadata;
-            if (this.uploadDraft) return 'Track metadata';
+            if (this.uploadDraft) return T.trackMetadata;
-            return 'Metadata';
+            return T.metadata;
         },
 
         uploadEditorTitle() {
-            if (this.uploadReviewDraft) return 'Approve metadata';
+            if (this.uploadReviewDraft) return T.approveMetadata;
-            if (this.uploadReleaseDraft) return this.uploadReleaseDraft.title || 'Edit release';
+            if (this.uploadReleaseDraft) return this.uploadReleaseDraft.title || T.editRelease;
-            if (this.uploadDraft) return this.uploadDraft.title || 'Edit track';
+            if (this.uploadDraft) return this.uploadDraft.title || T.editTrack;
-            return 'Edit metadata';
+            return T.editMetadata;
         },
 
         closeUploadEditor() {
@@ -2972,11 +3121,11 @@ document.addEventListener('alpine:init', () => {
                     }),
                 });
                 const data = await res.json();
-                if (!res.ok) throw new Error(data.error || 'Failed to save track');
+                if (!res.ok) throw new Error(data.error || T.failedSaveTrack);
                 this.uploadTracks = this.uploadTracks.map(item => item.track.id === id ? data : item);
                 this.cancelUploadEdit();
                 this.loadUploads({ silent: true, preserveEditor: false });
-                this._setMessage('Track metadata saved');
+                this._setMessage(T.trackMetadataSaved);
             } catch (err) {
                 this._setMessage(err.message || String(err), true);
             } finally {
@@ -3022,10 +3171,10 @@ document.addEventListener('alpine:init', () => {
                     }),
                 });
                 const data = await res.json();
-                if (!res.ok) throw new Error(data.error || 'Failed to save release');
+                if (!res.ok) throw new Error(data.error || T.failedSaveRelease);
                 this.applyUploadPage(data);
                 this.cancelUploadReleaseEdit();
-                this._setMessage('Release metadata saved');
+                this._setMessage(T.releaseMetadataSaved);
             } catch (err) {
                 this._setMessage(err.message || String(err), true);
             } finally {
@@ -3081,10 +3230,10 @@ document.addEventListener('alpine:init', () => {
                     method: 'DELETE',
                 });
                 const data = await res.json();
-                if (!res.ok) throw new Error(data.error || 'Failed to delete review');
+                if (!res.ok) throw new Error(data.error || T.failedDeleteReview);
                 this.applyUploadPage(data);
                 this.cancelUploadReviewEdit();
-                this._setMessage('Review deleted');
+                this._setMessage(T.reviewDeleted);
             } catch (err) {
                 this._setMessage(err.message || String(err), true);
             } finally {
@@ -3103,10 +3252,10 @@ document.addEventListener('alpine:init', () => {
                     body: JSON.stringify(this.uploadReviewPayload()),
                 });
                 const data = await res.json();
-                if (!res.ok) throw new Error(data.error || 'Failed to approve review');
+                if (!res.ok) throw new Error(data.error || T.failedApproveReview);
                 this.applyUploadPage(data);
                 this.cancelUploadReviewEdit();
-                this._setMessage('Track approved and imported');
+                this._setMessage(T.trackApprovedImported);
             } catch (err) {
                 this._setMessage(err.message || String(err), true);
             } finally {
@@ -3137,10 +3286,10 @@ document.addEventListener('alpine:init', () => {
                     }),
                 });
                 const data = await res.json();
-                if (!res.ok) throw new Error(data.error || 'Failed to update selected tracks');
+                if (!res.ok) throw new Error(data.error || T.failedUpdateSelectedTracks);
                 this.applyUploadPage(data);
                 this.clearUploadSelection();
-                this._setMessage('Selected tracks updated');
+                this._setMessage(T.selectedTracksUpdated);
             } catch (err) {
                 this._setMessage(err.message || String(err), true);
             } finally {
@@ -3155,6 +3304,8 @@ document.addEventListener('alpine:init', () => {
             this.uploadQueued = Array.isArray(data.queued) ? data.queued : [];
             this.uploadPendingTotal = Number(data.pending_total || this.uploadPending.length || 0);
             this.uploadQueuedTotal = Number(data.queued_total || this.uploadQueued.length || 0);
+            const maxQueueOffset = Math.max(0, this.uploadQueued.length - this.uploadQueuePageSize);
+            this.uploadQueueOffset = Math.max(0, Math.min(this.uploadQueueOffset, maxQueueOffset));
             this.pruneUploadSelection();
         },
 

templates/player/shell.html

@@ -62,6 +62,12 @@
                     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="4"/><path d="M20 21a8 8 0 10-16 0"/></svg>
                     {{ t.player_artists }}
                 </div>
+                <div class="sidebar-nav-item"
+                     :class="{ active: $store.library.view === 'my_uploads' }"
+                     @click="$store.library.goMyUploads()">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><path d="M17 8l-5-5-5 5"/><path d="M12 3v12"/></svg>
+                    {{ t.player_my_uploads }}
+                </div>
             </div>
             <div class="sidebar-section">
                 <div class="sidebar-section-title">
@@ -170,6 +176,12 @@
                                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="4"/><path d="M20 21a8 8 0 10-16 0"/></svg>
                                 {{ t.player_artists }}
                             </div>
+                            <div class="sidebar-nav-item"
+                                 :class="{ active: $store.library.view === 'my_uploads' }"
+                                 @click="$store.library.goMyUploads(); $store.mobile.closeLibrary()">
+                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><path d="M17 8l-5-5-5 5"/><path d="M12 3v12"/></svg>
+                                {{ t.player_my_uploads }}
+                            </div>
                         </div>
 
                         <div class="mobile-drawer-section">
@@ -507,9 +519,9 @@
             </template>
 
             <!-- Artists Grid -->
-            <template x-if="$store.library.view === 'artists'">
+            <template x-if="$store.library.view === 'artists' || $store.library.view === 'my_uploads'">
                 <div>
-                    <h1 class="section-title">{{ t.player_artists }}</h1>
+                    <h1 class="section-title" x-text="$store.library.view === 'my_uploads' ? '{{ t.player_my_uploads }}' : '{{ t.player_artists }}'"></h1>
                     <div class="card-grid">
                         <template x-for="artist in $store.library.artists" :key="artist.id">
                             <div class="card" @click="$store.library.openArtist(artist.id)">
@@ -537,6 +549,11 @@
                             </div>
                         </template>
                     </div>
+                    <template x-if="!$store.library.loading && $store.library.artists.length === 0">
+                        <div class="empty-state">
+                            <p x-text="$store.library.view === 'my_uploads' ? '{{ t.player_no_uploaded_tracks }}' : '{{ t.artists_empty }}'"></p>
+                        </div>
+                    </template>
                     <template x-if="$store.library.loading">
                         <div class="loading-spinner"><div class="spinner"></div></div>
                     </template>
@@ -548,7 +565,8 @@
             <template x-if="$store.library.view === 'artist_detail' && $store.library.currentArtist">
                 <div>
                     <div class="breadcrumb">
-                        <a @click="$store.library.goArtists()">{{ t.player_artists }}</a>
+                        <a @click="$store.library.artistFilter === 'uploads' ? $store.library.goMyUploads() : $store.library.goArtists()"
+                           x-text="$store.library.artistFilter === 'uploads' ? '{{ t.player_my_uploads }}' : '{{ t.player_artists }}'"></a>
                         <span>/</span>
                         <span x-text="$store.library.currentArtist.name"></span>
                     </div>
@@ -570,8 +588,17 @@
                                 <span>•</span>
                                 <span x-text="$store.library.currentArtist.total_play_count + ' {{ t.player_plays_count }}'"></span>
                             </div>
-                            <div class="release-actions">
+                            <div class="release-actions artist-actions">
-                                <button class="release-action-btn secondary"
+                                <button class="release-action-btn primary artist-listen-action"
+                                        :disabled="!($store.library.currentArtist.top_tracks && $store.library.currentArtist.top_tracks.length)"
+                                        @click="$store.library.playArtistTopTracks()"
+                                        title="{{ t.player_listen_artist }}">
+                                    <svg viewBox="0 0 24 24" fill="currentColor" stroke="none">
+                                        <path d="M8 5v14l11-7z"/>
+                                    </svg>
+                                    <span>{{ t.player_listen }}</span>
+                                </button>
+                                <button class="release-action-btn secondary artist-follow-action"
                                         :class="{ followed: $store.follows.has($store.library.currentArtist.id) }"
                                         @click="$store.follows.toggle($store.library.currentArtist.id)"
                                         :title="$store.follows.has($store.library.currentArtist.id) ? '{{ t.player_unfollow_artist }}' : '{{ t.player_follow_artist }}'">
@@ -630,23 +657,37 @@
                                 <span style="text-align:right">{{ t.player_duration }}</span>
                             </div>
                             <template x-for="(track, idx) in $store.library.currentArtist.featured_tracks" :key="track.id">
-                                <div class="track-row"
+                                <div class="track-row artist-appearance-row"
                                      :class="{ playing: $store.player.currentTrack && $store.player.currentTrack.id === track.id }"
                                      @dblclick="$store.queue.playRelease($store.library.currentArtist.featured_tracks, idx)">
                                     <span class="track-num" x-text="idx + 1"></span>
                                     <div class="track-info">
-                                        <div class="track-title">
+                                        <button class="artist-appearance-cover"
-                                            <span x-text="track.title"></span>
+                                                type="button"
-                                            <span style="color:var(--text-subdued)"> · </span>
+                                                @click.stop="$store.library.openRelease(track.release_id)"
-                                            <a class="artist-link" @click.stop="$store.library.openRelease(track.release_id)" x-text="track.release_title"></a>
+                                                :title="track.release_title"
-                                        </div>
+                                                aria-label="{{ t.player_release }}">
-                                        <div class="track-artists-inline">
+                                            <template x-if="track.cover_url">
-                                            <template x-for="(artist, artistIdx) in $store.library.trackArtistLinks(track)" :key="artist.label + '-' + artist.id + '-' + artistIdx">
+                                                <img :src="track.cover_url" :alt="track.release_title" loading="lazy">
-                                                <span>
-                                                    <template x-if="artistIdx > 0"><span>, </span></template>
-                                                    <a class="artist-link" @click.stop="$store.library.openArtist(artist.id)" x-text="artist.label"></a>
-                                                </span>
                                             </template>
+                                            <template x-if="!track.cover_url">
+                                                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="4"/></svg>
+                                            </template>
+                                        </button>
+                                        <div class="artist-appearance-copy">
+                                            <div class="track-title">
+                                                <span x-text="track.title"></span>
+                                                <span style="color:var(--text-subdued)"> · </span>
+                                                <a class="artist-link" @click.stop="$store.library.openRelease(track.release_id)" x-text="track.release_title"></a>
+                                            </div>
+                                            <div class="track-artists-inline">
+                                                <template x-for="(artist, artistIdx) in $store.library.trackArtistLinks(track)" :key="artist.label + '-' + artist.id + '-' + artistIdx">
+                                                    <span>
+                                                        <template x-if="artistIdx > 0"><span>, </span></template>
+                                                        <a class="artist-link" @click.stop="$store.library.openArtist(artist.id)" x-text="artist.label"></a>
+                                                    </span>
+                                                </template>
+                                            </div>
                                         </div>
                                     </div>
                                     <span></span>
@@ -685,7 +726,8 @@
             <template x-if="$store.library.view === 'release_detail' && $store.library.currentRelease">
                 <div>
                     <div class="breadcrumb">
-                        <a @click="$store.library.goArtists()">{{ t.player_artists }}</a>
+                        <a @click="$store.library.artistFilter === 'uploads' ? $store.library.goMyUploads() : $store.library.goArtists()"
+                           x-text="$store.library.artistFilter === 'uploads' ? '{{ t.player_my_uploads }}' : '{{ t.player_artists }}'"></a>
                         <span>/</span>
                         <template x-if="$store.library.currentRelease.artists.length > 0">
                             <a @click="$store.library.openArtist($store.library.currentRelease.artists[0].id)" x-text="$store.library.currentRelease.artists[0].name"></a>
@@ -949,16 +991,14 @@
 
     <!-- Player Bar -->
     <div class="player-bar"
-         :class="{ 'mobile-expanded': $store.mobile.playerExpanded, 'mobile-dragging': $store.mobile.playerDragging }"
+         :class="{ 'mobile-expanded': $store.mobile.playerExpanded }">
-         :style="$store.mobile.playerDragStyle()"
+        <div class="mobile-full-player">
-         @click.capture="$store.mobile.handlePlayerClick($event)"
+            <button class="mobile-player-collapse-btn" type="button" @click.stop="$store.mobile.closePlayerFullscreen()" title="{{ t.player_close }}" aria-label="{{ t.player_close }}">
-         @pointerdown="$store.mobile.startPlayerDrag($event)">
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4">
-        <button class="mobile-player-collapse-btn" type="button" @click.stop="$store.mobile.closePlayerFullscreen()" title="{{ t.player_close }}" aria-label="{{ t.player_close }}">
+                    <path d="M6 9l6 6 6-6"/>
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4">
+                </svg>
-                <path d="M6 9l6 6 6-6"/>
+            </button>
-            </svg>
+            <div class="player-now-playing">
-        </button>
-        <div class="player-now-playing">
             <template x-if="$store.player.currentTrack">
                 <div style="display:flex;align-items:center;gap:12px;overflow:hidden">
                     <div class="player-cover"
@@ -998,9 +1038,9 @@
                     </div>
                 </div>
             </template>
-        </div>
+            </div>
 
-        <div class="player-controls">
+            <div class="player-controls">
             <div class="player-buttons">
                 <button class="player-btn" :class="{ active: $store.player.shuffle }" @click="$store.player.toggleShuffle()" title="{{ t.player_shuffle }}">
                     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="16 3 21 3 21 8"/><line x1="4" y1="20" x2="21" y2="3"/><polyline points="21 16 21 21 16 21"/><line x1="15" y1="15" x2="21" y2="21"/><line x1="4" y1="4" x2="9" y2="9"/></svg>
@@ -1040,9 +1080,9 @@
                 <span class="player-time" x-text="formatTime($store.player.duration)"></span>
             </div>
             <div class="player-version-chip">v{{ t.app_version() }}</div>
-        </div>
+            </div>
 
-        <div class="player-right">
+            <div class="player-right">
             <div class="volume-control">
                 <button class="volume-btn" @click="$store.player.toggleMute()">
                     <template x-if="$store.player.volume === 0">
@@ -1067,6 +1107,16 @@
                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
             </button>
             <div class="device-picker" @click.outside="$store.devices.open = false">
+                <template x-if="$store.devices.remoteHintVisible">
+                    <button class="remote-playback-hint"
+                            type="button"
+                            @click="$store.devices.dismissRemoteHint()"
+                            x-transition
+                            x-cloak>
+                        <span class="remote-playback-hint-text" x-text="$store.devices.remoteHintText()"></span>
+                        <span class="remote-playback-hint-progress"></span>
+                    </button>
+                </template>
                 <button class="queue-toggle-btn device-toggle-btn"
                         :class="{ active: $store.devices.isActive() }"
                         @click="$store.devices.toggle()"
@@ -1190,8 +1240,8 @@
                     </div>
                 </div>
             </div>
-        </div>
+            </div>
-        <div class="mobile-expanded-queue">
+            <div class="mobile-expanded-queue">
             <div class="mobile-expanded-queue-title">{{ t.player_queue }}</div>
             <template x-if="$store.queue.upcoming().length === 0">
                 <div class="mobile-expanded-queue-empty">{{ t.player_queue_empty }}</div>
@@ -1224,5 +1274,6 @@
                     <span class="mobile-expanded-queue-time" x-text="formatTime(track.duration_seconds)"></span>
                 </button>
             </template>
+            </div>
         </div>
     </div>

templates/player/styles.html

@@ -735,6 +735,47 @@ button.user-stat:hover {
     margin-top: 2px;
 }
 
+.artist-appearance-row .track-info {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.artist-appearance-cover {
+    width: 42px;
+    height: 42px;
+    border: 0;
+    border-radius: 4px;
+    background: var(--bg-elevated);
+    color: var(--text-subdued);
+    cursor: pointer;
+    flex: 0 0 42px;
+    overflow: hidden;
+    padding: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.artist-appearance-cover img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.artist-appearance-cover svg {
+    width: 22px;
+    height: 22px;
+}
+
+.artist-appearance-cover:hover {
+    filter: brightness(1.14);
+}
+
+.artist-appearance-copy {
+    min-width: 0;
+}
+
 .track-album { font-size: 13px; color: var(--text-subdued); }
 .track-duration { font-size: 13px; color: var(--text-subdued); text-align: right; pointer-events: none; }
 
@@ -911,6 +952,12 @@ button.user-stat:hover {
     color: #000;
 }
 
+.release-action-btn:disabled {
+    opacity: 0.45;
+    cursor: default;
+    filter: grayscale(0.4);
+}
+
 .release-action-btn.secondary {
     background: var(--bg-active);
     color: var(--text-primary);
@@ -921,6 +968,29 @@ button.user-stat:hover {
     color: #000;
 }
 
+.artist-actions {
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.artist-listen-action {
+    min-width: 112px;
+    justify-content: center;
+}
+
+.artist-follow-action,
+.artist-follow-action.followed {
+    background: var(--bg-active);
+    color: var(--text-secondary);
+    border: 1px solid var(--border-color);
+}
+
+.artist-follow-action:hover,
+.artist-follow-action.followed:hover {
+    color: var(--text-primary);
+    border-color: var(--text-subdued);
+}
+
 .artist-follow-card-btn {
     position: absolute;
     bottom: 8px;
@@ -1341,19 +1411,35 @@ button.user-stat:hover {
 
 .volume-slider {
     width: 104px;
-    height: 4px;
+    height: 28px;
-    background: var(--bg-active);
+    background: transparent;
-    border-radius: 2px;
+    border-radius: 6px;
     cursor: pointer;
     position: relative;
     touch-action: none;
+    display: flex;
+    align-items: center;
+}
+
+.volume-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 50%;
+    height: 4px;
+    border-radius: 2px;
+    background: var(--bg-active);
+    transform: translateY(-50%);
 }
 
 .volume-slider-fill {
-    height: 100%;
+    height: 4px;
     background: var(--text-primary);
     border-radius: 2px;
     position: relative;
+    z-index: 1;
+    pointer-events: none;
 }
 
 .volume-slider:hover .volume-slider-fill { background: var(--accent); }
@@ -1423,6 +1509,51 @@ button.user-stat:hover {
     justify-content: center;
 }
 
+.remote-playback-hint {
+    position: absolute;
+    right: 0;
+    bottom: 38px;
+    width: max-content;
+    max-width: min(280px, calc(100vw - 24px));
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    background: var(--bg-elevated);
+    color: var(--text-primary);
+    box-shadow: 0 14px 34px rgba(0,0,0,0.46);
+    cursor: pointer;
+    font: inherit;
+    overflow: hidden;
+    padding: 10px 12px 12px;
+    text-align: left;
+    z-index: 44;
+}
+
+.remote-playback-hint-text {
+    display: block;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 13px;
+    line-height: 1.35;
+}
+
+.remote-playback-hint-progress {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 2px;
+    background: var(--accent);
+    transform-origin: left center;
+    animation: remote-playback-hint-progress 60s linear forwards;
+}
+
+@keyframes remote-playback-hint-progress {
+    from { transform: scaleX(1); }
+    to { transform: scaleX(0); }
+}
+
 .device-popover {
     position: absolute;
     right: 0;
@@ -2212,6 +2343,46 @@ button.user-stat:hover {
     margin: 0;
 }
 
+.info-actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin: -4px 0 12px;
+    flex-wrap: wrap;
+    position: relative;
+    z-index: 1;
+}
+
+.info-action-btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 38px;
+    padding: 9px 15px;
+    border: 0;
+    border-radius: 8px;
+    background: var(--accent);
+    color: #061307;
+    font-size: 13px;
+    font-weight: 800;
+    cursor: pointer;
+    box-shadow: 0 8px 22px rgba(29, 185, 84, 0.2);
+    transition: background 0.15s, transform 0.15s, box-shadow 0.15s;
+}
+
+.info-action-btn:hover {
+    background: var(--accent-hover);
+    transform: translateY(-1px);
+    box-shadow: 0 10px 26px rgba(29, 185, 84, 0.28);
+}
+
+.info-action-btn:disabled {
+    opacity: 0.7;
+    cursor: default;
+    transform: none;
+    box-shadow: none;
+}
+
 .info-modal-body {
     margin: 0;
     padding: 14px;
@@ -2714,36 +2885,87 @@ button.user-stat:hover {
 }
 
 .history-modal {
-    width: min(620px, calc(100vw - 32px));
+    width: min(980px, calc(100vw - 32px));
-    max-width: 620px;
+    max-width: 980px;
+}
+
+.history-head {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 14px;
 }
 
 .history-list {
     margin-top: 12px;
     overflow-y: auto;
     max-height: min(54vh, 460px);
-    border: 1px solid var(--border-color);
+    border-top: 1px solid var(--border-color);
-    border-radius: 8px;
+    border-bottom: 1px solid var(--border-color);
 }
 
-.history-row {
+.history-table-head,
+.history-row.track-row {
     display: grid;
-    grid-template-columns: minmax(0, 1fr) auto;
+    grid-template-columns: 48px minmax(0, 1fr) 144px 154px 72px;
-    gap: 8px 12px;
+    align-items: center;
-    padding: 10px 12px;
+    gap: 10px;
+}
+
+.history-table-head {
+    position: sticky;
+    top: 0;
+    z-index: 3;
+    padding: 8px 12px;
+    background: var(--bg-elevated);
+    color: var(--text-subdued);
+    font-size: 11px;
+    font-weight: 800;
+    text-transform: uppercase;
+}
+
+.history-row.track-row {
+    padding: 8px 12px;
+    border-radius: 0;
     border-bottom: 1px solid var(--border-color);
 }
 
 .history-row:last-child { border-bottom: 0; }
 
-.history-title {
+.history-cover {
-    min-width: 0;
+    width: 40px;
-    color: var(--text-primary);
+    height: 40px;
-    font-size: 13px;
+    padding: 0;
-    font-weight: 700;
+    border: 0;
+    border-radius: 5px;
+    background: var(--bg-active);
+    color: var(--text-subdued);
+    overflow: hidden;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.history-cover img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    display: block;
+}
+
+.history-cover svg {
+    width: 21px;
+    height: 21px;
+}
+
+.history-release-line {
+    margin-top: 2px;
+    color: var(--text-subdued);
+    font-size: 12px;
+    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap;
 }
 
 .history-release,
@@ -2751,14 +2973,16 @@ button.user-stat:hover {
 .history-duration {
     color: var(--text-subdued);
     font-size: 12px;
+    line-height: 1.35;
 }
 
 .history-date,
 .history-duration {
-    text-align: right;
     white-space: nowrap;
 }
 
+.history-duration { text-align: right; }
+
 .history-pager {
     display: flex;
     align-items: center;
@@ -3117,7 +3341,40 @@ button.user-stat:hover {
 
 .upload-release-tree {
     display: grid;
-    gap: 8px;
+    gap: 12px;
+}
+
+.upload-artist-group {
+    display: grid;
+    gap: 7px;
+    min-width: 0;
+}
+
+.upload-artist-row {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    gap: 10px;
+    min-width: 0;
+    padding: 2px 2px 0;
+}
+
+.upload-artist-name {
+    min-width: 0;
+    overflow: hidden;
+    color: var(--text-primary);
+    font-size: 13px;
+    font-weight: 950;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.upload-artist-meta {
+    flex: 0 0 auto;
+    color: var(--text-subdued);
+    font-size: 11px;
+    font-weight: 750;
+    white-space: nowrap;
 }
 
 .upload-release-node {
@@ -3211,6 +3468,60 @@ button.user-stat:hover {
     text-transform: uppercase;
 }
 
+.upload-panel-title-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 8px;
+    flex-wrap: wrap;
+    margin-bottom: 8px;
+}
+
+.upload-queue-nav {
+    display: inline-flex;
+    align-items: center;
+    gap: 5px;
+    margin-left: auto;
+}
+
+.upload-queue-range {
+    color: var(--text-subdued);
+    font-size: 11px;
+    font-weight: 850;
+    text-transform: none;
+    white-space: nowrap;
+}
+
+.upload-queue-nav-btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    padding: 0;
+    border: 1px solid var(--border-color);
+    border-radius: 6px;
+    background: var(--bg-secondary);
+    color: var(--text-secondary);
+    cursor: pointer;
+}
+
+.upload-queue-nav-btn:hover:not(:disabled) {
+    border-color: var(--text-subdued);
+    background: var(--bg-elevated);
+    color: var(--text-primary);
+}
+
+.upload-queue-nav-btn:disabled {
+    cursor: default;
+    opacity: 0.42;
+}
+
+.upload-queue-nav-btn svg {
+    width: 14px;
+    height: 14px;
+}
+
 .upload-queue-row {
     display: grid;
     grid-template-columns: auto minmax(0, 1fr);
@@ -3522,6 +3833,10 @@ button.user-stat:hover {
     display: none;
 }
 
+.mobile-full-player {
+    display: contents;
+}
+
 .playlist-action-btn {
     background: none;
     border: none;
@@ -3574,7 +3889,7 @@ button.user-stat:hover {
     .release-meta .release-title { font-size: 32px; }
 }
 
-@media (max-width: 900px) {
+@media (max-width: 900px), (pointer: coarse) and (max-width: 1024px) {
     :root {
         --player-height: 168px;
         --player-bar-space: calc(var(--player-height) + var(--safe-bottom));
@@ -3678,6 +3993,44 @@ button.user-stat:hover {
         justify-content: flex-end;
     }
 
+    .history-table-head,
+    .history-row.track-row {
+        grid-template-columns: 44px minmax(0, 1fr) auto;
+        gap: 8px;
+    }
+
+    .history-table-head {
+        display: none;
+    }
+
+    .history-row.track-row {
+        padding: 9px 10px;
+    }
+
+    .history-row .history-cover {
+        grid-row: 1 / span 2;
+    }
+
+    .history-row .track-info {
+        grid-column: 2;
+        grid-row: 1;
+    }
+
+    .history-row .history-date {
+        grid-column: 2;
+        grid-row: 2;
+        font-size: 11px;
+    }
+
+    .history-row .track-actions {
+        grid-column: 3;
+        grid-row: 1 / span 2;
+    }
+
+    .history-duration {
+        display: none;
+    }
+
     .queue-panel {
         position: fixed;
         left: 12px;
@@ -3719,7 +4072,7 @@ button.user-stat:hover {
         gap: 4px 10px;
         align-items: center;
         padding: 34px 12px calc(9px + var(--safe-bottom));
-        touch-action: none;
+        touch-action: auto;
         user-select: none;
     }
 
@@ -3913,13 +4266,19 @@ button.user-stat:hover {
     }
 
     .volume-slider {
-        display: block;
+        display: flex;
         width: 100%;
-        height: 9px;
+        height: 34px;
-        border-radius: 999px;
+        border-radius: 6px;
     }
 
     .volume-slider-fill {
+        height: 7px;
+        border-radius: 999px;
+    }
+
+    .volume-slider::before {
+        height: 7px;
         border-radius: 999px;
     }
 
@@ -3955,20 +4314,32 @@ button.user-stat:hover {
         height: 21px;
     }
 
-    .player-bar.mobile-dragging:not(.mobile-expanded) {
+    .player-bar.mobile-expanded {
         position: fixed;
         left: 0;
         right: 0;
-        bottom: 0;
+        top: 0;
-        height: calc(var(--player-bar-space) + var(--mobile-player-drag, 0px));
+        bottom: auto;
-        z-index: 70;
+        height: 100dvh;
-        border-radius: 18px 18px 0 0;
+        display: block;
-        box-shadow: 0 -18px 54px rgba(0,0,0,0.5);
+        padding: 0;
+        border-top: 0;
+        border-radius: 0;
+        background: var(--bg-primary);
+        box-shadow: none;
+        overflow: hidden;
+        overscroll-behavior: contain;
+        z-index: 80;
+        touch-action: auto;
+        user-select: auto;
+        transform: translateZ(0);
     }
 
-    .player-bar.mobile-expanded {
+    .player-bar.mobile-expanded .mobile-full-player {
-        position: fixed;
+        position: absolute;
-        inset: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
         height: 100dvh;
         display: flex;
         flex-direction: column;
@@ -3976,26 +4347,14 @@ button.user-stat:hover {
         gap: 16px;
         align-items: center;
         padding: calc(18px + env(safe-area-inset-top)) 18px calc(16px + var(--safe-bottom));
-        border-top: 0;
-        border-radius: 0;
-        background: var(--bg-primary);
-        box-shadow: none;
         overflow-y: auto;
         overscroll-behavior: contain;
-        z-index: 80;
+        z-index: 3;
-        transform: translateY(var(--mobile-player-close-drag, 0px));
-        transition: transform 0.18s ease, height 0.18s ease;
-        touch-action: pan-y;
-        user-select: auto;
     }
 
-    .player-bar.mobile-dragging {
+    .player-bar.mobile-expanded .mobile-full-player .mobile-player-collapse-btn {
-        transition: none;
-    }
-
-    .player-bar.mobile-expanded .mobile-player-collapse-btn {
         display: flex;
-        position: absolute;
+        position: fixed;
         top: calc(12px + env(safe-area-inset-top));
         right: 12px;
         width: 42px;
@@ -4014,7 +4373,7 @@ button.user-stat:hover {
         height: 22px;
     }
 
-    .player-bar.mobile-expanded .player-now-playing {
+    .player-bar.mobile-expanded .mobile-full-player .player-now-playing {
         justify-content: center;
         align-self: stretch;
         width: 100%;
@@ -4022,11 +4381,11 @@ button.user-stat:hover {
         flex: 0 0 auto;
         overflow: visible;
         padding-top: 38px;
-        touch-action: none;
+        touch-action: auto;
-        cursor: grab;
+        cursor: default;
     }
 
-    .player-bar.mobile-expanded .player-now-playing > div {
+    .player-bar.mobile-expanded .mobile-full-player .player-now-playing > div {
         width: 100%;
         flex-direction: column;
         justify-content: center;
@@ -4035,60 +4394,56 @@ button.user-stat:hover {
         text-align: center;
     }
 
-    .player-bar.mobile-expanded.mobile-dragging .player-now-playing {
+    .player-bar.mobile-expanded .mobile-full-player .player-cover {
-        cursor: grabbing;
-    }
-
-    .player-bar.mobile-expanded .player-cover {
         width: min(76vw, 38dvh, 360px);
         height: auto;
         aspect-ratio: 1;
         border-radius: 14px;
         box-shadow: 0 22px 62px rgba(0,0,0,0.48);
-        touch-action: none;
+        touch-action: manipulation;
     }
 
-    .player-bar.mobile-expanded .player-cover svg {
+    .player-bar.mobile-expanded .mobile-full-player .player-cover svg {
         width: 96px;
         height: 96px;
     }
 
-    .player-bar.mobile-expanded .player-track-info {
+    .player-bar.mobile-expanded .mobile-full-player .player-track-info {
         width: min(100%, 520px);
         overflow: visible;
     }
 
-    .player-bar.mobile-expanded .player-track-title-row {
+    .player-bar.mobile-expanded .mobile-full-player .player-track-title-row {
         justify-content: center;
     }
 
-    .player-bar.mobile-expanded .player-track-title {
+    .player-bar.mobile-expanded .mobile-full-player .player-track-title {
         font-size: 22px;
         font-weight: 800;
         white-space: normal;
         text-align: center;
     }
 
-    .player-bar.mobile-expanded .player-track-artist {
+    .player-bar.mobile-expanded .mobile-full-player .player-track-artist {
         margin-top: 5px;
         font-size: 14px;
         white-space: normal;
         text-align: center;
     }
 
-    .player-bar.mobile-expanded .player-current-like {
+    .player-bar.mobile-expanded .mobile-full-player .player-current-like {
         display: flex;
         width: 38px;
         height: 38px;
     }
 
-    .player-bar.mobile-expanded .player-track-release {
+    .player-bar.mobile-expanded .mobile-full-player .player-track-release {
         margin-top: 4px;
         font-size: 13px;
         white-space: normal;
     }
 
-    .player-bar.mobile-expanded .player-controls {
+    .player-bar.mobile-expanded .mobile-full-player .player-controls {
         display: flex;
         width: 100%;
         flex: 0 0 auto;
@@ -4097,32 +4452,32 @@ button.user-stat:hover {
         gap: 14px;
     }
 
-    .player-bar.mobile-expanded .player-version-chip {
+    .player-bar.mobile-expanded .mobile-full-player .player-version-chip {
         display: none;
     }
 
-    .player-bar.mobile-expanded .player-buttons {
+    .player-bar.mobile-expanded .mobile-full-player .player-buttons {
         justify-self: center;
         gap: 18px;
         order: 2;
     }
 
-    .player-bar.mobile-expanded .player-btn {
+    .player-bar.mobile-expanded .mobile-full-player .player-btn {
         min-width: 56px;
         min-height: 56px;
     }
 
-    .player-bar.mobile-expanded .player-btn svg {
+    .player-bar.mobile-expanded .mobile-full-player .player-btn svg {
         width: 28px;
         height: 28px;
     }
 
-    .player-bar.mobile-expanded .player-btn-play {
+    .player-bar.mobile-expanded .mobile-full-player .player-btn-play {
         width: 72px;
         height: 72px;
     }
 
-    .player-bar.mobile-expanded .player-timeline {
+    .player-bar.mobile-expanded .mobile-full-player .player-timeline {
         width: 100%;
         max-width: none;
         justify-self: center;
@@ -4131,16 +4486,16 @@ button.user-stat:hover {
         order: 1;
     }
 
-    .player-bar.mobile-expanded .progress-bar {
+    .player-bar.mobile-expanded .mobile-full-player .progress-bar {
         height: 7px;
         border-radius: 999px;
     }
 
-    .player-bar.mobile-expanded .progress-bar-thumb {
+    .player-bar.mobile-expanded .mobile-full-player .progress-bar-thumb {
         opacity: 1;
     }
 
-    .player-bar.mobile-expanded .player-right {
+    .player-bar.mobile-expanded .mobile-full-player .player-right {
         position: static;
         grid-area: actions;
         justify-self: center;
@@ -4153,28 +4508,28 @@ button.user-stat:hover {
         background: transparent;
     }
 
-    .player-bar.mobile-expanded .volume-control {
+    .player-bar.mobile-expanded .mobile-full-player .volume-control {
         grid-template-columns: 44px minmax(0, 1fr);
         gap: 8px;
     }
 
-    .player-bar.mobile-expanded .volume-btn,
+    .player-bar.mobile-expanded .mobile-full-player .volume-btn,
-    .player-bar.mobile-expanded .queue-toggle-btn {
+    .player-bar.mobile-expanded .mobile-full-player .queue-toggle-btn {
         min-width: 48px;
         min-height: 48px;
         padding: 10px;
     }
 
-    .player-bar.mobile-expanded .volume-btn {
+    .player-bar.mobile-expanded .mobile-full-player .volume-btn {
         min-width: 44px;
     }
 
-    .player-bar.mobile-expanded .volume-slider {
+    .player-bar.mobile-expanded .mobile-full-player .volume-slider {
-        display: block;
+        display: flex;
-        height: 7px;
+        height: 44px;
     }
 
-    .player-bar.mobile-expanded .device-popover {
+    .player-bar.mobile-expanded .mobile-full-player .device-popover {
         position: fixed;
         top: auto;
         bottom: calc(90px + var(--safe-bottom));
@@ -4185,7 +4540,15 @@ button.user-stat:hover {
         max-height: 42dvh;
     }
 
-    .player-bar.mobile-expanded .mobile-expanded-queue {
+    .player-bar.mobile-expanded .mobile-full-player .remote-playback-hint {
+        position: fixed;
+        top: auto;
+        bottom: calc(90px + var(--safe-bottom));
+        right: 18px;
+        max-width: calc(100vw - 36px);
+    }
+
+    .player-bar.mobile-expanded .mobile-full-player .mobile-expanded-queue {
         display: block;
         width: 100%;
         max-height: none;
@@ -4478,6 +4841,42 @@ button.user-stat:hover {
         max-width: 400px;
     }
 
+    .history-list {
+        max-height: min(60dvh, 520px);
+    }
+
+    .history-row.track-row {
+        grid-template-columns: 42px minmax(0, 1fr) auto;
+        gap: 8px;
+        padding: 9px 8px;
+    }
+
+    .history-cover {
+        width: 38px;
+        height: 38px;
+    }
+
+    .history-row .track-actions {
+        gap: 0;
+    }
+
+    .history-row .track-actions .track-action-btn,
+    .history-row .track-actions .like-btn {
+        width: 26px;
+        height: 26px;
+        flex-basis: 26px;
+        padding: 5px;
+    }
+
+    .history-row .track-actions .popularity-info-btn {
+        min-width: 24px;
+        padding: 0 2px;
+    }
+
+    .history-release-line {
+        display: none;
+    }
+
     .info-table th,
     .info-table td {
         display: block;
@@ -4770,7 +5169,7 @@ button.user-stat:hover {
     }
 
     .volume-slider {
-        display: block;
+        display: flex;
         width: 100%;
     }
 
@@ -4795,26 +5194,26 @@ button.user-stat:hover {
         height: 24px;
     }
 
-    .player-bar.mobile-expanded {
+    .player-bar.mobile-expanded .mobile-full-player {
         gap: 14px;
         padding-left: 14px;
         padding-right: 14px;
     }
 
-    .player-bar.mobile-expanded .player-cover {
+    .player-bar.mobile-expanded .mobile-full-player .player-cover {
         width: min(82vw, 36dvh, 340px);
     }
 
-    .player-bar.mobile-expanded .player-buttons {
+    .player-bar.mobile-expanded .mobile-full-player .player-buttons {
         gap: 12px;
     }
 
-    .player-bar.mobile-expanded .player-btn {
+    .player-bar.mobile-expanded .mobile-full-player .player-btn {
         min-width: 52px;
         min-height: 52px;
     }
 
-    .player-bar.mobile-expanded .player-btn-play {
+    .player-bar.mobile-expanded .mobile-full-player .player-btn-play {
         width: 68px;
         height: 68px;
     }