PLAYER: Added generated playlists feature

Cargo.lock

@@ -1418,7 +1418,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "furumusic"
-version = "0.2.5"
+version = "0.2.10"
 dependencies = [
  "anyhow",
  "async-trait",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "furumusic"
-version = "0.2.6"
+version = "0.2.10"
 edition = "2024"
 description = "Reusable web-app boilerplate: auth, OIDC/SSO, admin panel, user management, i18n, PostgreSQL"
 

src/admin/mod.rs

@@ -282,6 +282,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

@@ -9,7 +9,7 @@ use cot::response::IntoResponse;
 use cot::session::Session;
 use cot::{Body, Template};
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 use sqlx::{PgPool, Postgres, QueryBuilder};
 
 use super::BUILD_INFO;
@@ -17,7 +17,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")]
@@ -61,6 +61,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,
@@ -68,9 +86,12 @@ pub(super) struct UpdateLibraryItemRequest {
     title: String,
     hidden: bool,
     release_type: Option<String>,
+    #[serde(default, deserialize_with = "deserialize_optional_stringish")]
     year: Option<String>,
     release_id: Option<i64>,
+    #[serde(default, deserialize_with = "deserialize_optional_stringish")]
     track_number: Option<String>,
+    #[serde(default, deserialize_with = "deserialize_optional_stringish")]
     disc_number: Option<String>,
     artist_ids: Option<Vec<i64>>,
 }
@@ -158,6 +179,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>,
@@ -396,6 +425,7 @@ struct LibraryItemDetailDto {
     artists: Vec<ArtistOptionDto>,
     releases: Vec<ReleaseOptionDto>,
     available_covers: Vec<AvailableCoverDto>,
+    metadata_tags: Vec<MetadataTagDto>,
 }
 
 #[derive(Debug, Serialize, JsonSchema)]
@@ -886,6 +916,68 @@ 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,
@@ -1876,7 +1968,7 @@ async fn fetch_library_item(
         "releases" => {
             sqlx::query_as::<_, LibraryItemRow>(
                 "SELECT r.id, r.title::text AS title, \
-                        CONCAT(r.release_type::text, COALESCE(' · ' || r.year::text, '')) AS subtitle, \
+                        (COALESCE(NULLIF(STRING_AGG(DISTINCT a.name::text, ', '), ''), 'Unknown artist') || COALESCE(' / ' || r.year::text, '')) AS subtitle, \
                         r.is_hidden, COUNT(DISTINCT t.id)::bigint AS primary_count, \
                         COUNT(DISTINCT ra.artist_id)::bigint AS secondary_count, \
                         COUNT(DISTINCT ph.id)::bigint AS tertiary_count, \
@@ -1884,6 +1976,7 @@ async fn fetch_library_item(
                  FROM furumusic__release r \
                  LEFT JOIN furumusic__track t ON t.release_id = r.id \
                  LEFT JOIN furumusic__release_artist ra ON ra.release_id = r.id \
+                 LEFT JOIN furumusic__artist a ON a.id = ra.artist_id \
                  LEFT JOIN furumusic__play_history ph ON ph.track_id = t.id \
                  WHERE r.id = $1 \
                  GROUP BY r.id",
@@ -1970,6 +2063,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,
     };
 
@@ -2040,6 +2134,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",
@@ -2055,8 +2240,11 @@ async fn load_artist_options(pool: &PgPool) -> anyhow::Result<Vec<ArtistOptionDt
 async fn load_release_options(pool: &PgPool) -> anyhow::Result<Vec<ReleaseOptionDto>> {
     let rows = sqlx::query_as::<_, (i64, String, Option<String>)>(
         "SELECT r.id, r.title::text AS title, \
-                CONCAT(r.release_type::text, COALESCE(' / ' || r.year::text, '')) AS subtitle \
+                (COALESCE(NULLIF(STRING_AGG(DISTINCT a.name::text, ', '), ''), 'Unknown artist') || COALESCE(' / ' || r.year::text, '')) AS subtitle \
          FROM furumusic__release r \
+         LEFT JOIN furumusic__release_artist ra ON ra.release_id = r.id \
+         LEFT JOIN furumusic__artist a ON a.id = ra.artist_id \
+         GROUP BY r.id \
          ORDER BY r.title_sort ASC, r.year NULLS LAST, r.id ASC",
     )
     .fetch_all(pool)
@@ -2452,7 +2640,7 @@ async fn load_release_items(
 ) -> anyhow::Result<Vec<LibraryItemRow>> {
     let mut qb = QueryBuilder::<Postgres>::new(
         "SELECT r.id, r.title::text AS title, \
-                CONCAT(r.release_type::text, COALESCE(' · ' || r.year::text, '')) AS subtitle, \
+                (COALESCE(NULLIF(STRING_AGG(DISTINCT a.name::text, ', '), ''), 'Unknown artist') || COALESCE(' / ' || r.year::text, '')) AS subtitle, \
                 r.is_hidden, COUNT(DISTINCT t.id)::bigint AS primary_count, \
                 COUNT(DISTINCT ra.artist_id)::bigint AS secondary_count, \
                 COUNT(DISTINCT ph.id)::bigint AS tertiary_count, \
@@ -2648,6 +2836,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
@@ -2657,10 +2849,12 @@ fn optional_job_time(value: &str) -> Option<String> {
 }
 
 fn normalize_library_kind(kind: Option<&str>) -> String {
-    match kind {
+    let kind = kind.unwrap_or_default().trim().to_ascii_lowercase();
-        Some("releases") => "releases",
+    match kind.as_str() {
-        Some("tracks") => "tracks",
+        "release" | "releases" => "releases",
-        Some("playlists") => "playlists",
+        "track" | "tracks" => "tracks",
+        "playlist" | "playlists" => "playlists",
+        "artist" | "artists" => "artists",
         _ => "artists",
     }
     .to_owned()
@@ -2696,6 +2890,23 @@ fn parse_optional_admin_i32(value: Option<&str>, min: i32, max: i32) -> Option<i
         .map(|parsed| parsed.clamp(min, max))
 }
 
+fn deserialize_optional_stringish<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let Some(value) = Option::<serde_json::Value>::deserialize(deserializer)? else {
+        return Ok(None);
+    };
+    match value {
+        serde_json::Value::Null => Ok(None),
+        serde_json::Value::String(value) => Ok(Some(value)),
+        serde_json::Value::Number(value) => Ok(Some(value.to_string())),
+        other => Err(serde::de::Error::custom(format!(
+            "expected string, number, or null, got {other}"
+        ))),
+    }
+}
+
 fn now_string() -> String {
     chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string()
 }

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

@@ -370,7 +370,8 @@ pub async fn save_cover_to_storage(
     }
 
     let ext = extension_for_mime(&cover.mime_type);
-    let filename = format!("cover.{ext}");
+    let hash_prefix: String = hash.chars().take(12).collect();
+    let filename = format!("cover-{hash_prefix}.{ext}");
 
     let artist_dir = sanitize_dir_name(artist_name);
     let album_dir = sanitize_dir_name(release_title);

src/i18n/phrases.rs

@@ -346,6 +346,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"             , "Добавить в конец очереди";

src/jobs/inbox_process.rs

@@ -878,6 +878,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/jobs/metadata_backfill.rs

@@ -1,11 +1,20 @@
+use std::time::Duration;
+
+use serde_json::Value;
+
 use crate::scheduler::{Job, JobContext, JobLog};
 
+const LASTFM_TAG_REQUEST_DELAY: Duration = Duration::from_millis(1200);
+const LASTFM_TAG_LIMIT: usize = 12;
+
 #[derive(Debug, Clone, Copy)]
 pub struct MetadataBackfillOptions {
     pub audio_bitrate: bool,
     pub audio_sample_rate: bool,
     pub audio_bit_depth: bool,
     pub duration_seconds: bool,
+    pub local_genres: bool,
+    pub lastfm_tags: bool,
     pub overwrite: bool,
 }
 
@@ -15,6 +24,16 @@ impl MetadataBackfillOptions {
             || self.audio_sample_rate
             || self.audio_bit_depth
             || self.duration_seconds
+            || self.local_genres
+            || self.lastfm_tags
+    }
+
+    fn needs_file_scan(self) -> bool {
+        self.audio_bitrate
+            || self.audio_sample_rate
+            || self.audio_bit_depth
+            || self.duration_seconds
+            || self.local_genres
     }
 }
 
@@ -29,6 +48,42 @@ struct BackfillRow {
     duration_seconds: Option<f64>,
 }
 
+#[derive(sqlx::FromRow)]
+struct LastfmArtistTagRow {
+    id: i64,
+    name: String,
+}
+
+#[derive(sqlx::FromRow)]
+struct LastfmReleaseTagRow {
+    id: i64,
+    title: String,
+    artist_name: Option<String>,
+}
+
+#[derive(sqlx::FromRow)]
+struct LastfmTrackTagRow {
+    id: i64,
+    title: String,
+    artist_name: Option<String>,
+}
+
+#[derive(Debug, Clone)]
+struct TagCandidate {
+    name: String,
+    weight: f64,
+}
+
+#[derive(Debug, Default)]
+struct LastfmTagStats {
+    considered: u64,
+    updated_entities: u64,
+    tags_saved: u64,
+    skipped_existing: u64,
+    not_found: u64,
+    failed: u64,
+}
+
 pub struct MetadataBackfillJob;
 
 #[async_trait::async_trait]
@@ -38,7 +93,7 @@ impl Job for MetadataBackfillJob {
     }
 
     fn description(&self) -> &'static str {
-        "Backfill technical audio metadata from existing files"
+        "Backfill technical audio metadata, local genres, and Last.fm tags"
     }
 
     fn default_cron(&self) -> &'static str {
@@ -54,6 +109,8 @@ impl Job for MetadataBackfillJob {
                 audio_sample_rate: true,
                 audio_bit_depth: true,
                 duration_seconds: true,
+                local_genres: true,
+                lastfm_tags: true,
                 overwrite: false,
             },
         )
@@ -71,6 +128,27 @@ pub async fn run_with_options(
         return Ok(());
     }
 
+    let mut scanned = 0u64;
+    let mut media_updated = 0u64;
+    let mut track_updated = 0u64;
+    let mut local_tags_updated = 0u64;
+    let mut unchanged = 0u64;
+    let mut missing = 0u64;
+    let mut failed = 0u64;
+
+    log.info(&format!(
+        "Metadata backfill options: file_scan={}, local_genres={}, lastfm_tags={}, mode={}",
+        options.needs_file_scan(),
+        options.local_genres,
+        options.lastfm_tags,
+        if options.overwrite {
+            "overwrite"
+        } else {
+            "fill_missing"
+        }
+    ));
+
+    if options.needs_file_scan() {
         let rows = sqlx::query_as::<_, BackfillRow>(
             "SELECT mf.id AS media_file_id, mf.file_path, \
                     mf.audio_bitrate, mf.audio_sample_rate, mf.audio_bit_depth, \
@@ -84,7 +162,7 @@ pub async fn run_with_options(
         .await?;
 
         log.info(&format!(
-        "Metadata backfill started: {} audio file(s), mode={}",
+            "Metadata file backfill started: {} audio file(s), mode={}",
             rows.len(),
             if options.overwrite {
                 "overwrite"
@@ -93,13 +171,6 @@ pub async fn run_with_options(
             }
         ));
 
-    let mut scanned = 0u64;
-    let mut media_updated = 0u64;
-    let mut track_updated = 0u64;
-    let mut unchanged = 0u64;
-    let mut missing = 0u64;
-    let mut failed = 0u64;
-
         for row in rows {
             scanned += 1;
             let path = crate::media_paths::resolve_media_file_path(
@@ -142,7 +213,8 @@ pub async fn run_with_options(
                     changed_media = next_bitrate != row.audio_bitrate || changed_media;
                 }
             }
-        if options.audio_sample_rate && should_update(row.audio_sample_rate, options.overwrite) {
+            if options.audio_sample_rate && should_update(row.audio_sample_rate, options.overwrite)
+            {
                 if let Some(value) = raw_meta.audio_sample_rate {
                     next_sample_rate = Some(value);
                     changed_media = next_sample_rate != row.audio_sample_rate || changed_media;
@@ -170,6 +242,24 @@ pub async fn run_with_options(
                 }
             }
 
+            let mut changed_tags = false;
+            if options.local_genres {
+                if let (Some(track_id), Some(genre)) = (row.track_id, raw_meta.genre.as_deref()) {
+                    let saved = save_track_tag_text(
+                        &ctx.pool,
+                        track_id,
+                        genre,
+                        "file",
+                        options.overwrite,
+                    )
+                    .await?;
+                    if saved > 0 {
+                        local_tags_updated += saved;
+                        changed_tags = true;
+                    }
+                }
+            }
+
             if changed_media {
                 sqlx::query(
                     "UPDATE furumusic__media_file \
@@ -196,23 +286,657 @@ pub async fn run_with_options(
                 }
             }
 
-        if !changed_media && !changed_track {
+            if !changed_media && !changed_track && !changed_tags {
                 unchanged += 1;
             }
 
             if scanned % 100 == 0 {
                 log.info(&format!(
-                "Progress: {scanned} scanned, {media_updated} media updated, {track_updated} tracks updated, {unchanged} unchanged, {missing} missing, {failed} failed"
+                    "Progress: {scanned} scanned, {media_updated} media updated, {track_updated} tracks updated, {local_tags_updated} local tags saved, {unchanged} unchanged, {missing} missing, {failed} failed"
                 ));
             }
         }
+    }
+
+    let lastfm_stats = if options.lastfm_tags {
+        log.info("Metadata file backfill finished; starting Last.fm tag backfill");
+        backfill_lastfm_tags(ctx, log, options.overwrite).await?
+    } else {
+        log.info("Last.fm tag backfill disabled for this run");
+        LastfmTagStats::default()
+    };
 
     log.info(&format!(
-        "Metadata backfill complete: {scanned} scanned, {media_updated} media updated, {track_updated} tracks updated, {unchanged} unchanged, {missing} missing, {failed} failed"
+        "Metadata backfill complete: {scanned} scanned, {media_updated} media updated, {track_updated} tracks updated, {local_tags_updated} local tags saved, {unchanged} unchanged, {missing} missing, {failed} failed; Last.fm tags: considered={}, updated_entities={}, tags_saved={}, skipped_existing={}, not_found={}, failed={}",
+        lastfm_stats.considered,
+        lastfm_stats.updated_entities,
+        lastfm_stats.tags_saved,
+        lastfm_stats.skipped_existing,
+        lastfm_stats.not_found,
+        lastfm_stats.failed,
     ));
     Ok(())
 }
 
+pub async fn save_approved_track_genres(
+    pool: &sqlx::PgPool,
+    track_id: i64,
+    genre_text: &str,
+) -> anyhow::Result<u64> {
+    save_track_tag_text(pool, track_id, genre_text, "review", false).await
+}
+
+async fn backfill_lastfm_tags(
+    ctx: &JobContext,
+    log: &mut JobLog,
+    overwrite: bool,
+) -> anyhow::Result<LastfmTagStats> {
+    let api_key = ctx.config.lastfm_api_key.trim();
+    if api_key.is_empty() {
+        log.warn("lastfm_api_key is not configured, skipping Last.fm tag backfill");
+        return Ok(LastfmTagStats::default());
+    }
+
+    log.info("Last.fm tag backfill started");
+
+    let client = reqwest::Client::builder()
+        .user_agent("furumusic-metadata-backfill/0.1")
+        .timeout(Duration::from_secs(15))
+        .build()?;
+
+    let mut stats = LastfmTagStats::default();
+    backfill_lastfm_artist_tags(ctx, log, &client, api_key, overwrite, &mut stats).await?;
+    backfill_lastfm_release_tags(ctx, log, &client, api_key, overwrite, &mut stats).await?;
+    backfill_lastfm_track_tags(ctx, log, &client, api_key, overwrite, &mut stats).await?;
+    Ok(stats)
+}
+
+async fn backfill_lastfm_artist_tags(
+    ctx: &JobContext,
+    log: &mut JobLog,
+    client: &reqwest::Client,
+    api_key: &str,
+    overwrite: bool,
+    stats: &mut LastfmTagStats,
+) -> anyhow::Result<()> {
+    let rows = sqlx::query_as::<_, LastfmArtistTagRow>(
+        r#"SELECT DISTINCT a.id, a.name::text AS name
+           FROM furumusic__artist a
+           JOIN furumusic__track_artist ta ON ta.artist_id = a.id
+           JOIN furumusic__track t ON t.id = ta.track_id
+           WHERE a.is_hidden = false AND t.is_hidden = false
+           ORDER BY a.id"#,
+    )
+    .fetch_all(&ctx.pool)
+    .await?;
+
+    log.info(&format!(
+        "Last.fm artist tag pass: checking {} artist(s)",
+        rows.len()
+    ));
+    let total = rows.len();
+    for (index, row) in rows.into_iter().enumerate() {
+        if should_skip_lastfm_entity(&ctx.pool, "artist", row.id, overwrite).await? {
+            stats.skipped_existing += 1;
+            if should_log_lastfm_progress(index + 1, total, 25) {
+                log.info(&format!(
+                    "Last.fm artist tags progress: {}/{}",
+                    index + 1,
+                    total
+                ));
+            }
+            continue;
+        }
+        stats.considered += 1;
+        match fetch_lastfm_artist_tags(client, api_key, &row.name).await {
+            Ok(tags) if !tags.is_empty() => {
+                let saved =
+                    replace_entity_tags(&ctx.pool, "artist", row.id, &tags, "lastfm", false)
+                        .await?;
+                stats.tags_saved += saved;
+                stats.updated_entities += 1;
+            }
+            Ok(_) => {
+                stats.not_found += 1;
+            }
+            Err(err) if err.to_string().contains("Last.fm rate limit exceeded") => {
+                return Err(err);
+            }
+            Err(err) => {
+                stats.failed += 1;
+                log.warn(&format!(
+                    "Last.fm artist tags failed for artist {} \"{}\": {err}",
+                    row.id, row.name
+                ));
+            }
+        }
+        if should_log_lastfm_progress(index + 1, total, 25) {
+            log.info(&format!(
+                "Last.fm artist tags progress: {}/{}",
+                index + 1,
+                total
+            ));
+        }
+        tokio::time::sleep(LASTFM_TAG_REQUEST_DELAY).await;
+    }
+    Ok(())
+}
+
+async fn backfill_lastfm_release_tags(
+    ctx: &JobContext,
+    log: &mut JobLog,
+    client: &reqwest::Client,
+    api_key: &str,
+    overwrite: bool,
+    stats: &mut LastfmTagStats,
+) -> anyhow::Result<()> {
+    let rows = sqlx::query_as::<_, LastfmReleaseTagRow>(
+        r#"SELECT r.id,
+                  r.title::text AS title,
+                  (
+                    SELECT a.name::text
+                      FROM furumusic__release_artist ra
+                      JOIN furumusic__artist a ON a.id = ra.artist_id
+                     WHERE ra.release_id = r.id
+                     ORDER BY ra.position
+                     LIMIT 1
+                  ) AS artist_name
+           FROM furumusic__release r
+           WHERE r.is_hidden = false
+           ORDER BY r.id"#,
+    )
+    .fetch_all(&ctx.pool)
+    .await?;
+
+    log.info(&format!(
+        "Last.fm release tag pass: checking {} release(s)",
+        rows.len()
+    ));
+    let total = rows.len();
+    for (index, row) in rows.into_iter().enumerate() {
+        if should_skip_lastfm_entity(&ctx.pool, "release", row.id, overwrite).await? {
+            stats.skipped_existing += 1;
+            if should_log_lastfm_progress(index + 1, total, 25) {
+                log.info(&format!(
+                    "Last.fm release tags progress: {}/{}",
+                    index + 1,
+                    total
+                ));
+            }
+            continue;
+        }
+        let Some(artist) = row.artist_name.as_deref().filter(|value| !value.trim().is_empty())
+        else {
+            stats.not_found += 1;
+            if should_log_lastfm_progress(index + 1, total, 25) {
+                log.info(&format!(
+                    "Last.fm release tags progress: {}/{}",
+                    index + 1,
+                    total
+                ));
+            }
+            continue;
+        };
+        stats.considered += 1;
+        match fetch_lastfm_album_tags(client, api_key, artist, &row.title).await {
+            Ok(tags) if !tags.is_empty() => {
+                let saved =
+                    replace_entity_tags(&ctx.pool, "release", row.id, &tags, "lastfm", false)
+                        .await?;
+                stats.tags_saved += saved;
+                stats.updated_entities += 1;
+            }
+            Ok(_) => {
+                stats.not_found += 1;
+            }
+            Err(err) if err.to_string().contains("Last.fm rate limit exceeded") => {
+                return Err(err);
+            }
+            Err(err) => {
+                stats.failed += 1;
+                log.warn(&format!(
+                    "Last.fm release tags failed for release {} \"{}\" / \"{}\": {err}",
+                    row.id, artist, row.title
+                ));
+            }
+        }
+        if should_log_lastfm_progress(index + 1, total, 25) {
+            log.info(&format!(
+                "Last.fm release tags progress: {}/{}",
+                index + 1,
+                total
+            ));
+        }
+        tokio::time::sleep(LASTFM_TAG_REQUEST_DELAY).await;
+    }
+    Ok(())
+}
+
+async fn backfill_lastfm_track_tags(
+    ctx: &JobContext,
+    log: &mut JobLog,
+    client: &reqwest::Client,
+    api_key: &str,
+    overwrite: bool,
+    stats: &mut LastfmTagStats,
+) -> anyhow::Result<()> {
+    let rows = sqlx::query_as::<_, LastfmTrackTagRow>(
+        r#"SELECT t.id,
+                  t.title::text AS title,
+                  (
+                    SELECT a.name::text
+                      FROM furumusic__track_artist ta
+                      JOIN furumusic__artist a ON a.id = ta.artist_id
+                     WHERE ta.track_id = t.id AND ta.role <> 'featuring'
+                     ORDER BY ta.position
+                     LIMIT 1
+                  ) AS artist_name
+           FROM furumusic__track t
+           WHERE t.is_hidden = false
+           ORDER BY t.id"#,
+    )
+    .fetch_all(&ctx.pool)
+    .await?;
+
+    log.info(&format!(
+        "Last.fm track tag pass: checking {} track(s)",
+        rows.len()
+    ));
+    let total = rows.len();
+    for (index, row) in rows.into_iter().enumerate() {
+        if should_skip_lastfm_entity(&ctx.pool, "track", row.id, overwrite).await? {
+            stats.skipped_existing += 1;
+            if should_log_lastfm_progress(index + 1, total, 50) {
+                log.info(&format!(
+                    "Last.fm track tags progress: {}/{}",
+                    index + 1,
+                    total
+                ));
+            }
+            continue;
+        }
+        let Some(artist) = row.artist_name.as_deref().filter(|value| !value.trim().is_empty())
+        else {
+            stats.not_found += 1;
+            if should_log_lastfm_progress(index + 1, total, 50) {
+                log.info(&format!(
+                    "Last.fm track tags progress: {}/{}",
+                    index + 1,
+                    total
+                ));
+            }
+            continue;
+        };
+        stats.considered += 1;
+        match fetch_lastfm_track_tags(client, api_key, artist, &row.title).await {
+            Ok(tags) if !tags.is_empty() => {
+                let saved =
+                    replace_entity_tags(&ctx.pool, "track", row.id, &tags, "lastfm", true).await?;
+                stats.tags_saved += saved;
+                stats.updated_entities += 1;
+            }
+            Ok(_) => {
+                stats.not_found += 1;
+            }
+            Err(err) if err.to_string().contains("Last.fm rate limit exceeded") => {
+                return Err(err);
+            }
+            Err(err) => {
+                stats.failed += 1;
+                log.warn(&format!(
+                    "Last.fm track tags failed for track {} \"{}\" / \"{}\": {err}",
+                    row.id, artist, row.title
+                ));
+            }
+        }
+        if should_log_lastfm_progress(index + 1, total, 50) {
+            log.info(&format!(
+                "Last.fm track tags progress: {}/{}",
+                index + 1,
+                total
+            ));
+        }
+        tokio::time::sleep(LASTFM_TAG_REQUEST_DELAY).await;
+    }
+    Ok(())
+}
+
+fn should_log_lastfm_progress(done: usize, total: usize, every: usize) -> bool {
+    total > 0 && (done == total || done % every == 0)
+}
+
+async fn should_skip_lastfm_entity(
+    pool: &sqlx::PgPool,
+    entity_kind: &str,
+    entity_id: i64,
+    overwrite: bool,
+) -> anyhow::Result<bool> {
+    if overwrite {
+        return Ok(false);
+    }
+    let exists: Option<i64> = sqlx::query_scalar(
+        r#"SELECT 1
+           FROM furumusic__entity_genre_tag
+           WHERE entity_kind = $1 AND entity_id = $2 AND source = 'lastfm'
+           LIMIT 1"#,
+    )
+    .bind(entity_kind)
+    .bind(entity_id)
+    .fetch_optional(pool)
+    .await?;
+    Ok(exists.is_some())
+}
+
+async fn fetch_lastfm_artist_tags(
+    client: &reqwest::Client,
+    api_key: &str,
+    artist: &str,
+) -> anyhow::Result<Vec<TagCandidate>> {
+    fetch_lastfm_top_tags(
+        client,
+        &[
+            ("method", "artist.getTopTags"),
+            ("api_key", api_key),
+            ("artist", artist),
+            ("autocorrect", "1"),
+            ("format", "json"),
+        ],
+    )
+    .await
+}
+
+async fn fetch_lastfm_album_tags(
+    client: &reqwest::Client,
+    api_key: &str,
+    artist: &str,
+    album: &str,
+) -> anyhow::Result<Vec<TagCandidate>> {
+    fetch_lastfm_top_tags(
+        client,
+        &[
+            ("method", "album.getTopTags"),
+            ("api_key", api_key),
+            ("artist", artist),
+            ("album", album),
+            ("autocorrect", "1"),
+            ("format", "json"),
+        ],
+    )
+    .await
+}
+
+async fn fetch_lastfm_track_tags(
+    client: &reqwest::Client,
+    api_key: &str,
+    artist: &str,
+    track: &str,
+) -> anyhow::Result<Vec<TagCandidate>> {
+    fetch_lastfm_top_tags(
+        client,
+        &[
+            ("method", "track.getTopTags"),
+            ("api_key", api_key),
+            ("artist", artist),
+            ("track", track),
+            ("autocorrect", "1"),
+            ("format", "json"),
+        ],
+    )
+    .await
+}
+
+async fn fetch_lastfm_top_tags(
+    client: &reqwest::Client,
+    query: &[(&str, &str)],
+) -> anyhow::Result<Vec<TagCandidate>> {
+    let response = client
+        .get("https://ws.audioscrobbler.com/2.0/")
+        .query(query)
+        .send()
+        .await?;
+
+    if response.status() == reqwest::StatusCode::NOT_FOUND {
+        return Ok(Vec::new());
+    }
+    let response = response.error_for_status()?;
+    let body: Value = response.json().await?;
+    if let Some(code) = body.get("error").and_then(|value| value.as_i64()) {
+        if code == 29 {
+            anyhow::bail!("Last.fm rate limit exceeded");
+        }
+        if code == 6 || code == 7 {
+            return Ok(Vec::new());
+        }
+        anyhow::bail!(
+            "Last.fm API error {code}: {}",
+            body.get("message")
+                .and_then(|value| value.as_str())
+                .unwrap_or("unknown error")
+        );
+    }
+
+    let Some(tag_value) = body.get("toptags").and_then(|value| value.get("tag")) else {
+        return Ok(Vec::new());
+    };
+    let mut tags = match tag_value {
+        Value::Array(values) => values.iter().filter_map(tag_from_value).collect::<Vec<_>>(),
+        Value::Object(_) => tag_from_value(tag_value).into_iter().collect::<Vec<_>>(),
+        _ => Vec::new(),
+    };
+    tags.sort_by(|a, b| b.weight.total_cmp(&a.weight).then_with(|| a.name.cmp(&b.name)));
+    tags.truncate(LASTFM_TAG_LIMIT);
+    Ok(tags)
+}
+
+fn tag_from_value(value: &Value) -> Option<TagCandidate> {
+    let name = value.get("name")?.as_str()?.trim();
+    let name = clean_tag_name(name)?;
+    let weight = value
+        .get("count")
+        .and_then(lastfm_count_to_f64)
+        .unwrap_or(1.0)
+        .max(1.0);
+    Some(TagCandidate { name, weight })
+}
+
+fn lastfm_count_to_f64(value: &Value) -> Option<f64> {
+    value
+        .as_f64()
+        .or_else(|| value.as_str().and_then(|text| text.parse::<f64>().ok()))
+}
+
+async fn save_track_tag_text(
+    pool: &sqlx::PgPool,
+    track_id: i64,
+    tag_text: &str,
+    source: &str,
+    replace_source: bool,
+) -> anyhow::Result<u64> {
+    let tags = tags_from_text(tag_text);
+    save_entity_tags(pool, "track", track_id, &tags, source, replace_source, true).await
+}
+
+async fn replace_entity_tags(
+    pool: &sqlx::PgPool,
+    entity_kind: &str,
+    entity_id: i64,
+    tags: &[TagCandidate],
+    source: &str,
+    mirror_track_genre: bool,
+) -> anyhow::Result<u64> {
+    save_entity_tags(
+        pool,
+        entity_kind,
+        entity_id,
+        tags,
+        source,
+        true,
+        mirror_track_genre,
+    )
+    .await
+}
+
+async fn save_entity_tags(
+    pool: &sqlx::PgPool,
+    entity_kind: &str,
+    entity_id: i64,
+    tags: &[TagCandidate],
+    source: &str,
+    replace_source: bool,
+    mirror_track_genre: bool,
+) -> anyhow::Result<u64> {
+    if tags.is_empty() {
+        return Ok(0);
+    }
+    if replace_source {
+        sqlx::query(
+            r#"DELETE FROM furumusic__entity_genre_tag
+               WHERE entity_kind = $1 AND entity_id = $2 AND source = $3"#,
+        )
+        .bind(entity_kind)
+        .bind(entity_id)
+        .bind(source)
+        .execute(pool)
+        .await?;
+
+        if mirror_track_genre && entity_kind == "track" {
+            sqlx::query(
+                r#"DELETE FROM furumusic__track_genre tg
+                   WHERE tg.track_id = $1
+                     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
+                     )"#,
+            )
+            .bind(entity_id)
+            .execute(pool)
+            .await?;
+        }
+    }
+
+    let now = chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ").to_string();
+    let mut saved = 0u64;
+    for tag in tags {
+        let Some(genre_id) = ensure_genre(pool, &tag.name).await? else {
+            continue;
+        };
+        let result = sqlx::query(
+            r#"INSERT INTO furumusic__entity_genre_tag
+                  (entity_kind, entity_id, genre_id, source, weight, updated_at)
+               VALUES ($1, $2, $3, $4, $5, $6)
+               ON CONFLICT (entity_kind, entity_id, genre_id, source) DO NOTHING"#,
+        )
+        .bind(entity_kind)
+        .bind(entity_id)
+        .bind(genre_id)
+        .bind(source)
+        .bind(tag.weight)
+        .bind(&now)
+        .execute(pool)
+        .await?;
+        saved += result.rows_affected();
+
+        if mirror_track_genre && entity_kind == "track" {
+            let result = sqlx::query(
+                r#"INSERT INTO furumusic__track_genre (track_id, genre_id)
+                   VALUES ($1, $2)
+                   ON CONFLICT (track_id, genre_id) DO NOTHING"#,
+            )
+            .bind(entity_id)
+            .bind(genre_id)
+            .execute(pool)
+            .await?;
+            saved += result.rows_affected();
+        }
+    }
+    Ok(saved)
+}
+
+async fn ensure_genre(pool: &sqlx::PgPool, name: &str) -> anyhow::Result<Option<i64>> {
+    let Some(name) = clean_tag_name(name) else {
+        return Ok(None);
+    };
+    let normalized = normalize_tag_name(&name);
+    if normalized.is_empty() || is_ignored_tag(&normalized) {
+        return Ok(None);
+    }
+
+    let existing: Option<i64> = sqlx::query_scalar(
+        r#"SELECT id FROM furumusic__genre
+           WHERE name_normalized = $1
+           ORDER BY id
+           LIMIT 1"#,
+    )
+    .bind(&normalized)
+    .fetch_optional(pool)
+    .await?;
+    if existing.is_some() {
+        return Ok(existing);
+    }
+
+    let id = sqlx::query_scalar::<_, i64>(
+        r#"INSERT INTO furumusic__genre (name, name_normalized)
+           VALUES ($1, $2)
+           ON CONFLICT (name) DO UPDATE SET name = EXCLUDED.name
+           RETURNING id"#,
+    )
+    .bind(&name)
+    .bind(&normalized)
+    .fetch_one(pool)
+    .await?;
+    Ok(Some(id))
+}
+
+fn tags_from_text(value: &str) -> Vec<TagCandidate> {
+    let normalized_separators = value.replace(" / ", ";").replace('|', ";");
+    let mut tags = Vec::new();
+    for raw in normalized_separators.split([';', ',']) {
+        if let Some(name) = clean_tag_name(raw) {
+            if !is_ignored_tag(&normalize_tag_name(&name))
+                && !tags
+                    .iter()
+                    .any(|tag: &TagCandidate| normalize_tag_name(&tag.name) == normalize_tag_name(&name))
+            {
+                tags.push(TagCandidate { name, weight: 1.0 });
+            }
+        }
+    }
+    tags
+}
+
+fn clean_tag_name(value: &str) -> Option<String> {
+    let cleaned = value.trim().trim_matches('"').trim_matches('\'').trim();
+    if cleaned.is_empty() {
+        return None;
+    }
+    let cleaned = cleaned.chars().take(100).collect::<String>();
+    let cleaned = cleaned.split_whitespace().collect::<Vec<_>>().join(" ");
+    if cleaned.is_empty() {
+        None
+    } else {
+        Some(cleaned)
+    }
+}
+
+fn normalize_tag_name(value: &str) -> String {
+    value
+        .trim()
+        .to_lowercase()
+        .split_whitespace()
+        .collect::<Vec<_>>()
+        .join(" ")
+}
+
+fn is_ignored_tag(normalized: &str) -> bool {
+    matches!(
+        normalized,
+        "" | "unknown" | "undefined" | "none" | "n/a" | "na" | "other" | "misc" | "various"
+    )
+}
+
 fn should_update<T>(current: Option<T>, overwrite: bool) -> bool {
     overwrite || current.is_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/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>,
 }
@@ -183,6 +184,16 @@ pub(super) struct PlayerJamDto {
     pub(super) member_count: i64,
     pub(super) host_last_seen_ms: i64,
     pub(super) host_device_online: bool,
+    pub(super) members: Vec<PlayerJamMemberDto>,
+}
+
+#[derive(Debug, Serialize, JsonSchema)]
+pub(super) struct PlayerJamMemberDto {
+    pub(super) user_id: i64,
+    pub(super) name: String,
+    pub(super) is_joined: bool,
+    pub(super) is_current_user: bool,
+    pub(super) last_seen_ms: i64,
 }
 
 #[derive(Debug, Deserialize, JsonSchema)]
@@ -192,6 +203,14 @@ pub(super) struct PlayerJamCreateRequest {
     pub(super) invitee_user_ids: Vec<i64>,
 }
 
+#[derive(Debug, Deserialize, JsonSchema)]
+pub(super) struct PlayerJamInviteRequest {
+    pub(super) jam_id: String,
+    pub(super) device_id: String,
+    #[serde(default)]
+    pub(super) invitee_user_ids: Vec<i64>,
+}
+
 #[derive(Debug, Deserialize, JsonSchema)]
 pub(super) struct PlayerJamJoinRequest {
     pub(super) jam_id: String,
@@ -286,6 +305,7 @@ pub(super) struct UserStats {
 
 #[derive(Debug, Serialize, JsonSchema)]
 pub(super) struct UserProfile {
+    pub(super) id: i64,
     pub(super) name: String,
     pub(super) role: String,
     pub(super) stats: UserStats,
@@ -444,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

@@ -61,6 +61,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)]

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/admin/v2.html

@@ -486,6 +486,13 @@ tbody tr:hover {
 .tag.plays,
 .tag.followers { background: rgba(185, 140, 255, 0.18); color: #d8c2ff; }
 .tag.visibility { background: rgba(29, 185, 84, 0.16); color: #8ef0b2; }
+.tag.metadata-lastfm { background: rgba(90, 167, 255, 0.18); color: #c7e0ff; }
+.tag.metadata-file { background: rgba(29, 185, 84, 0.16); color: #9af0b8; }
+.tag.metadata-review { background: rgba(241, 184, 75, 0.18); color: #ffe1a6; }
+.tag.metadata-track-genre { background: rgba(255, 255, 255, 0.1); color: #d2d2d2; }
+.tag.metadata-release-lastfm { background: rgba(90, 167, 255, 0.12); color: #b7d6ff; border: 1px solid rgba(90, 167, 255, 0.22); }
+.tag.metadata-release-file { background: rgba(29, 185, 84, 0.1); color: #a7eabd; border: 1px solid rgba(29, 185, 84, 0.2); }
+.tag.metadata-release-review { background: rgba(241, 184, 75, 0.12); color: #ffe1a6; border: 1px solid rgba(241, 184, 75, 0.22); }
 
 .jobs-grid {
     display: grid;
@@ -494,6 +501,45 @@ tbody tr:hover {
     padding: 12px;
 }
 
+.metadata-backfill-options {
+    display: grid;
+    gap: 8px;
+    margin-bottom: 12px;
+    padding: 10px;
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    background: var(--bg-primary);
+}
+
+.metadata-backfill-options .option-grid {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 8px;
+}
+
+.metadata-backfill-options label {
+    display: inline-flex;
+    align-items: center;
+    gap: 7px;
+    min-height: 26px;
+    color: var(--text-secondary);
+    font-size: 12px;
+    font-weight: 700;
+}
+
+.metadata-backfill-options input {
+    width: auto;
+    min-height: auto;
+}
+
+.metadata-backfill-options .mode-row {
+    display: flex;
+    gap: 14px;
+    flex-wrap: wrap;
+    padding-top: 4px;
+    border-top: 1px solid rgba(255, 255, 255, 0.06);
+}
+
 .jobs-page {
     display: grid;
     grid-template-columns: minmax(720px, 1fr) 380px;
@@ -524,31 +570,37 @@ tbody tr:hover {
     table-layout: fixed;
 }
 
-.jobs-page .jobs-list-panel .panel-head,
+.jobs-page .jobs-list-panel .panel-head {
-.jobs-page .jobs-list-panel .action-strip {
     flex-shrink: 0;
 }
 
-.jobs-page .jobs-list-panel .action-strip {
+.job-table .job-column { width: 32%; }
-    border-top: 1px solid var(--border-color);
+.job-table .state-column { width: 12%; }
-    border-bottom: 0;
+.job-table .schedule-column { width: 22%; }
-}
+.job-table .runs-column { width: 24%; }
-
-.job-table .job-column { width: 28%; }
-.job-table .state-column { width: 13%; }
-.job-table .schedule-column { width: 20%; }
-.job-table .runs-column { width: 29%; }
 .job-table .actions-column { width: 10%; }
 
+.job-table .toolbar {
+    flex-wrap: nowrap;
+    justify-content: flex-end;
+}
+
 .inline-runs {
     display: flex;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
     gap: 5px;
+    max-width: 100%;
+    overflow: hidden;
 }
 
 .run-chip {
     gap: 5px;
-    max-width: 128px;
+    max-width: 70px;
+    height: 20px;
+    padding: 0 7px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .task-form {
@@ -557,6 +609,76 @@ tbody tr:hover {
     grid-column: 2;
     grid-row: 1 / span 2;
     align-self: start;
+    display: flex;
+    flex-direction: column;
+    max-height: calc(100vh - 100px);
+    overflow: hidden;
+}
+
+.task-form-body {
+    min-height: 0;
+    overflow: auto;
+    padding: 12px;
+}
+
+.job-detail-description {
+    margin-bottom: 10px;
+    color: var(--text-secondary);
+    font-size: 12px;
+    line-height: 1.45;
+}
+
+.job-facts {
+    display: grid;
+    gap: 8px;
+    margin-bottom: 12px;
+}
+
+.job-fact {
+    display: grid;
+    grid-template-columns: 58px minmax(0, 1fr);
+    gap: 8px;
+    align-items: center;
+    min-height: 28px;
+    padding: 6px 8px;
+    border: 1px solid var(--border-color);
+    border-radius: 7px;
+    background: var(--bg-primary);
+}
+
+.job-fact span:first-child {
+    color: var(--text-subdued);
+    font-size: 10px;
+    font-weight: 850;
+    text-transform: uppercase;
+}
+
+.job-fact span:last-child {
+    min-width: 0;
+    color: var(--text-secondary);
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.job-param-note {
+    margin: -2px 0 10px;
+    color: var(--text-subdued);
+    font-size: 11px;
+}
+
+.job-run-pager {
+    min-height: 34px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 8px;
+    padding: 8px 0 0;
+}
+
+.job-run-pager .toolbar {
+    flex-wrap: nowrap;
 }
 
 .run-log-panel {
@@ -941,6 +1063,44 @@ tbody tr:hover {
     margin-bottom: 8px;
 }
 
+.run-log-output.is-following {
+    border-color: rgba(29, 185, 84, 0.36);
+}
+
+.metadata-tags {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    max-height: 112px;
+    overflow: auto;
+    padding: 8px;
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    background: var(--bg-primary);
+}
+
+.metadata-tags .tag {
+    height: auto;
+    min-height: 24px;
+    gap: 5px;
+    padding: 4px 8px;
+}
+
+.metadata-tags small {
+    font-size: 9px;
+    font-weight: 800;
+    opacity: 0.72;
+    text-transform: uppercase;
+}
+
+.metadata-empty {
+    min-height: 34px;
+    padding: 8px 10px;
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    background: var(--bg-primary);
+}
+
 .artist-picker {
     position: relative;
 }
@@ -1335,7 +1495,7 @@ tbody tr:hover {
                                 </tr>
                             </thead>
                             <tbody>
-                                <template x-for="job in pagedJobs()" :key="job.name">
+                                <template x-for="job in jobs" :key="job.name">
                                     <tr :class="{active: activeJob && activeJob.name === job.name}" @click="selectJob(job.name)">
                                         <td>
                                             <div class="primary-line" x-text="job.name"></div>
@@ -1348,7 +1508,7 @@ tbody tr:hover {
                                         </td>
                                         <td>
                                             <div class="inline-runs">
-                                                <template x-for="run in (job.recent_runs || []).slice(0, 5)" :key="run.id">
+                                                <template x-for="run in (job.recent_runs || []).slice(0, 3)" :key="run.id">
                                                     <button class="badge run-chip" :class="run.status" @click.stop="loadRunDetail(run)" :title="runTitle(run)">
                                                         <span x-text="runChipLabel(run)"></span>
                                                     </button>
@@ -1357,10 +1517,10 @@ tbody tr:hover {
                                         </td>
                                         <td>
                                             <div class="toolbar">
-                                                <button class="icon-btn" @click.stop="runJob(job)" :disabled="job.launching" title="Run now">
+                                                <button class="icon-btn" type="button" @click.stop="runJob(job)" :disabled="Boolean(job.launching)" title="Run now">
                                                     <i data-lucide="play"></i>
                                                 </button>
-                                                <button class="icon-btn" @click.stop="toggleJob(job)" :title="job.enabled ? 'Disable' : 'Enable'">
+                                                <button class="icon-btn" type="button" @click.stop="toggleJob(job)" :title="job.enabled ? 'Disable' : 'Enable'">
                                                     <i :data-lucide="job.enabled ? 'pause' : 'power'"></i>
                                                 </button>
                                             </div>
@@ -1370,18 +1530,6 @@ tbody tr:hover {
                             </tbody>
                         </table>
                     </div>
-                    <div class="action-strip">
-                        <span class="selection-summary" x-text="jobsRangeText()"></span>
-                        <div class="toolbar">
-                            <select class="search" style="width:92px" x-model.number="jobsPerPage" @change="jobsPage = 0">
-                                <option value="8">8</option>
-                                <option value="12">12</option>
-                                <option value="20">20</option>
-                            </select>
-                            <button class="btn" @click="pageJobs(-1)" :disabled="jobsPage === 0">Previous</button>
-                            <button class="btn" @click="pageJobs(1)" :disabled="(jobsPage + 1) * jobsPerPage >= jobs.length">Next</button>
-                        </div>
-                    </div>
                 </section>
 
                 <section class="panel task-form">
@@ -1391,25 +1539,45 @@ tbody tr:hover {
                             <span x-text="activeJob ? activeJob.health : 'Select a task'"></span>
                         </div>
                     </div>
-                    <div style="padding:14px" x-show="activeJob">
+                    <div class="task-form-body" x-show="activeJob">
-                        <div class="field">
+                        <div class="job-detail-description" x-text="activeJob?.description || ''"></div>
-                            <label>Description</label>
+                        <div class="job-facts">
-                            <textarea readonly x-text="activeJob?.description || ''"></textarea>
+                            <div class="job-fact">
+                                <span>Cron</span>
+                                <span :title="activeJob?.cron_expression || ''" x-text="cronLabel(activeJob)"></span>
                             </div>
-                        <div class="field">
+                            <div class="job-fact">
-                            <label>Cron</label>
+                                <span>Next</span>
-                            <input readonly :value="activeJob?.cron_expression || ''" />
+                                <span x-text="relativeDate(activeJob?.next_run_at)"></span>
                             </div>
-                        <div class="field">
+                            <div class="job-fact">
-                            <label>Next / Last</label>
+                                <span>Last</span>
-                            <input readonly :value="relativeDate(activeJob?.next_run_at) + ' / ' + relativeDate(activeJob?.last_run_at)" />
+                                <span x-text="relativeDate(activeJob?.last_run_at)"></span>
+                            </div>
+                        </div>
+                        <div class="metadata-backfill-options" x-show="isMetadataBackfillJob(activeJob)">
+                            <div class="option-grid">
+                                <label><input type="checkbox" x-model="metadataBackfillOptions.audio_bitrate" /> audio_bitrate</label>
+                                <label><input type="checkbox" x-model="metadataBackfillOptions.audio_sample_rate" /> audio_sample_rate</label>
+                                <label><input type="checkbox" x-model="metadataBackfillOptions.audio_bit_depth" /> audio_bit_depth</label>
+                                <label><input type="checkbox" x-model="metadataBackfillOptions.duration_seconds" /> duration_seconds</label>
+                                <label><input type="checkbox" x-model="metadataBackfillOptions.local_genres" /> local genres from files</label>
+                                <label><input type="checkbox" x-model="metadataBackfillOptions.lastfm_tags" /> Last.fm tags</label>
+                            </div>
+                            <div class="mode-row">
+                                <label><input type="radio" value="fill_missing" x-model="metadataBackfillOptions.mode" /> Fill missing only</label>
+                                <label><input type="radio" value="overwrite" x-model="metadataBackfillOptions.mode" /> Overwrite existing values</label>
+                            </div>
+                        </div>
+                        <div class="job-param-note" x-show="activeJob && !jobHasParameterForm(activeJob)">
+                            This task has no manual parameters.
                         </div>
                         <div class="toolbar" style="margin-bottom:12px">
-                            <button class="btn primary" @click="runJob(activeJob)">
+                            <button class="btn primary" type="button" @click="runJob(activeJob)">
                                 <i data-lucide="play"></i>
-                                Run now
+                                <span x-text="isMetadataBackfillJob(activeJob) ? 'Run with options' : 'Run now'"></span>
                             </button>
-                            <button class="btn" @click="toggleJob(activeJob)">
+                            <button class="btn" type="button" @click="toggleJob(activeJob)">
                                 <i data-lucide="power"></i>
                                 Toggle
                             </button>
@@ -1417,7 +1585,7 @@ tbody tr:hover {
                         <div class="field">
                             <label>Recent Runs</label>
                             <div class="runs">
-                                <template x-for="run in visibleRuns()" :key="run.id">
+                                <template x-for="run in pagedVisibleRuns()" :key="run.id">
                                     <div class="run-row" @click="loadRunDetail(run)">
                                         <span class="badge" :class="run.status" x-text="run.status"></span>
                                         <span x-text="'#' + run.id"></span>
@@ -1425,6 +1593,14 @@ tbody tr:hover {
                                         <span x-text="duration(run.duration_ms)"></span>
                                     </div>
                                 </template>
+                                <div class="empty" x-show="visibleRuns().length === 0">No runs for this task yet</div>
+                            </div>
+                            <div class="job-run-pager" x-show="visibleRuns().length > recentRunsPerPage">
+                                <span class="selection-summary" x-text="recentRunsRangeText()"></span>
+                                <div class="toolbar">
+                                    <button class="btn" type="button" @click="pageRecentRuns(-1)" :disabled="recentRunsPage === 0">Previous</button>
+                                    <button class="btn" type="button" @click="pageRecentRuns(1)" :disabled="(recentRunsPage + 1) * recentRunsPerPage >= visibleRuns().length">Next</button>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -1440,10 +1616,14 @@ tbody tr:hover {
                         <div class="toolbar" x-show="activeRunDetail">
                             <span class="badge" :class="activeRunDetail?.run?.status" x-text="activeRunDetail?.run?.status"></span>
                             <span class="selection-summary" x-text="duration(activeRunDetail?.run?.duration_ms)"></span>
+                            <button class="btn" type="button" x-show="!runLogAutoScroll" @click="enableRunLogFollow()">
+                                <i data-lucide="chevrons-down"></i>
+                                Follow
+                            </button>
                         </div>
                     </div>
                     <div class="run-log-body">
-                        <pre class="run-log-output" x-show="activeRunDetail" x-text="activeRunDetail?.log_output || activeRunDetail?.run?.log_excerpt || 'No log output captured for this run.'"></pre>
+                        <pre class="run-log-output" :class="{'is-following': runLogAutoScroll}" x-ref="runLogOutput" x-show="activeRunDetail" @scroll.passive="handleRunLogScroll()" x-text="activeRunDetail?.log_output || activeRunDetail?.run?.log_excerpt || 'No log output captured for this run.'"></pre>
                         <div class="empty" x-show="!activeRunDetail">No run selected</div>
                     </div>
                 </section>
@@ -1934,7 +2114,7 @@ tbody tr:hover {
                 <div class="empty" x-show="editorLoading">Loading editor...</div>
                 <div x-show="!editorLoading">
                     <div class="field">
-                        <label x-text="isArtistEditor() ? 'Artist name' : 'Title'"></label>
+                        <label x-text="isArtistEditor() ? 'Artist name' : (isReleaseEditor() ? 'Release title' : (isTrackEditor() ? 'Track title' : 'Title'))"></label>
                         <input x-model="editorDraft.title" />
                     </div>
 
@@ -2015,6 +2195,22 @@ tbody tr:hover {
                         </div>
                     </div>
 
+                    <div class="field" x-show="canShowMetadataTags()">
+                        <label>Metadata genres and tags</label>
+                        <div class="metadata-tags" x-show="metadataTags().length">
+                            <template x-for="tag in metadataTags()" :key="`${tag.source}:${tag.name}`">
+                                <span class="tag" :class="metadataTagClass(tag)" :title="metadataTagTitle(tag)">
+                                    <span x-text="tag.name"></span>
+                                    <small x-text="metadataTagSourceLabel(tag)"></small>
+                                    <small x-show="metadataTagScore(tag)" x-text="metadataTagScore(tag)"></small>
+                                </span>
+                            </template>
+                        </div>
+                        <div class="metadata-empty muted" x-show="!metadataTags().length">
+                            No metadata genres or tags saved yet
+                        </div>
+                    </div>
+
                     <div class="field">
                         <label>Visibility</label>
                         <select class="search" style="width:100%" x-model="editorDraft.hidden">
@@ -2129,10 +2325,23 @@ function adminV2() {
         ],
         jobs: [],
         recentRuns: [],
+        activeJobRuns: [],
+        activeJobRunsName: null,
         activeJobName: null,
         activeRunDetail: null,
-        jobsPage: 0,
+        recentRunsPage: 0,
-        jobsPerPage: 12,
+        recentRunsPerPage: 8,
+        runLogAutoScroll: true,
+        runLogRefreshing: false,
+        metadataBackfillOptions: {
+            audio_bitrate: true,
+            audio_sample_rate: true,
+            audio_bit_depth: true,
+            duration_seconds: true,
+            local_genres: true,
+            lastfm_tags: true,
+            mode: 'fill_missing'
+        },
         libraryKind: 'artists',
         librarySearch: '',
         library: { items: [], total: 0, limit: 40, offset: 0 },
@@ -2186,7 +2395,7 @@ function adminV2() {
                 this.applyRouteFromHash();
                 this.activateCurrentView(false);
             });
-            this.poller = setInterval(() => this.poll(), 6000);
+            this.poller = setInterval(() => this.poll(), 4000);
             this.icons();
         },
 
@@ -2227,7 +2436,15 @@ function adminV2() {
 
         async poll() {
             if (this.loading) return;
+            if (this.activeView === 'jobs') {
+                await Promise.allSettled([
+                    this.loadJobs(false),
+                    this.activeJobName ? this.loadRunsForJob(this.activeJobName, false) : Promise.resolve(),
+                    this.refreshActiveRunDetail()
+                ]);
+            } else {
                 await Promise.allSettled([this.loadJobs(false), this.loadReviews(false)]);
+            }
         },
 
         applyRouteFromHash() {
@@ -2241,7 +2458,15 @@ function adminV2() {
                 this.reviewFilter.status = nextStatus;
             } else if (view === 'jobs') {
                 this.activeView = 'jobs';
-                if (parts[1]) this.activeJobName = decodeURIComponent(parts[1]);
+                if (parts[1]) {
+                    const nextJobName = decodeURIComponent(parts[1]);
+                    if (this.activeJobName !== nextJobName) {
+                        this.activeJobRuns = [];
+                        this.activeJobRunsName = nextJobName;
+                        this.recentRunsPage = 0;
+                    }
+                    this.activeJobName = nextJobName;
+                }
             } else if (view === 'library') {
                 const nextKind = ['artists', 'releases', 'tracks', 'playlists'].includes(parts[1]) ? parts[1] : 'artists';
                 if (this.libraryKind !== nextKind) this.clearLibrarySelection();
@@ -2295,7 +2520,14 @@ function adminV2() {
 
         openJobs(name = this.activeJobName) {
             this.activeView = 'jobs';
-            if (name) this.activeJobName = name;
+            if (name && this.activeJobName !== name) {
+                this.activeJobRuns = [];
+                this.activeJobRunsName = name;
+                this.recentRunsPage = 0;
+                this.activeJobName = name;
+            } else if (name) {
+                this.activeJobName = name;
+            }
             this.setRoute(this.activeJobName ? `#jobs/${encodeURIComponent(this.activeJobName)}` : '#jobs');
             this.loadJobs();
             if (this.activeJobName) this.loadRunsForJob(this.activeJobName);
@@ -2336,7 +2568,6 @@ function adminV2() {
             try {
                 this.jobs = await this.request(`${this.apiBase}/jobs`);
                 if (!this.activeJobName && this.jobs.length) this.activeJobName = this.jobs[0].name;
-                if (this.jobsPage * this.jobsPerPage >= this.jobs.length) this.jobsPage = 0;
             } catch (error) {
                 if (showErrors) this.showToast(error.message);
             } finally {
@@ -2578,13 +2809,22 @@ function adminV2() {
         },
 
         async runJob(job) {
+            if (!job) return;
+            if (job.launching) return;
             job.launching = true;
             try {
-                const result = await this.request(`${this.apiBase}/jobs/${encodeURIComponent(job.name)}/run`, { method: 'POST' });
+                const result = this.isMetadataBackfillJob(job)
+                    ? await this.request(`${this.apiBase}/jobs/metadata_backfill/run-options`, {
+                        method: 'POST',
+                        body: JSON.stringify(this.metadataBackfillPayload())
+                    })
+                    : await this.request(`${this.apiBase}/jobs/${encodeURIComponent(job.name)}/run`, { method: 'POST' });
                 this.showToast(`Run #${result.run_id} started`);
                 this.activeJobName = job.name;
+                this.recentRunsPage = 0;
                 await this.loadJobs(false);
                 await this.loadRunsForJob(job.name);
+                await this.loadRunDetail({ id: result.run_id, job_name: job.name }, { silent: true });
             } catch (error) {
                 this.showToast(error.message);
             } finally {
@@ -2593,6 +2833,27 @@ function adminV2() {
             }
         },
 
+        isMetadataBackfillJob(job) {
+            return job && job.name === 'metadata_backfill';
+        },
+
+        jobHasParameterForm(job) {
+            return this.isMetadataBackfillJob(job);
+        },
+
+        metadataBackfillPayload() {
+            const options = this.metadataBackfillOptions || {};
+            return {
+                audio_bitrate: Boolean(options.audio_bitrate),
+                audio_sample_rate: Boolean(options.audio_sample_rate),
+                audio_bit_depth: Boolean(options.audio_bit_depth),
+                duration_seconds: Boolean(options.duration_seconds),
+                local_genres: Boolean(options.local_genres),
+                lastfm_tags: Boolean(options.lastfm_tags),
+                overwrite: options.mode === 'overwrite'
+            };
+        },
+
         async toggleJob(job) {
             try {
                 const result = await this.request(`${this.apiBase}/jobs/${encodeURIComponent(job.name)}/toggle`, { method: 'POST' });
@@ -2608,34 +2869,111 @@ function adminV2() {
             this.setRoute(`#jobs/${encodeURIComponent(name)}`);
             this.activeReview = null;
             this.activeRunDetail = null;
+            this.activeJobRuns = [];
+            this.activeJobRunsName = name;
+            this.recentRunsPage = 0;
+            this.runLogAutoScroll = true;
             await this.loadRunsForJob(name);
         },
 
-        async loadRunsForJob(name) {
+        async loadRunsForJob(name, showErrors = true) {
             try {
                 const data = await this.request(`${this.apiBase}/jobs/${encodeURIComponent(name)}/runs`);
+                const runs = data.runs || [];
                 const job = this.jobs.find(item => item.name === name);
-                if (job) job.recent_runs = data.runs;
+                if (job) job.recent_runs = runs;
+                if (this.activeJobName === name) {
+                    this.activeJobRuns = runs;
+                    this.activeJobRunsName = name;
+                    const maxPage = Math.max(0, Math.ceil(runs.length / this.recentRunsPerPage) - 1);
+                    this.recentRunsPage = Math.min(this.recentRunsPage, maxPage);
+                }
             } catch (error) {
-                this.showToast(error.message);
+                if (showErrors) this.showToast(error.message);
             }
         },
 
-        async loadRunDetail(run) {
+        async loadRunDetail(run, options = {}) {
+            if (!run) return;
             this.activeReview = null;
+            const previousJobName = this.activeJobName;
+            const preserveScroll = Boolean(options.preserveScroll);
+            const sameRun = this.activeRunDetail && Number(this.activeRunDetail.run.id) === Number(run.id);
+            const shouldFollow = !preserveScroll || !sameRun || this.runLogAutoScroll || this.isRunLogAtBottom();
             try {
                 this.activeRunDetail = await this.request(`${this.apiBase}/jobs/${encodeURIComponent(run.job_name)}/runs/${run.id}`);
                 this.activeJobName = run.job_name;
+                if (previousJobName !== run.job_name) this.recentRunsPage = 0;
+                if (!preserveScroll || !sameRun) this.runLogAutoScroll = true;
+                this.$nextTick(() => {
+                    if (shouldFollow) this.scrollRunLogToBottom(true);
+                });
             } catch (error) {
-                this.showToast(error.message);
+                if (!options.silent) this.showToast(error.message);
             }
         },
 
+        async refreshActiveRunDetail() {
+            if (this.runLogRefreshing || !this.activeRunDetail || this.activeView !== 'jobs') return;
+            this.runLogRefreshing = true;
+            try {
+                await this.loadRunDetail(this.activeRunDetail.run, { preserveScroll: true, silent: true });
+            } finally {
+                this.runLogRefreshing = false;
+            }
+        },
+
+        handleRunLogScroll() {
+            this.runLogAutoScroll = this.isRunLogAtBottom();
+        },
+
+        isRunLogAtBottom() {
+            const el = this.$refs.runLogOutput;
+            if (!el) return true;
+            return el.scrollHeight - el.scrollTop - el.clientHeight < 28;
+        },
+
+        scrollRunLogToBottom(force = false) {
+            const el = this.$refs.runLogOutput;
+            if (!el) return;
+            if (force || this.runLogAutoScroll) {
+                el.scrollTop = el.scrollHeight;
+                this.runLogAutoScroll = true;
+            }
+        },
+
+        enableRunLogFollow() {
+            this.runLogAutoScroll = true;
+            this.$nextTick(() => this.scrollRunLogToBottom(true));
+        },
+
         visibleRuns() {
+            if (this.activeJobName && this.activeJobRunsName === this.activeJobName) {
+                return this.activeJobRuns || [];
+            }
             const job = this.activeJob;
             return job ? (job.recent_runs || []) : this.recentRuns;
         },
 
+        pagedVisibleRuns() {
+            const runs = this.visibleRuns();
+            const start = this.recentRunsPage * this.recentRunsPerPage;
+            return runs.slice(start, start + this.recentRunsPerPage);
+        },
+
+        pageRecentRuns(delta) {
+            const maxPage = Math.max(0, Math.ceil(this.visibleRuns().length / this.recentRunsPerPage) - 1);
+            this.recentRunsPage = Math.min(maxPage, Math.max(0, this.recentRunsPage + delta));
+        },
+
+        recentRunsRangeText() {
+            const total = this.visibleRuns().length;
+            if (!total) return '0 runs';
+            const start = this.recentRunsPage * this.recentRunsPerPage + 1;
+            const end = Math.min((this.recentRunsPage + 1) * this.recentRunsPerPage, total);
+            return `${start}-${end} of ${total}`;
+        },
+
         get activeJob() {
             return this.jobs.find(job => job.name === this.activeJobName) || null;
         },
@@ -2725,6 +3063,48 @@ function adminV2() {
             return this.isArtistEditor() || this.isReleaseEditor();
         },
 
+        canShowMetadataTags() {
+            return this.isArtistEditor() || this.isReleaseEditor() || this.isTrackEditor();
+        },
+
+        metadataTags() {
+            return this.editorDetail && Array.isArray(this.editorDetail.metadata_tags)
+                ? this.editorDetail.metadata_tags
+                : [];
+        },
+
+        metadataTagClass(tag) {
+            const source = String((tag && tag.source) || 'unknown').toLowerCase().replace(/_/g, '-');
+            return `metadata-${source}`;
+        },
+
+        metadataTagSourceLabel(tag) {
+            const source = String((tag && tag.source) || '').toLowerCase();
+            if (source === 'lastfm') return 'Last.fm';
+            if (source === 'file') return 'File';
+            if (source === 'review') return 'Review';
+            if (source === 'track_genre') return 'Track genre';
+            if (source === 'release_lastfm') return 'Release Last.fm';
+            if (source === 'release_file') return 'Release file';
+            if (source === 'release_review') return 'Release review';
+            return source || 'Source';
+        },
+
+        metadataTagScore(tag) {
+            const source = String((tag && tag.source) || '').toLowerCase();
+            const weight = Number((tag && tag.weight) || 0);
+            return (source === 'lastfm' || source === 'release_lastfm') && weight > 1 ? String(Math.round(weight)) : '';
+        },
+
+        metadataTagTitle(tag) {
+            if (!tag) return '';
+            const parts = [this.metadataTagSourceLabel(tag)];
+            const weight = Number(tag.weight || 0);
+            if (weight > 0) parts.push(`weight ${Math.round(weight)}`);
+            if (tag.updated_at) parts.push(tag.updated_at);
+            return parts.join(' / ');
+        },
+
         editorCanSave() {
             if (!this.activeLibraryItem || !this.editorDetail || this.editorLoading || this.editorSaving) return false;
             if (this.isTrackEditor() && !this.editorDraft.release_id) return false;
@@ -2829,8 +3209,10 @@ function adminV2() {
         selectEditorRelease(release = null) {
             const candidates = this.filteredEditorReleases();
             release = release || candidates[0];
-            if (release) this.editorDraft.release_id = Number(release.id);
+            if (!release) return false;
+            this.editorDraft.release_id = Number(release.id);
             this.editorReleaseToAdd = '';
+            return true;
         },
 
         setEditorImageFile(event) {
@@ -2948,6 +3330,12 @@ function adminV2() {
         },
 
         async saveLibraryItem() {
+            if (this.isTrackEditor() && String(this.editorReleaseToAdd || '').trim()) {
+                if (!this.selectEditorRelease()) {
+                    this.showToast('Choose a release from search results');
+                    return;
+                }
+            }
             if (!this.editorCanSave()) return;
             this.editorSaving = true;
             try {
@@ -3078,21 +3466,9 @@ function adminV2() {
             return `${start}-${end} of ${this.fmt(this.library.total)}`;
         },
 
-        pagedJobs() {
+        cronLabel(job) {
-            const start = this.jobsPage * this.jobsPerPage;
+            const value = job && job.cron_expression ? String(job.cron_expression).trim() : '';
-            return this.jobs.slice(start, start + this.jobsPerPage);
+            return value || 'manual only';
-        },
-
-        pageJobs(delta) {
-            const maxPage = Math.max(0, Math.ceil(this.jobs.length / this.jobsPerPage) - 1);
-            this.jobsPage = Math.min(maxPage, Math.max(0, this.jobsPage + delta));
-        },
-
-        jobsRangeText() {
-            if (!this.jobs.length) return '0 tasks';
-            const start = this.jobsPage * this.jobsPerPage + 1;
-            const end = Math.min((this.jobsPage + 1) * this.jobsPerPage, this.jobs.length);
-            return `${start}-${end} of ${this.jobs.length}`;
         },
 
         statusCount(status) {
@@ -3110,8 +3486,7 @@ function adminV2() {
         },
 
         runChipLabel(run) {
-            const duration = run.duration_ms || run.duration_ms === 0 ? this.duration(run.duration_ms) : this.relativeDate(run.started_at);
+            return `#${run.id}`;
-            return `#${run.id} · ${duration}`;
         },
 
         runTitle(run) {

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">
@@ -422,13 +429,13 @@
                                                         <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>
-                                                        <button class="track-action-btn play-btn" @click="$store.player.play(item.track)" title="{{ t.player_play }}"><svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg></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">hidden</span></div>
                                                             <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>
                                                         <div class="upload-track-actions">
-                                                            <button class="track-action-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 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg></button>
+                                                            <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>
                                                     </div>
@@ -516,11 +523,6 @@
                                 <div class="upload-track-card" :class="{ hidden: item.is_hidden }">
                                     <template x-if="$store.torrents.uploadEditId !== item.track.id">
                                         <div class="upload-track-display">
-                                            <button class="track-action-btn play-btn"
-                                                    @click="$store.player.play(item.track)"
-                                                    title="{{ t.player_play }}">
-                                                <svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
-                                            </button>
                                             <div class="upload-track-main">
                                                 <div class="upload-track-title">
                                                     <span x-text="item.track.title"></span>
@@ -535,8 +537,11 @@
                                                 </div>
                                             </div>
                                             <div class="upload-track-actions">
-                                                <button class="track-action-btn" @click="$store.queue.addNextInQueue([item.track])" title="{{ t.player_play_next }}">
+                                                <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 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
+                                                    <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>
@@ -608,25 +613,93 @@
     <template x-if="$store.history.modal">
         <div class="modal-overlay" @click.self="$store.history.close()">
             <div class="modal-box history-modal">
+                <div class="history-head">
+                    <div>
                         <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-duration" x-text="$store.history.duration(item.duration_listened)"></div>
+                            <div class="track-actions">
+                                <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,6 +42,8 @@ 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 }}",
     trackWord: "{{ t.player_tracks_count }}",
@@ -165,6 +167,19 @@ 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;
@@ -172,31 +187,165 @@ document.addEventListener('alpine:init', () => {
         closeLibrary() {
             this.libraryOpen = false;
         },
+        isMobilePlayer() {
+            return window.matchMedia && window.matchMedia('(max-width: 720px)').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;
+        },
+        closePlayerFullscreen() {
+            this.playerExpanded = false;
+            this.playerDragging = false;
+            this.playerDragOffset = 0;
+            this.playerCloseOffset = 0;
+        },
+        playerDragStyle() {
+            return `--mobile-player-drag:${this.playerDragOffset}px; --mobile-player-close-drag:${this.playerCloseOffset}px;`;
+        },
+        handlePlayerClick(event) {
+            if (Date.now() <= this._playerSuppressClickUntil) {
+                event.preventDefault();
+                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();
@@ -360,6 +509,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;
@@ -752,7 +911,7 @@ document.addEventListener('alpine:init', () => {
 
         _remotePlaybackPayload(track, overrides = {}) {
             const queue = Alpine.store('queue');
-            const tracks = queue?.tracks?.length ? queue.tracks : (track ? [track] : []);
+            const tracks = queue?.tracks?.length ? queue._tracksWithJamDefaults(queue.tracks) : (track ? queue?._tracksWithJamDefaults([track]) || [track] : []);
             let index = Number.isInteger(overrides.index) ? overrides.index : (queue?.currentIndex ?? 0);
             if (track && tracks[index]?.id !== track.id) {
                 const foundIndex = tracks.findIndex(item => item.id === track.id);
@@ -799,7 +958,7 @@ document.addEventListener('alpine:init', () => {
             const queue = Alpine.store('queue');
             const tracks = Array.isArray(state.tracks) ? state.tracks.filter(Boolean) : [];
             if (queue && tracks.length > 0) {
-                queue.tracks = tracks;
+                queue.tracks = queue._tracksWithJamDefaults(tracks);
                 queue.currentIndex = Math.max(0, Math.min(Number(state.index || 0), tracks.length - 1));
             }
             const track = state.track || queue?.tracks?.[queue.currentIndex] || null;
@@ -842,7 +1001,7 @@ document.addEventListener('alpine:init', () => {
 
                 if (command.command === 'play_track' || command.command === 'play_from_index' || command.command === 'transfer_state') {
                     if (Array.isArray(payload.tracks) && payload.tracks.length > 0) {
-                        queue.tracks = payload.tracks;
+                        queue.tracks = queue._tracksWithJamDefaults(payload.tracks);
                         queue.currentIndex = Math.max(0, Math.min(Number(payload.index || 0), queue.tracks.length - 1));
                     }
                     const track = payload.track || queue.tracks[queue.currentIndex];
@@ -1082,6 +1241,8 @@ document.addEventListener('alpine:init', () => {
         currentJamId: null,
         open: false,
         jamPanelOpen: false,
+        jamPanelMode: 'create',
+        jamPanelJamId: null,
         jamQuery: '',
         jamUsers: [],
         jamSelectedUsers: [],
@@ -1181,6 +1342,47 @@ document.addEventListener('alpine:init', () => {
             return this.currentJamId ? this.jams.find(jam => jam.id === this.currentJamId) : null;
         },
 
+        currentJamUser(jam = this.selectedJam()) {
+            const profile = Alpine.store('user')?.profile;
+            if (profile?.id) {
+                return { id: profile.id, name: profile.name || 'User' };
+            }
+            const current = (jam?.members || []).find(member => member.is_current_user);
+            if (current?.user_id) {
+                return { id: current.user_id, name: current.name || 'User' };
+            }
+            if (jam?.is_owner && jam.host_user_id) {
+                return { id: jam.host_user_id, name: jam.host_name || 'User' };
+            }
+            return null;
+        },
+
+        hasJoinedJam() {
+            return this.jams.some(jam => jam.is_member);
+        },
+
+        activeJamMembers() {
+            const jam = this.selectedJam();
+            return (jam?.members || []).filter(member => member.is_joined && Number(member.last_seen_ms || 0) <= 45000);
+        },
+
+        jamMemberIds(jamId = this.jamPanelJamId || this.currentJamId) {
+            const jam = this.jams.find(item => item.id === jamId);
+            return new Set((jam?.members || []).map(member => Number(member.user_id)));
+        },
+
+        userColorStyle(userId, name = '') {
+            const palette = ['#4cc9f0', '#f72585', '#f9c74f', '#90be6d', '#f8961e', '#b5179e', '#43aa8b', '#577590'];
+            const raw = String(userId || name || '');
+            let hash = 0;
+            for (let i = 0; i < raw.length; i++) hash = ((hash * 31) + raw.charCodeAt(i)) >>> 0;
+            const hex = palette[hash % palette.length];
+            const r = parseInt(hex.slice(1, 3), 16);
+            const g = parseInt(hex.slice(3, 5), 16);
+            const b = parseInt(hex.slice(5, 7), 16);
+            return `--jam-contributor-color:${hex};--jam-contributor-bg:rgba(${r},${g},${b},0.13);--jam-contributor-bg-active:rgba(${r},${g},${b},0.2)`;
+        },
+
         isControllingRemoteJam() {
             const jam = this.selectedJam();
             return !!jam && !jam.is_owner;
@@ -1255,10 +1457,39 @@ document.addEventListener('alpine:init', () => {
         },
 
         openJamPanel() {
+            if (this.hasJoinedJam()) return;
+            this.jamPanelMode = 'create';
+            this.jamPanelJamId = null;
+            this.jamSelectedUsers = [];
+            this.jamUsers = [];
+            this.jamQuery = '';
             this.jamPanelOpen = !this.jamPanelOpen;
             if (this.jamPanelOpen && this.jamQuery.trim()) this.searchJamUsers();
         },
 
+        openJamManagePanel(jam) {
+            if (!jam?.is_member) return;
+            if (this.jamPanelOpen && this.jamPanelMode === 'manage' && this.jamPanelJamId === jam.id) {
+                this.jamPanelOpen = false;
+                return;
+            }
+            this.jamPanelMode = 'manage';
+            this.jamPanelJamId = jam.id;
+            this.jamSelectedUsers = [];
+            this.jamUsers = [];
+            this.jamQuery = '';
+            this.jamPanelOpen = true;
+        },
+
+        handleJamRowClick(jam) {
+            if (!jam) return;
+            if (jam.is_active && jam.is_member) {
+                this.openJamManagePanel(jam);
+                return;
+            }
+            this.selectJam(jam);
+        },
+
         queueJamSearch() {
             clearTimeout(this._jamSearchTimer);
             this._jamSearchTimer = setTimeout(() => this.searchJamUsers(), 180);
@@ -1275,7 +1506,8 @@ document.addEventListener('alpine:init', () => {
                 const res = await fetch('/api/player/jams/users?q=' + encodeURIComponent(query));
                 if (!res.ok) return;
                 const selected = new Set(this.jamSelectedUsers.map(user => user.id));
-                this.jamUsers = (await res.json()).filter(user => !selected.has(user.id));
+                const existing = this.jamMemberIds();
+                this.jamUsers = (await res.json()).filter(user => !selected.has(user.id) && !existing.has(Number(user.id)));
             } catch {
             } finally {
                 this.jamSearching = false;
@@ -1293,7 +1525,13 @@ document.addEventListener('alpine:init', () => {
             this.jamSelectedUsers = this.jamSelectedUsers.filter(user => user.id !== userId);
         },
 
+        submitJamPanel() {
+            if (this.jamPanelMode === 'manage') this.inviteToJam();
+            else this.createJam();
+        },
+
         async createJam() {
+            if (this.hasJoinedJam()) return;
             try {
                 const res = await fetch('/api/player/jams', {
                     method: 'POST',
@@ -1306,6 +1544,7 @@ document.addEventListener('alpine:init', () => {
                 if (!res.ok) return;
                 const data = await res.json();
                 this._apply(data);
+                Alpine.store('queue')?._ensureCurrentJamAttribution();
                 this.jamPanelOpen = false;
                 this.jamQuery = '';
                 this.jamUsers = [];
@@ -1314,6 +1553,26 @@ document.addEventListener('alpine:init', () => {
             } catch {}
         },
 
+        async inviteToJam() {
+            if (!this.jamPanelJamId || this.jamSelectedUsers.length === 0) return;
+            try {
+                const res = await fetch('/api/player/jams/invite', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        jam_id: this.jamPanelJamId,
+                        device_id: this.id,
+                        invitee_user_ids: this.jamSelectedUsers.map(user => user.id),
+                    }),
+                });
+                if (!res.ok) return;
+                this._apply(await res.json());
+                this.jamQuery = '';
+                this.jamUsers = [];
+                this.jamSelectedUsers = [];
+            } catch {}
+        },
+
         async selectJam(jam) {
             if (!jam) return;
             try {
@@ -1334,6 +1593,7 @@ document.addEventListener('alpine:init', () => {
                 this.currentJamId = jam.id;
                 sessionStorage.setItem('furu_player_jam_id', jam.id);
                 this._apply(data);
+                Alpine.store('queue')?._ensureCurrentJamAttribution();
                 this.open = false;
                 const player = Alpine.store('player');
                 if (player && this.isControllingRemoteJam() && data.playback_state) {
@@ -1363,6 +1623,8 @@ document.addEventListener('alpine:init', () => {
 
         clearJamSelection() {
             this.currentJamId = null;
+            this.jamPanelOpen = false;
+            this.jamPanelJamId = null;
             sessionStorage.removeItem('furu_player_jam_id');
         },
     });
@@ -1375,13 +1637,21 @@ document.addEventListener('alpine:init', () => {
         currentIndex: 0,
         visible: false,
         _dragIdx: null,
+        _dragOverIdx: null,
+        _pointerDragMove: null,
+        _pointerDragEnd: null,
 
         add(track) {
             this.addToEnd([track]);
         },
 
+        upcoming(limit = 12) {
+            const start = Math.max(0, this.currentIndex + 1);
+            return this.tracks.slice(start, start + limit);
+        },
+
         addToEnd(tracks) {
-            const items = this._trackList(tracks);
+            const items = this._tracksForQueueAdd(tracks);
             if (!items.length) return;
             if (this._sendRemoteQueueCommand('queue_add_end', { tracks: items })) {
                 this._addToEndLocal(items);
@@ -1391,7 +1661,7 @@ document.addEventListener('alpine:init', () => {
         },
 
         addNextInQueue(tracks) {
-            const items = this._trackList(tracks);
+            const items = this._tracksForQueueAdd(tracks);
             if (!items.length) return;
             if (this._sendRemoteQueueCommand('queue_add_next', { tracks: items })) {
                 this._addNextLocal(items);
@@ -1401,7 +1671,7 @@ document.addEventListener('alpine:init', () => {
         },
 
         playRelease(tracks, startIndex) {
-            this.tracks = [...tracks];
+            this.tracks = this._tracksForQueueAdd(tracks);
             this.playFromIndex(startIndex || 0);
         },
 
@@ -1426,6 +1696,74 @@ document.addEventListener('alpine:init', () => {
             this._moveTrackLocal(fromIdx, toIdx);
         },
 
+        startPointerReorder(event, idx) {
+            if (event.pointerType === 'mouse') return;
+            if (event.button && event.button !== 0) return;
+            if (idx < 0 || idx >= this.tracks.length) return;
+            event.preventDefault();
+            this._endPointerReorder(false);
+            this._dragIdx = idx;
+            this._dragOverIdx = idx;
+            const handle = event.currentTarget;
+            try {
+                handle?.setPointerCapture?.(event.pointerId);
+            } catch (_) {}
+
+            this._pointerDragMove = (moveEvent) => {
+                moveEvent.preventDefault();
+                this._autoScrollDuringReorder(moveEvent.clientY);
+                const target = document
+                    .elementFromPoint(moveEvent.clientX, moveEvent.clientY)
+                    ?.closest?.('.queue-track[data-queue-index]');
+                const targetIdx = Number(target?.dataset?.queueIndex);
+                if (!Number.isInteger(targetIdx) || targetIdx < 0 || targetIdx >= this.tracks.length) return;
+                this._dragOverIdx = targetIdx;
+                document.querySelectorAll('.queue-track.drag-over').forEach(el => el.classList.remove('drag-over'));
+                if (targetIdx !== this._dragIdx) target.classList.add('drag-over');
+            };
+
+            this._pointerDragEnd = (endEvent) => {
+                try {
+                    if (handle?.hasPointerCapture?.(endEvent.pointerId)) handle.releasePointerCapture(endEvent.pointerId);
+                } catch (_) {}
+                this._endPointerReorder(true);
+            };
+
+            window.addEventListener('pointermove', this._pointerDragMove, { passive: false });
+            window.addEventListener('pointerup', this._pointerDragEnd, { passive: false });
+            window.addEventListener('pointercancel', this._pointerDragEnd, { passive: false });
+        },
+
+        _autoScrollDuringReorder(clientY) {
+            const scroller = document.querySelector('.queue-tracks');
+            if (!scroller) return;
+            const rect = scroller.getBoundingClientRect();
+            const edge = 52;
+            if (clientY < rect.top + edge) {
+                scroller.scrollTop -= Math.ceil((rect.top + edge - clientY) / 4);
+            } else if (clientY > rect.bottom - edge) {
+                scroller.scrollTop += Math.ceil((clientY - (rect.bottom - edge)) / 4);
+            }
+        },
+
+        _endPointerReorder(commit) {
+            if (this._pointerDragMove) window.removeEventListener('pointermove', this._pointerDragMove);
+            if (this._pointerDragEnd) {
+                window.removeEventListener('pointerup', this._pointerDragEnd);
+                window.removeEventListener('pointercancel', this._pointerDragEnd);
+            }
+            document.querySelectorAll('.queue-track.drag-over').forEach(el => el.classList.remove('drag-over'));
+            const fromIdx = this._dragIdx;
+            const toIdx = this._dragOverIdx;
+            this._pointerDragMove = null;
+            this._pointerDragEnd = null;
+            this._dragIdx = null;
+            this._dragOverIdx = null;
+            if (commit && Number.isInteger(fromIdx) && Number.isInteger(toIdx) && fromIdx !== toIdx) {
+                this.moveTrack(fromIdx, toIdx);
+            }
+        },
+
         clear() {
             if (this._sendRemoteQueueCommand('queue_clear')) {
                 this._clearLocal();
@@ -1438,6 +1776,53 @@ document.addEventListener('alpine:init', () => {
             return (Array.isArray(tracks) ? tracks : [tracks]).filter(Boolean);
         },
 
+        _tracksForQueueAdd(tracks) {
+            const items = this._trackList(tracks).map(track => ({ ...track }));
+            const devices = Alpine.store('devices');
+            const jam = devices?.selectedJam?.();
+            const user = devices?.currentJamUser?.(jam);
+            if (!jam || !jam.is_member || !user?.id) return items;
+            return items.map(track => ({
+                ...track,
+                added_by_user_id: user.id,
+                added_by_user_name: user.name || 'User',
+            }));
+        },
+
+        _tracksWithJamDefaults(tracks) {
+            const items = this._trackList(tracks);
+            const jam = Alpine.store('devices')?.selectedJam?.();
+            if (!jam?.is_member || !jam.host_user_id) return items;
+            return items.map(track => {
+                if (track?.added_by_user_id) return track;
+                return {
+                    ...track,
+                    added_by_user_id: jam.host_user_id,
+                    added_by_user_name: jam.host_name || 'Host',
+                };
+            });
+        },
+
+        _ensureCurrentJamAttribution() {
+            this.tracks = this._tracksWithJamDefaults(this.tracks);
+        },
+
+        isForeignJamTrack(track) {
+            const devices = Alpine.store('devices');
+            const jam = devices?.selectedJam?.();
+            const userId = Alpine.store('user')?.profile?.id;
+            if (!jam || !jam.is_member || !track?.added_by_user_id || !userId) return false;
+            return String(track.added_by_user_id) !== String(userId);
+        },
+
+        contributorTitle(track) {
+            return track?.added_by_user_name ? `Added by ${track.added_by_user_name}` : 'Added by another listener';
+        },
+
+        contributorStyle(track) {
+            return Alpine.store('devices')?.userColorStyle(track?.added_by_user_id, track?.added_by_user_name) || '';
+        },
+
         _sendRemoteQueueCommand(command, payload = {}) {
             const player = Alpine.store('player');
             if (!player?._shouldSendRemote()) return false;
@@ -1446,13 +1831,13 @@ document.addEventListener('alpine:init', () => {
         },
 
         _addToEndLocal(tracks) {
-            const items = this._trackList(tracks);
+            const items = this._tracksWithJamDefaults(tracks);
             if (!items.length) return;
             this.tracks = [...this.tracks, ...items];
         },
 
         _addNextLocal(tracks) {
-            const items = this._trackList(tracks);
+            const items = this._tracksWithJamDefaults(tracks);
             if (!items.length) return;
             const insertAt = Math.min(this.currentIndex + 1, this.tracks.length);
             this.tracks.splice(insertAt, 0, ...items);
@@ -1763,8 +2148,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) {
@@ -1788,7 +2190,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) {
@@ -1876,6 +2280,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 = '';

templates/player/shell.html

@@ -483,19 +483,16 @@
                                                     <span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
                                                     <span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
                                                 </button>
-                                                <button class="track-action-btn play-btn" @click.stop="$store.library.playSearchTrack(idx)" title="{{ t.player_play }}">
-                                                    <svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
-                                                </button>
                                                 <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
                                                     <svg viewBox="0 0 24 24" :fill="$store.likes.has(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" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
+                                                <button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
-                                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
+                                                    <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" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
+                                                <button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
-                                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
+                                                    <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" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
+                                                <button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([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>
@@ -573,8 +570,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 }}'">
@@ -663,19 +669,16 @@
                                             <span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
                                             <span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
                                         </button>
-                                        <button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentArtist.featured_tracks, idx)" title="{{ t.player_play }}">
-                                            <svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
-                                        </button>
                                         <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
                                             <svg viewBox="0 0 24 24" :fill="$store.likes.has(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" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
+                                        <button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
-                                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
+                                            <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" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
+                                        <button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
-                                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
+                                            <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" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
+                                        <button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([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>
@@ -786,19 +789,16 @@
                                     <span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
                                     <span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
                                 </button>
-                                <button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease([track], 0)" title="{{ t.player_play }}">
-                                    <svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
-                                </button>
                                 <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
                                     <svg viewBox="0 0 24 24" :fill="$store.likes.has(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" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
+                                <button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
-                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
+                                    <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" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
+                                <button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
-                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
+                                    <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" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
+                                <button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([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>
@@ -862,19 +862,16 @@
                                     <span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
                                     <span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
                                 </button>
-                                <button class="track-action-btn play-btn" @click.stop="$store.queue.playRelease($store.library.currentPlaylist.tracks, idx)" title="{{ t.player_play }}">
-                                    <svg viewBox="0 0 24 24" fill="currentColor"><path d="M8 5v14l11-7z"/></svg>
-                                </button>
                                 <button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
                                     <svg viewBox="0 0 24 24" :fill="$store.likes.has(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" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
+                                <button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
-                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h8M5 18h14"/><path d="M17 10l4 3-4 3" fill="currentColor" stroke="none"/></svg>
+                                    <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" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
+                                <button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
-                                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
+                                    <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" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
+                                <button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([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>
@@ -904,7 +901,9 @@
                 </template>
                 <template x-for="(track, idx) in $store.queue.tracks" :key="idx + '-' + track.id">
                     <div class="queue-track"
-                         :class="{ active: idx === $store.queue.currentIndex, dragging: $store.queue._dragIdx === idx }"
+                         :data-queue-index="idx"
+                         :class="{ active: idx === $store.queue.currentIndex, dragging: $store.queue._dragIdx === idx, 'foreign-jam-track': $store.queue.isForeignJamTrack(track) }"
+                         :style="$store.queue.isForeignJamTrack(track) ? $store.queue.contributorStyle(track) : ''"
                          @click="$store.queue.playFromIndex(idx)"
                          draggable="true"
                          @dragstart="$store.queue._dragIdx = idx; $event.dataTransfer.effectAllowed = 'move'"
@@ -912,7 +911,10 @@
                          @dragover.prevent="$event.dataTransfer.dropEffect = 'move'; $event.currentTarget.classList.add('drag-over')"
                          @dragleave="$event.currentTarget.classList.remove('drag-over')"
                          @drop.prevent="$event.currentTarget.classList.remove('drag-over'); if ($store.queue._dragIdx !== null) { $store.queue.moveTrack($store.queue._dragIdx, idx); $store.queue._dragIdx = null; }">
-                        <div class="queue-drag-handle" @mousedown.stop>
+                        <div class="queue-drag-handle"
+                             @mousedown.stop
+                             @click.stop
+                             @pointerdown.stop="$store.queue.startPointerReorder($event, idx)">
                             <svg viewBox="0 0 24 24" fill="currentColor"><circle cx="9" cy="6" r="1.5"/><circle cx="15" cy="6" r="1.5"/><circle cx="9" cy="12" r="1.5"/><circle cx="15" cy="12" r="1.5"/><circle cx="9" cy="18" r="1.5"/><circle cx="15" cy="18" r="1.5"/></svg>
                         </div>
                         <div class="queue-track-cover">
@@ -955,11 +957,21 @@
     </div>
 
     <!-- Player Bar -->
-    <div class="player-bar">
+    <div class="player-bar"
+         :class="{ 'mobile-expanded': $store.mobile.playerExpanded, 'mobile-dragging': $store.mobile.playerDragging }"
+         :style="$store.mobile.playerDragStyle()"
+         @click.capture="$store.mobile.handlePlayerClick($event)"
+         @pointerdown="$store.mobile.startPlayerDrag($event)">
+        <button class="mobile-player-collapse-btn" type="button" @click.stop="$store.mobile.closePlayerFullscreen()" title="{{ t.player_close }}" aria-label="{{ t.player_close }}">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4">
+                <path d="M6 9l6 6 6-6"/>
+            </svg>
+        </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">
+                    <div class="player-cover"
+                         @click.stop="$store.mobile.openPlayerFullscreen()">
                         <template x-if="$store.player.currentTrack.cover_url">
                             <img :src="$store.player.currentTrack.cover_url" :alt="$store.player.currentTrack.title">
                         </template>
@@ -989,6 +1001,9 @@
                                 <span class="player-release-year" x-text="' · ' + $store.player.currentTrack.release_year"></span>
                             </template>
                         </div>
+                        <div class="player-track-release" x-show="$store.player.currentTrack.release_title">
+                            <a class="artist-link" @click.stop="$store.player.currentTrack.release_id && $store.library.openRelease($store.player.currentTrack.release_id)" x-text="$store.player.currentTrack.release_title"></a>
+                        </div>
                     </div>
                 </div>
             </template>
@@ -1029,6 +1044,8 @@
                         <div class="progress-bar-thumb"></div>
                     </div>
                 </div>
+                <div class="player-progress-strip-times"
+                     x-text="'-' + formatTime(Math.max(0, $store.player.duration - $store.player.currentTime)) + ' / ' + formatTime($store.player.duration)"></div>
                 <span class="player-time" x-text="formatTime($store.player.duration)"></span>
             </div>
             <div class="player-version-chip">v{{ t.app_version() }}</div>
@@ -1069,6 +1086,13 @@
                         <path d="M8 20h8"/>
                         <path d="M12 16v4"/>
                     </svg>
+                    <span class="jam-member-squares"
+                          x-show="$store.devices.activeJamMembers().length > 0"
+                          x-cloak>
+                        <template x-for="member in $store.devices.activeJamMembers().slice(0, 8)" :key="'device-jam-member-' + member.user_id">
+                            <span class="jam-member-square" :style="$store.devices.userColorStyle(member.user_id, member.name)"></span>
+                        </template>
+                    </span>
                 </button>
                 <div class="device-popover" x-show="$store.devices.open" x-transition x-cloak>
                     <template x-for="device in $store.devices.devices" :key="device.id">
@@ -1107,7 +1131,7 @@
                     <template x-for="jam in $store.devices.jams" :key="jam.id">
                         <button class="device-row jam-row"
                                 :class="{ active: jam.is_active, pending: jam.is_pending }"
-                                @click="$store.devices.selectJam(jam)">
+                                @click="$store.devices.handleJamRowClick(jam)">
                             <span class="device-row-icon">
                                 <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                                     <circle cx="8" cy="8" r="3"/>
@@ -1128,7 +1152,7 @@
                             </span>
                         </button>
                     </template>
-                    <button class="device-row start-jam-row" @click="$store.devices.openJamPanel()">
+                    <button class="device-row start-jam-row" x-show="!$store.devices.hasJoinedJam()" @click="$store.devices.openJamPanel()">
                         <span class="device-row-icon">
                             <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                                 <path d="M12 5v14"/>
@@ -1141,6 +1165,7 @@
                         </span>
                     </button>
                     <div class="jam-create-panel" x-show="$store.devices.jamPanelOpen" x-transition x-cloak>
+                        <div class="jam-panel-title" x-text="$store.devices.jamPanelMode === 'manage' ? 'Invite listeners' : 'Start Jam'"></div>
                         <div class="jam-selected-users" x-show="$store.devices.jamSelectedUsers.length > 0">
                             <template x-for="user in $store.devices.jamSelectedUsers" :key="user.id">
                                 <button class="jam-user-chip" @click="$store.devices.removeJamInvitee(user.id)">
@@ -1162,9 +1187,51 @@
                                 </button>
                             </template>
                         </div>
-                        <button class="jam-create-btn" @click="$store.devices.createJam()">Create Jam</button>
+                        <div class="jam-panel-actions">
+                            <button class="jam-create-btn"
+                                    :disabled="$store.devices.jamSelectedUsers.length === 0 && $store.devices.jamPanelMode === 'manage'"
+                                    @click="$store.devices.submitJamPanel()"
+                                    x-text="$store.devices.jamPanelMode === 'manage' ? 'Invite' : 'Create Jam'"></button>
+                            <button class="jam-leave-btn"
+                                    x-show="$store.devices.jamPanelMode === 'manage'"
+                                    @click="$store.devices.leaveJam($store.devices.jamPanelJamId)">Leave</button>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+        <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>
+            </template>
+            <template x-for="(track, idx) in $store.queue.upcoming()" :key="'mobile-expanded-queue-' + track.id + '-' + idx">
+                <button class="mobile-expanded-queue-row"
+                        :class="{ 'foreign-jam-track': $store.queue.isForeignJamTrack(track) }"
+                        :style="$store.queue.isForeignJamTrack(track) ? $store.queue.contributorStyle(track) : ''"
+                        type="button"
+                        @click="$store.queue.playFromIndex($store.queue.currentIndex + idx + 1)">
+                    <div class="mobile-expanded-queue-cover">
+                        <template x-if="track.cover_url">
+                            <img :src="track.cover_url" :alt="track.title" loading="lazy">
+                        </template>
+                        <template x-if="!track.cover_url">
+                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M9 18V5l12-2v13"/><circle cx="6" cy="18" r="3"/><circle cx="18" cy="16" r="3"/></svg>
+                        </template>
+                    </div>
+                    <div class="mobile-expanded-queue-info">
+                        <div class="mobile-expanded-queue-name" x-text="track.title"></div>
+                        <div class="mobile-expanded-queue-artist">
+                            <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>
+                                    <span x-text="artist.label"></span>
+                                </span>
+                            </template>
+                        </div>
+                    </div>
+                    <span class="mobile-expanded-queue-time" x-text="formatTime(track.duration_seconds)"></span>
+                </button>
+            </template>
+        </div>
+    </div>