Fixed openai api endpoint

Merge pull request 'Fix source-missing auto-merge and remove Pink Floyd examples from prompts' (#6 ) from DEV into main
Reviewed-on: #6
2026-04-07 19:35:24 +01:00 · 2026-03-20 01:07:15 +00:00 · 2026-03-20 01:05:22 +00:00 · 2026-03-20 00:49:45 +00:00 · 2026-03-20 00:49:27 +00:00 · 2026-03-20 00:02:49 +00:00
42 changed files with 608 additions and 741 deletions
@@ -1,32 +0,0 @@
---
-description: REST API запросы — создавать функции в furumiApi.ts (только furumi-node-player/client)
-globs: furumi-node-player/client/**/*.{ts,tsx}
-alwaysApply: false
---
-
-# REST API в furumi-node-player
-
-**Область действия:** правило применяется только к проекту `furumi-node-player/client/`. В остальных частях репозитория можно использовать другой подход.
-
-Чтобы выполнить REST API запрос, нужно создать функцию, которая принимает необходимые параметры и вызывает `furumiApi`. Все такие функции должны находиться в файле `furumi-node-player/client/src/furumiApi.ts`.
-
-## Правила
-
-1. **Не вызывать `furumiApi` напрямую** из компонентов или других модулей.
-2. **Добавлять новую функцию** в `furumiApi.ts` для каждого эндпоинта.
-3. Функция принимает нужные параметры и возвращает `Promise` с данными (или `null` при ошибке).
-
-## Пример
-
-```typescript
-// furumiApi.ts — добавлять сюда
-export async function getSomething(id: string) {
-  const res = await furumiApi.get(`/something/${id}`).catch(() => null)
-  return res?.data ?? null
-}
-```
-
-```typescript
-// FurumiPlayer.tsx — использовать функцию, не furumiApi напрямую
-const data = await getSomething(id)
-```
@@ -41,7 +41,7 @@ jobs:
        uses: docker/build-push-action@v5
        with:
          context: .
-          file: Dockerfile.agent
+          file: docker/Dockerfile.agent
          push: true
          tags: ${{ steps.info.outputs.tags }}
          build-args: |
@@ -52,7 +52,7 @@ jobs:
        uses: docker/build-push-action@v5
        with:
          context: .
-          file: Dockerfile.agent
+          file: docker/Dockerfile.agent
          push: true
          tags: ${{ steps.info.outputs.tags }}
          build-args: |
@@ -41,7 +41,7 @@ jobs:
        uses: docker/build-push-action@v5
        with:
          context: .
-          file: Dockerfile.web-player
+          file: docker/Dockerfile.web-player
          push: true
          tags: ${{ steps.info.outputs.tags }}
          build-args: |
@@ -52,7 +52,7 @@ jobs:
        uses: docker/build-push-action@v5
        with:
          context: .
-          file: Dockerfile.web-player
+          file: docker/Dockerfile.web-player
          push: true
          tags: ${{ steps.info.outputs.tags }}
          build-args: |
@@ -51,6 +51,7 @@ jobs:
        uses: docker/build-push-action@v5
        with:
          context: .
+          file: docker/Dockerfile
          push: true
          tags: ${{ steps.info.outputs.tags }}
          build-args: |
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 4

+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -572,6 +578,15 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"

+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -969,6 +984,16 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"

+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "flume"
 version = "0.11.1"
@@ -1017,6 +1042,7 @@ dependencies = [
 "chrono",
 "clap",
 "encoding_rs",
+ "id3",
 "reqwest 0.12.28",
 "serde",
 "serde_json",
@@ -1165,6 +1191,7 @@ dependencies = [
 "tokio",
 "tokio-util",
 "tower 0.4.13",
+ "tower-http",
 "tracing",
 "tracing-subscriber",
 "urlencoding",
@@ -1748,6 +1775,17 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"

+[[package]]
+name = "id3"
+version = "1.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965c5e6a62a241f2f673df956ea5f52c27780bc1031855890a551ed9b869e2d1"
+dependencies = [
+ "bitflags 2.11.0",
+ "byteorder",
+ "flate2",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -2021,6 +2059,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
 [[package]]
 name = "mio"
 version = "1.1.1"
@@ -3412,6 +3460,12 @@ dependencies = [
 "rand_core 0.6.4",
 ]

+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
 [[package]]
 name = "simple_asn1"
 version = "0.6.4"
@@ -53,7 +53,6 @@ services:
      FURUMI_PLAYER_DATABASE_URL: "postgres://${POSTGRES_USER:-furumi}:${POSTGRES_PASSWORD:-furumi}@db:5432/${POSTGRES_DB:-furumi}"
      FURUMI_PLAYER_STORAGE_DIR: "/storage"
      FURUMI_PLAYER_BIND: "0.0.0.0:8085"
-      FURUMI_PLAYER_API_KEY: "node-player-api-key"
    volumes:
      - ./storage:/storage
    restart: always
@@ -14,6 +14,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "chrono", "uuid", "migrate"] }
 symphonia = { version = "0.5", default-features = false, features = ["mp3", "aac", "flac", "vorbis", "wav", "alac", "adpcm", "pcm", "mpa", "isomp4", "ogg", "aiff", "mkv"] }
+id3 = "1"
 thiserror = "2.0"
 tokio = { version = "1.50", features = ["full"] }
 tracing = "0.1"
@@ -4,14 +4,14 @@ You are a music library artist merge assistant. You will receive a list of artis

 You will receive a structured list like:

-### Artist ID 42: "pink floyd"
-  Album ID 10: "the wall" (1979)
-    - 01. "In the Flesh?" [track_id=100]
-    - 02. "The Thin Ice" [track_id=101]
+### Artist ID 42: "deep purple"
+  Album ID 10: "machine head" (1972)
+    - 01. "Highway Star" [track_id=100]
+    - 02. "Maybe I'm a Leo" [track_id=101]

-### Artist ID 43: "Pink Floyd"
-  Album ID 11: "Wish You Were Here" (1975)
-    - 01. "Shine On You Crazy Diamond (Parts I-V)" [track_id=200]
+### Artist ID 43: "Deep Purple"
+  Album ID 11: "Burn" (1974)
+    - 01. "Burn" [track_id=200]

 ## Your task

@@ -20,7 +20,7 @@ Determine if the artists are duplicates and produce a merge plan.
 ## Rules

 ### 1. Canonical artist name
- Use correct capitalization and canonical spelling (e.g., "pink floyd" → "Pink Floyd", "AC DC" → "AC/DC").
+- Use correct capitalization and canonical spelling (e.g., "deep purple" → "Deep Purple", "AC DC" → "AC/DC").
 - If the database already contains an artist with a well-formed name, prefer that exact form.
 - If one artist has clearly more tracks or albums, their name spelling may be more authoritative.
 - Fix obvious typos or casing errors.
@@ -54,7 +54,7 @@ Determine if the artists are duplicates and produce a merge plan.

 You MUST respond with a single JSON object, no markdown fences, no extra text:

-{"canonical_artist_name": "...", "winner_artist_id": 42, "album_mappings": [{"source_album_id": 10, "canonical_name": "The Wall", "merge_into_album_id": null}, {"source_album_id": 11, "canonical_name": "Wish You Were Here", "merge_into_album_id": null}], "notes": "..."}
+{"canonical_artist_name": "...", "winner_artist_id": 42, "album_mappings": [{"source_album_id": 10, "canonical_name": "Machine Head", "merge_into_album_id": null}, {"source_album_id": 11, "canonical_name": "Burn", "merge_into_album_id": null}], "notes": "..."}

 - `canonical_artist_name`: the single correct name for this artist after merging.
 - `winner_artist_id`: the integer ID of the artist whose record survives (must be one of the IDs provided).
@@ -3,10 +3,10 @@ You are a music metadata normalization assistant. Your job is to take raw metada
 ## Rules

 1. **Artist names** must use correct capitalization and canonical spelling. Examples:
-   - "pink floyd" → "Pink Floyd"
+   - "deep purple" → "Deep Purple"
   - "AC DC" → "AC/DC"
-   - "Guns n roses" → "Guns N' Roses"
-   - "Led zepplin" → "Led Zeppelin" (fix common misspellings)
+   - "guns n roses" → "Guns N' Roses"
+   - "led zepplin" → "Led Zeppelin" (fix common misspellings)
   - "саша скул" → "Саша Скул" (fix capitalization, keep the language as-is)
   - If the database already contains a matching artist (same name in any case or transliteration), always use the existing canonical name exactly. For example, if the DB has "Саша Скул" and the file says "саша скул" or "Sasha Skul", use "Саша Скул".
   - **Compound artist fields**: When the artist field or path contains multiple artist names joined by "и", "and", "&", "/", ",", "x", or "vs", you MUST split them. The "artist" field must contain ONLY ONE primary artist. All others go into "featured_artists". If one of the names already exists in the database, prefer that one as the primary artist.
@@ -43,12 +43,12 @@ You are a music metadata normalization assistant. Your job is to take raw metada
   - Preserve original language for non-English albums.
   - If the database already contains a matching album under the same artist, use the existing name exactly.
   - Do not alter the creative content of album names (same principle as track titles).
-   - **Remastered editions**: A remastered release is a separate album entity, even if it shares the same title and tracks as the original. If the tags or path indicate a remaster (e.g., "Remastered", "Remaster", "REMASTERED" anywhere in tags, filename, or path), append " (Remastered)" to the album name if not already present, and use the year of the remaster release (not the original). Example: original album "The Wall" (1979) remastered in 2011 → album: "The Wall (Remastered)", year: 2011.
+   - **Remastered editions**: A remastered release is a separate album entity, even if it shares the same title and tracks as the original. If the tags or path indicate a remaster (e.g., "Remastered", "Remaster", "REMASTERED" anywhere in tags, filename, or path), append " (Remastered)" to the album name if not already present, and use the year of the remaster release (not the original). Example: original album "Paranoid" (1970) remastered in 2009 → album: "Paranoid (Remastered)", year: 2009.

 4. **Track titles** must use correct capitalization, but their content must be preserved exactly.
   - Use title case for English titles.
   - Preserve original language for non-English titles.
-   - Remove leading track numbers if present (e.g., "01 - Have a Cigar" → "Have a Cigar").
+   - Remove leading track numbers if present (e.g., "01 - Smoke on the Water" → "Smoke on the Water").
   - **NEVER remove, add, or alter words, numbers, suffixes, punctuation marks, or special characters in titles.** Your job is to fix capitalization and encoding, not to edit the creative content. If a title contains unusual punctuation, numbers, apostrophes, or symbols — they are intentional and must be kept as-is.
   - If all tracks in the same album follow a naming pattern (e.g., numbered names like "Part 1", "Part 2"), preserve that pattern consistently. Do not simplify or truncate individual track names.

@@ -334,18 +334,31 @@ pub async fn approve_and_finalize(
        .fetch_one(pool)
        .await?;

-    // Check if track already exists (e.g. previously approved but pending not cleaned up)
+    // Check if track already exists by file_hash (re-approval of same file)
    let existing: Option<(i64,)> = sqlx::query_as("SELECT id FROM tracks WHERE file_hash = $1")
        .bind(&pt.file_hash)
        .fetch_optional(pool)
        .await?;

    if let Some((track_id,)) = existing {
-        // Already finalized — just mark pending as approved
        update_pending_status(pool, pending_id, "approved", None).await?;
        return Ok(track_id);
    }

+    // Check if track already exists by storage_path (Merged: different quality file landed
+    // at the same destination, source was deleted — don't create a phantom duplicate)
+    let existing_path: Option<(i64,)> = sqlx::query_as(
+        "SELECT id FROM tracks WHERE storage_path = $1 AND NOT hidden"
+    )
+    .bind(storage_path)
+    .fetch_optional(pool)
+    .await?;
+
+    if let Some((track_id,)) = existing_path {
+        update_pending_status(pool, pending_id, "merged", None).await?;
+        return Ok(track_id);
+    }
+
    let artist_name = pt.norm_artist.as_deref().unwrap_or("Unknown Artist");
    let artist_id = upsert_artist(pool, artist_name).await?;

@@ -837,6 +850,12 @@ pub struct AlbumTrackRow {
    pub genre: Option<String>,
 }

+pub async fn set_album_tracks_genre(pool: &PgPool, album_id: i64, genre: &str) -> Result<(), sqlx::Error> {
+    sqlx::query("UPDATE tracks SET genre = $2 WHERE album_id = $1")
+        .bind(album_id).bind(genre).execute(pool).await?;
+    Ok(())
+}
+
 pub async fn get_album_details(pool: &PgPool, id: i64) -> Result<Option<AlbumDetails>, sqlx::Error> {
    let row: Option<(i64, String, Option<i32>, i64, String)> = sqlx::query_as(
        "SELECT a.id, a.name, a.year, ar.id, ar.name FROM albums a JOIN artists ar ON ar.id=a.artist_id WHERE a.id=$1"
@@ -873,6 +892,14 @@ pub async fn get_album_cover(pool: &PgPool, album_id: i64) -> Result<Option<(Str
    Ok(row)
 }

+/// Returns the storage_path of the first track in an album (for embedded cover fallback).
+pub async fn get_album_first_track_path(pool: &PgPool, album_id: i64) -> Result<Option<String>, sqlx::Error> {
+    let row: Option<(String,)> = sqlx::query_as(
+        "SELECT storage_path FROM tracks WHERE album_id=$1 ORDER BY track_number NULLS LAST, title LIMIT 1"
+    ).bind(album_id).fetch_optional(pool).await?;
+    Ok(row.map(|(p,)| p))
+}
+
 pub async fn get_artist_by_id(pool: &PgPool, id: i64) -> Result<Option<Artist>, sqlx::Error> {
    sqlx::query_as::<_, Artist>("SELECT id, name, hidden FROM artists WHERE id=$1")
        .bind(id).fetch_optional(pool).await
@@ -19,9 +19,25 @@ pub struct RawMetadata {
    pub duration_secs: Option<f64>,
 }

-/// Extract metadata from an audio file using Symphonia.
+/// Extract metadata from an audio file.
+/// For MP3, falls back to the `id3` crate when Symphonia cannot probe the file
+/// (e.g., ID3 tag with large embedded cover art exceeds Symphonia's 1 MB probe limit).
 /// Must be called from a blocking context (spawn_blocking).
 pub fn extract(path: &Path) -> anyhow::Result<RawMetadata> {
+    match extract_via_symphonia(path) {
+        Ok(meta) => return Ok(meta),
+        Err(e) => {
+            let is_mp3 = path.extension().and_then(|e| e.to_str()).map(|e| e.eq_ignore_ascii_case("mp3")).unwrap_or(false);
+            if is_mp3 {
+                tracing::debug!(error = %e, "Symphonia failed on MP3, falling back to id3 crate");
+                return extract_mp3_via_id3(path);
+            }
+            return Err(e);
+        }
+    }
+}
+
+fn extract_via_symphonia(path: &Path) -> anyhow::Result<RawMetadata> {
    let file = std::fs::File::open(path)?;
    let mss = MediaSourceStream::new(Box::new(file), Default::default());

@@ -66,6 +82,25 @@ pub fn extract(path: &Path) -> anyhow::Result<RawMetadata> {
    Ok(meta)
 }

+/// Read MP3 tags via the `id3` crate. Duration is not available this way.
+fn extract_mp3_via_id3(path: &Path) -> anyhow::Result<RawMetadata> {
+    use id3::TagLike;
+
+    let tag = id3::Tag::read_from_path(path)
+        .map_err(|e| anyhow::anyhow!("id3 read failed: {}", e))?;
+
+    let mut meta = RawMetadata::default();
+    meta.title = tag.title().map(|s| fix_encoding(s.to_owned()));
+    meta.artist = tag.artist().map(|s| fix_encoding(s.to_owned()));
+    meta.album = tag.album().map(|s| fix_encoding(s.to_owned()));
+    meta.year = tag.year().and_then(|y| u32::try_from(y).ok());
+    meta.track_number = tag.track();
+    meta.genre = tag.genre().map(|s: &str| fix_encoding(s.to_owned()));
+    // duration_secs remains None — acceptable for large-cover files
+
+    Ok(meta)
+}
+
 fn extract_tags(tags: &[symphonia::core::meta::Tag], meta: &mut RawMetadata) {
    for tag in tags {
        let value = fix_encoding(tag.value.to_string());
@@ -188,8 +188,20 @@ async fn reprocess_pending(state: &Arc<AppState>) -> anyhow::Result<usize> {
                            }
                        }
                    } else {
-                        tracing::error!(id = %pt.id, "Source file missing: {:?}", source);
-                        db::update_pending_status(&state.pool, pt.id, "error", Some("Source file missing")).await?;
+                        // Source file is gone — check if already in library by hash
+                        let in_library: (bool,) = sqlx::query_as(
+                            "SELECT EXISTS(SELECT 1 FROM tracks WHERE file_hash = $1)"
+                        )
+                        .bind(&pt.file_hash)
+                        .fetch_one(&state.pool).await.unwrap_or((false,));
+
+                        if in_library.0 {
+                            tracing::info!(id = %pt.id, "Source missing but track already in library — merging");
+                            db::update_pending_status(&state.pool, pt.id, "merged", None).await?;
+                        } else {
+                            tracing::error!(id = %pt.id, "Source file missing: {:?}", source);
+                            db::update_pending_status(&state.pool, pt.id, "error", Some("Source file missing")).await?;
+                        }
                        continue;
                    };

@@ -113,32 +113,38 @@ fn build_user_message(
 }

 #[derive(Serialize)]
-struct OllamaRequest {
+struct ChatRequest {
    model: String,
-    messages: Vec<OllamaMessage>,
-    format: String,
+    messages: Vec<ChatMessage>,
+    response_format: ChatResponseFormat,
    stream: bool,
-    options: OllamaOptions,
+    temperature: f64,
 }

 #[derive(Serialize)]
-struct OllamaMessage {
+struct ChatMessage {
    role: String,
    content: String,
 }

 #[derive(Serialize)]
-struct OllamaOptions {
-    temperature: f64,
+struct ChatResponseFormat {
+    #[serde(rename = "type")]
+    kind: String,
 }

 #[derive(Deserialize)]
-struct OllamaResponse {
-    message: OllamaResponseMessage,
+struct ChatResponse {
+    choices: Vec<ChatChoice>,
 }

 #[derive(Deserialize)]
-struct OllamaResponseMessage {
+struct ChatChoice {
+    message: ChatResponseMessage,
+}
+
+#[derive(Deserialize)]
+struct ChatResponseMessage {
    content: String,
 }

@@ -153,25 +159,25 @@ pub async fn call_ollama(
        .timeout(std::time::Duration::from_secs(120))
        .build()?;

-    let request = OllamaRequest {
+    let request = ChatRequest {
        model: model.to_owned(),
        messages: vec![
-            OllamaMessage {
+            ChatMessage {
                role: "system".to_owned(),
                content: system_prompt.to_owned(),
            },
-            OllamaMessage {
+            ChatMessage {
                role: "user".to_owned(),
                content: user_message.to_owned(),
            },
        ],
-        format: "json".to_owned(),
+        response_format: ChatResponseFormat { kind: "json_object".to_owned() },
        stream: false,
-        options: OllamaOptions { temperature: 0.1 },
+        temperature: 0.1,
    };

-    let url = format!("{}/api/chat", base_url.trim_end_matches('/'));
-    tracing::info!(%url, model, prompt_len = user_message.len(), "Calling Ollama API...");
+    let url = format!("{}/v1/chat/completions", base_url.trim_end_matches('/'));
+    tracing::info!(%url, model, prompt_len = user_message.len(), "Calling LLM API...");

    let start = std::time::Instant::now();
    let mut req = client.post(&url).json(&request);
@@ -184,18 +190,25 @@ pub async fn call_ollama(
    if !resp.status().is_success() {
        let status = resp.status();
        let body = resp.text().await.unwrap_or_default();
-        tracing::error!(%status, body = &body[..body.len().min(500)], "Ollama API error");
-        anyhow::bail!("Ollama returned {}: {}", status, body);
+        tracing::error!(%status, body = &body[..body.len().min(500)], "LLM API error");
+        anyhow::bail!("LLM returned {}: {}", status, body);
    }

-    let ollama_resp: OllamaResponse = resp.json().await?;
+    let chat_resp: ChatResponse = resp.json().await?;
+    let content = chat_resp
+        .choices
+        .into_iter()
+        .next()
+        .ok_or_else(|| anyhow::anyhow!("LLM returned empty choices"))?
+        .message
+        .content;
    tracing::info!(
        elapsed_ms = elapsed.as_millis() as u64,
-        response_len = ollama_resp.message.content.len(),
-        "Ollama response received"
+        response_len = content.len(),
+        "LLM response received"
    );
-    tracing::debug!(raw_response = %ollama_resp.message.content, "LLM raw output");
-    Ok(ollama_resp.message.content)
+    tracing::debug!(raw_response = %content, "LLM raw output");
+    Ok(content)
 }

 /// Parse the LLM JSON response into NormalizedFields.
@@ -295,13 +295,14 @@ function renderFilterBar(s) {
  `;
 }

-function showTab(tab, btn) {
+function showTab(tab, btn, noHash) {
  currentTab = tab;
  document.querySelectorAll('nav button').forEach(b => b.classList.remove('active'));
  btn.classList.add('active');
  clearSelection();
  const pag = document.getElementById('lib-pagination');
  if (pag) pag.style.display = 'none';
+  if (!noHash) location.hash = tab;
  if (tab === 'queue') { loadQueue(); loadStats(); }
  else if (tab === 'artists') { libPage.artists = 0; renderLibSearchBar([{ label: 'Artist', key: 'q', tab: 'artists', value: libSearch.artists.q, placeholder: 'search artist…' }], ''); loadLibArtists(); }
  else if (tab === 'tracks')  { libPage.tracks = 0; renderLibSearchBar([{ label: 'Title', key: 'q', tab: 'tracks', value: libSearch.tracks.q, placeholder: 'search title…' }, { label: 'Artist', key: 'artist', tab: 'tracks', value: libSearch.tracks.artist, placeholder: 'search artist…' }, { label: 'Album', key: 'album', tab: 'tracks', value: libSearch.tracks.album, placeholder: 'search album…' }], ''); loadLibTracks(); }
@@ -312,7 +313,11 @@ function showTab(tab, btn) {
 // --- Queue ---
 async function loadQueue(status, keepSelection) {
  currentFilter = status;
-  if (!keepSelection) { clearSelection(); queueOffset = 0; }
+  if (!keepSelection) {
+    clearSelection();
+    queueOffset = 0;
+    location.hash = status ? 'queue/' + status : 'queue';
+  }
  const qs = `?${status ? 'status='+status+'&' : ''}limit=${queuePageSize+1}&offset=${queueOffset}`;
  const raw = await api(`/queue${qs}`) || [];
  const hasMore = raw.length > queuePageSize;
@@ -359,6 +364,9 @@ function renderQueue(hasMore) {
    const artist = it.norm_artist || it.raw_artist || '-';
    const title = it.norm_title || it.raw_title || '-';
    const album = it.norm_album || it.raw_album || '-';
+    const albumCoverUrl = (it.norm_album || it.raw_album) && (it.norm_artist || it.raw_artist)
+      ? `${API}/albums/cover-by-name?artist=${encodeURIComponent(it.norm_artist||it.raw_artist||'')}&name=${encodeURIComponent(it.norm_album||it.raw_album||'')}`
+      : null;
    const year = it.norm_year || it.raw_year || '';
    const tnum = it.norm_track_number || it.raw_track_number || '';
    const canApprove = it.status === 'review';
@@ -368,7 +376,7 @@ function renderQueue(hasMore) {
      <td><span class="status status-${it.status}">${it.status}</span></td>
      <td class="editable" ondblclick="inlineEdit(this,'${it.id}','norm_artist')" title="${esc(it.raw_artist||'')}">${esc(artist)}</td>
      <td class="editable" ondblclick="inlineEdit(this,'${it.id}','norm_title')" title="${esc(it.raw_title||'')}">${esc(title)}</td>
-      <td class="editable" ondblclick="inlineEdit(this,'${it.id}','norm_album')" title="${esc(it.raw_album||'')}">${esc(album)}</td>
+      <td class="editable" ondblclick="inlineEdit(this,'${it.id}','norm_album')" title="${esc(it.raw_album||'')}"><span style="display:inline-flex;align-items:center;gap:4px">${albumCoverUrl?`<img src="${albumCoverUrl}" style="width:20px;height:20px;border-radius:2px;object-fit:cover;flex-shrink:0" onerror="this.style.display='none'">`:''}${esc(album)}</span></td>
      <td>${year}</td>
      <td>${tnum}</td>
      <td>${conf}</td>
@@ -1163,6 +1171,37 @@ function openTrackEditForArtist(trackId, artistId) {
  openTrackEdit(trackId, () => openArtistForm(artistId));
 }

+// --- Album inline meta edit (from artist form) ---
+async function saveAlbumMeta(albumId, artistId) {
+  const name = document.getElementById(`alb-name-${albumId}`)?.value?.trim();
+  const yearRaw = document.getElementById(`alb-year-${albumId}`)?.value;
+  if (!name) return;
+  await api(`/albums/${albumId}/edit`, {
+    method: 'PUT',
+    headers: {'Content-Type':'application/json'},
+    body: JSON.stringify({ name, year: parseInt(yearRaw) || null, artist_id: artistId }),
+  });
+  // Update header display in place
+  const block = document.getElementById(`album-block-${albumId}`);
+  if (block) {
+    const nameSpan = block.querySelector('.ab-name');
+    if (nameSpan) nameSpan.textContent = name;
+    const yearSpan = block.querySelector('.ab-year');
+    if (yearSpan) yearSpan.textContent = yearRaw || '';
+  }
+}
+
+async function applyAlbumGenre(albumId) {
+  const genre = document.getElementById(`alb-genre-${albumId}`)?.value?.trim();
+  if (!genre) return;
+  await api(`/albums/${albumId}/genre`, {
+    method: 'PUT',
+    headers: {'Content-Type':'application/json'},
+    body: JSON.stringify({ genre }),
+  });
+  document.getElementById(`alb-genre-${albumId}`).value = '';
+}
+
 // --- Helpers ---
 function openModal() { document.getElementById('modalOverlay').classList.add('visible'); }
 function closeModal() { document.getElementById('modalOverlay').classList.remove('visible'); }
@@ -1495,7 +1534,20 @@ async function openArtistForm(id) {
        <button class="btn btn-edit" style="font-size:10px;padding:2px 6px" onclick="openTrackEditForArtist(${t.id},${id})">Edit</button>
        <button data-hidden="${t.hidden}" onclick="toggleTrackHidden(${t.id},this)">${t.hidden?'Show':'Hide'}</button>
      </div>`).join('');
-    body.innerHTML = tracks;
+    const albumMeta = `<div style="padding:8px 10px;border-bottom:1px solid var(--border);background:var(--bg-panel)">
+      <div style="display:flex;gap:6px;align-items:center;flex-wrap:wrap">
+        <input id="alb-name-${alb.id}" value="${esc(alb.name)}" placeholder="Album name"
+               style="flex:2;min-width:140px;background:var(--bg-card);border:1px solid var(--border);border-radius:4px;padding:4px 8px;color:var(--text);font-size:11px;font-family:inherit">
+        <input id="alb-year-${alb.id}" type="number" value="${alb.year??''}" placeholder="Year"
+               style="width:70px;background:var(--bg-card);border:1px solid var(--border);border-radius:4px;padding:4px 8px;color:var(--text);font-size:11px;font-family:inherit">
+        <button class="btn btn-primary" style="font-size:10px;padding:3px 10px" onclick="saveAlbumMeta(${alb.id},${id})">Save</button>
+        <span style="color:var(--border);user-select:none">|</span>
+        <input id="alb-genre-${alb.id}" placeholder="Apply genre to all tracks…"
+               style="flex:1;min-width:130px;background:var(--bg-card);border:1px solid var(--border);border-radius:4px;padding:4px 8px;color:var(--text);font-size:11px;font-family:inherit">
+        <button class="btn btn-edit" style="font-size:10px;padding:3px 10px" onclick="applyAlbumGenre(${alb.id})">Apply</button>
+      </div>
+    </div>`;
+    body.innerHTML = albumMeta + tracks;
    if (openAlbumBlocks.has(alb.id)) body.classList.add('open');
  }

@@ -1586,9 +1638,82 @@ async function removeAppearance(artistId, trackId, btn) {
  btn.closest('.appearance-row').remove();
 }

+// --- Cover preview ---
+(function() {
+  const box = document.createElement('div');
+  box.id = 'cover-preview';
+  box.style.cssText = [
+    'display:none', 'position:fixed', 'z-index:9999', 'pointer-events:none',
+    'border-radius:10px', 'overflow:hidden',
+    'box-shadow:0 12px 40px rgba(0,0,0,0.85)',
+    'border:1px solid rgba(255,255,255,0.08)',
+    'background:#0a0c12', 'transition:opacity 0.1s',
+  ].join(';');
+  const img = document.createElement('img');
+  img.style.cssText = 'display:block;width:280px;height:280px;object-fit:contain';
+  box.appendChild(img);
+  document.body.appendChild(box);
+
+  let showTimer = null;
+
+  function isCoverImg(el) {
+    return el && el.tagName === 'IMG' && el.src && el.src.includes('/cover');
+  }
+
+  function place(e) {
+    const margin = 16, pw = 280, ph = 280;
+    const vw = window.innerWidth, vh = window.innerHeight;
+    let x = e.clientX + margin, y = e.clientY + margin;
+    if (x + pw > vw - 8) x = e.clientX - pw - margin;
+    if (y + ph > vh - 8) y = e.clientY - ph - margin;
+    box.style.left = x + 'px';
+    box.style.top  = y + 'px';
+  }
+
+  document.addEventListener('mouseover', e => {
+    if (!isCoverImg(e.target)) return;
+    clearTimeout(showTimer);
+    showTimer = setTimeout(() => {
+      img.src = e.target.src;
+      box.style.display = 'block';
+      place(e);
+    }, 120);
+  });
+
+  document.addEventListener('mousemove', e => {
+    if (box.style.display === 'none') return;
+    if (!isCoverImg(e.target)) { clearTimeout(showTimer); box.style.display = 'none'; return; }
+    place(e);
+  });
+
+  document.addEventListener('mouseout', e => {
+    if (!isCoverImg(e.target)) return;
+    clearTimeout(showTimer);
+    box.style.display = 'none';
+  });
+})();
+
 // --- Init ---
+(function restoreFromHash() {
+  const hash = location.hash.slice(1); // strip #
+  if (!hash) return;
+  const [tab, filter] = hash.split('/');
+  const validTabs = ['queue','tracks','albums','artists','merges'];
+  if (!validTabs.includes(tab)) return;
+  const btn = Array.from(document.querySelectorAll('nav button'))
+    .find(b => (b.getAttribute('onclick') || '').includes(`'${tab}'`));
+  if (!btn) return;
+  // Switch tab without overwriting the hash
+  showTab(tab, btn, true);
+  // For queue, also restore the filter
+  if (tab === 'queue' && filter) {
+    currentFilter = filter;
+    loadQueue(filter);
+  }
+})();
+
 loadStats();
-loadQueue();
+if (currentTab === 'queue' && !location.hash.slice(1)) loadQueue();
 setInterval(loadStats, 5000);
 // Auto-refresh queue when on queue tab
 setInterval(() => { if (currentTab === 'queue') loadQueue(currentFilter, true); }, 5000);
@@ -528,6 +528,20 @@ pub async fn update_album_full(
    }
 }

+#[derive(Deserialize)]
+pub struct SetGenreBody { pub genre: String }
+
+pub async fn set_album_tracks_genre(
+    State(state): State<S>,
+    Path(id): Path<i64>,
+    Json(body): Json<SetGenreBody>,
+) -> impl IntoResponse {
+    match db::set_album_tracks_genre(&state.pool, id, &body.genre).await {
+        Ok(()) => StatusCode::NO_CONTENT.into_response(),
+        Err(e) => error_response(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
+    }
+}
+
 #[derive(Deserialize)]
 pub struct ReorderBody {
    pub orders: Vec<(i64, i32)>,
@@ -544,19 +558,82 @@ pub async fn reorder_album_tracks(
    }
 }

-pub async fn album_cover(State(state): State<S>, Path(id): Path<i64>) -> impl IntoResponse {
-    let cover = match db::get_album_cover(&state.pool, id).await {
-        Ok(Some(c)) => c,
-        Ok(None) => return StatusCode::NOT_FOUND.into_response(),
-        Err(e) => return error_response(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
+/// Cover by artist+album name — used for queue items that may not have an album_id yet.
+#[derive(Deserialize)]
+pub struct CoverByNameQuery {
+    #[serde(default)] pub artist: String,
+    #[serde(default)] pub name: String,
+}
+pub async fn album_cover_by_name(State(state): State<S>, Query(q): Query<CoverByNameQuery>) -> impl IntoResponse {
+    let album_id = match db::find_album_id(&state.pool, &q.artist, &q.name).await {
+        Ok(Some(id)) => id,
+        _ => return StatusCode::NOT_FOUND.into_response(),
    };
-    match tokio::fs::read(&cover.0).await {
-        Ok(bytes) => (
-            [(axum::http::header::CONTENT_TYPE, cover.1)],
-            bytes,
-        ).into_response(),
-        Err(_) => StatusCode::NOT_FOUND.into_response(),
+    album_cover_by_id(&state, album_id).await
+}
+
+pub async fn album_cover(State(state): State<S>, Path(id): Path<i64>) -> impl IntoResponse {
+    album_cover_by_id(&state, id).await
+}
+
+async fn album_cover_by_id(state: &super::AppState, id: i64) -> axum::response::Response {
+    // 1. Try album_images table
+    if let Ok(Some((file_path, mime_type))) = db::get_album_cover(&state.pool, id).await {
+        if let Ok(bytes) = tokio::fs::read(&file_path).await {
+            return ([(axum::http::header::CONTENT_TYPE, mime_type)], bytes).into_response();
+        }
    }
+
+    // 2. Fallback: extract embedded cover from first track in album
+    if let Ok(Some(track_path)) = db::get_album_first_track_path(&state.pool, id).await {
+        let path = std::path::PathBuf::from(track_path);
+        if path.exists() {
+            let result = tokio::task::spawn_blocking(move || extract_embedded_cover(&path)).await;
+            if let Ok(Some((bytes, mime))) = result {
+                return ([(axum::http::header::CONTENT_TYPE, mime)], bytes).into_response();
+            }
+        }
+    }
+
+    StatusCode::NOT_FOUND.into_response()
+}
+
+fn extract_embedded_cover(path: &std::path::Path) -> Option<(Vec<u8>, String)> {
+    use symphonia::core::{
+        formats::FormatOptions,
+        io::MediaSourceStream,
+        meta::MetadataOptions,
+        probe::Hint,
+    };
+
+    let file = std::fs::File::open(path).ok()?;
+    let mss = MediaSourceStream::new(Box::new(file), Default::default());
+
+    let mut hint = Hint::new();
+    if let Some(ext) = path.extension().and_then(|e| e.to_str()) {
+        hint.with_extension(ext);
+    }
+
+    let mut probed = symphonia::default::get_probe()
+        .format(
+            &hint,
+            mss,
+            &FormatOptions { enable_gapless: false, ..Default::default() },
+            &MetadataOptions::default(),
+        )
+        .ok()?;
+
+    if let Some(rev) = probed.metadata.get().as_ref().and_then(|m| m.current()) {
+        if let Some(v) = rev.visuals().first() {
+            return Some((v.data.to_vec(), v.media_type.clone()));
+        }
+    }
+    if let Some(rev) = probed.format.metadata().current() {
+        if let Some(v) = rev.visuals().first() {
+            return Some((v.data.to_vec(), v.media_type.clone()));
+        }
+    }
+    None
 }

 #[derive(Deserialize)]
@@ -41,10 +41,12 @@ pub fn build_router(state: Arc<AppState>) -> Router {
        .route("/tracks/:id", get(api::get_track).put(api::update_track))
        .route("/tracks/:id/hidden", put(api::set_track_hidden))
        .route("/albums/search", get(api::search_albums_for_artist))
+        .route("/albums/cover-by-name", get(api::album_cover_by_name))
        .route("/albums/:id/cover", get(api::album_cover))
        .route("/albums/:id/full", get(api::get_album_full))
        .route("/albums/:id/reorder", put(api::reorder_album_tracks))
        .route("/albums/:id/edit", put(api::update_album_full))
+        .route("/albums/:id/genre", put(api::set_album_tracks_genre))
        .route("/albums/:id/hidden", put(api::set_album_hidden))
        .route("/albums/:id/release_type", put(api::set_album_release_type))
        .route("/albums/:id", put(api::update_album))
@@ -1,2 +0,0 @@
-VITE_API_BASE_URL=http://localhost:8085
-VITE_API_KEY=
@@ -8,7 +8,6 @@
      "name": "client",
      "version": "0.0.0",
      "dependencies": {
-        "axios": "^1.7.9",
        "react": "^19.2.4",
        "react-dom": "^19.2.4"
      },
@@ -1288,23 +1287,6 @@
      "dev": true,
      "license": "Python-2.0"
    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "license": "MIT"
-    },
-    "node_modules/axios": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
-      "integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==",
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.15.11",
-        "form-data": "^4.0.5",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
    "node_modules/balanced-match": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1370,19 +1352,6 @@
        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
      }
    },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/callsites": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -1451,18 +1420,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "license": "MIT",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1524,15 +1481,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
    "node_modules/detect-libc": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
@@ -1543,20 +1491,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/electron-to-chromium": {
      "version": "1.5.321",
      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.321.tgz",
@@ -1564,51 +1498,6 @@
      "dev": true,
      "license": "ISC"
    },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/escalade": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -1906,42 +1795,6 @@
      "dev": true,
      "license": "ISC"
    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
    "node_modules/fsevents": {
      "version": "2.3.3",
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -1957,15 +1810,6 @@
        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
      }
    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/gensync": {
      "version": "1.0.0-beta.2",
      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -1976,43 +1820,6 @@
        "node": ">=6.9.0"
      }
    },
-    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/glob-parent": {
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -2039,18 +1846,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -2061,45 +1856,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/hermes-estree": {
      "version": "0.25.1",
      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
@@ -2569,36 +2325,6 @@
        "yallist": "^3.0.2"
      }
    },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
    "node_modules/minimatch": {
      "version": "3.1.5",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
@@ -2794,12 +2520,6 @@
        "node": ">= 0.8.0"
      }
    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
-    },
    "node_modules/punycode": {
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -10,7 +10,6 @@
    "preview": "vite preview"
  },
  "dependencies": {
-    "axios": "^1.7.9",
    "react": "^19.2.4",
    "react-dom": "^19.2.4"
  },
@@ -61,11 +61,12 @@ function App() {

  const loginUrl = `${apiBase}/api/login`
  const logoutUrl = `${apiBase}/api/logout`
+  const playerApiRoot = `${apiBase}/api`

  return (
    <>
      {!loading && (user || runWithoutAuth) ? (
-        <FurumiPlayer />
+        <FurumiPlayer apiRoot={playerApiRoot} />
      ) : (
        <main className="page">
          <section className="card">
@@ -1,23 +1,20 @@
 import { useEffect, useRef, useState, type MouseEvent as ReactMouseEvent } from 'react'
 import './furumi-player.css'
-import {
-  API_ROOT,
-  getArtists,
-  getArtistAlbums,
-  getAlbumTracks,
-  getArtistTracks,
-  searchTracks,
-  getTrackInfo,
-  preloadStream,
-} from './furumiApi'
-import { fmt } from './utils'
-import { Header } from './components/Header'
-import { MainPanel, type Crumb } from './components/MainPanel'
-import { PlayerBar } from './components/PlayerBar'
-import type { QueueItem } from './components/QueueList'
+import { createFurumiApiClient } from './furumiApi'
+import { SearchDropdown } from './components/SearchDropdown'
+import { Breadcrumbs } from './components/Breadcrumbs'
+import { LibraryList } from './components/LibraryList'
+import { QueueList, type QueueItem } from './components/QueueList'
+import { NowPlaying } from './components/NowPlaying'

-export function FurumiPlayer() {
-  const [breadcrumbs, setBreadcrumbs] = useState<Crumb[]>(
+type FurumiPlayerProps = {
+  apiRoot: string
+}
+
+type Crumb = { label: string; action?: () => void }
+
+export function FurumiPlayer({ apiRoot }: FurumiPlayerProps) {
+  const [breadcrumbs, setBreadcrumbs] = useState<Array<{ label: string; action?: () => void }>>(
    [],
  )
  const [libraryLoading, setLibraryLoading] = useState(false)
@@ -45,7 +42,6 @@ export function FurumiPlayer() {
  const [queueOrderView, setQueueOrderView] = useState<number[]>([])
  const [queuePlayingOrigIdxView, setQueuePlayingOrigIdxView] = useState<number>(-1)
  const [queueScrollSignal, setQueueScrollSignal] = useState(0)
-  const [queue, setQueue] = useState<QueueItem[]>([])

  const queueActionsRef = useRef<{
    playIndex: (i: number) => void
@@ -53,14 +49,12 @@ export function FurumiPlayer() {
    moveQueueItem: (fromPos: number, toPos: number) => void
  } | null>(null)

-  const audioRef = useRef<HTMLAudioElement>(null)
-
  useEffect(() => {
    // --- Original player script adapted for React environment ---
-    const audioEl = audioRef.current
-    if (!audioEl) return
-    const audio = audioEl
+    const audio = document.getElementById('audioEl') as HTMLAudioElement
+    if (!audio) return

+    let queue: QueueItem[] = []
    let queueIndex = -1
    let shuffle = false
    let repeatAll = true
@@ -112,12 +106,16 @@ export function FurumiPlayer() {
      nextTrack()
    })

+    // --- API helper ---
+    const API = apiRoot
+    const api = createFurumiApiClient(API)
+
    // --- Library navigation ---
    async function showArtists() {
      setBreadcrumb([{ label: 'Artists', action: showArtists }])
      setLibraryLoading(true)
      setLibraryError(null)
-      const artists = await getArtists()
+      const artists = await api('/artists')
      if (!artists) {
        setLibraryLoading(false)
        setLibraryError('Error')
@@ -143,7 +141,7 @@ export function FurumiPlayer() {
      ])
      setLibraryLoading(true)
      setLibraryError(null)
-      const albums = await getArtistAlbums(artistSlug)
+      const albums = await api('/artists/' + artistSlug + '/albums')
      if (!albums) {
        setLibraryLoading(false)
        setLibraryError('Error')
@@ -192,7 +190,7 @@ export function FurumiPlayer() {
      ])
      setLibraryLoading(true)
      setLibraryError(null)
-      const tracks = await getAlbumTracks(albumSlug)
+      const tracks = await api('/albums/' + albumSlug)
      if (!tracks) {
        setLibraryLoading(false)
        setLibraryError('Error')
@@ -254,7 +252,7 @@ export function FurumiPlayer() {
        if (playNow) playIndex(existing)
        return
      }
-      setQueue((q) => [...q, track]);
+      queue.push(track)
      updateQueueModel()
      if (playNow || (queueIndex === -1 && queue.length === 1)) {
        playIndex(queue.length - 1)
@@ -262,13 +260,19 @@ export function FurumiPlayer() {
    }

    async function addAlbumToQueue(albumSlug: string, playFirst?: boolean) {
-      const tracks = await getAlbumTracks(albumSlug)
+      const tracks = await api('/albums/' + albumSlug)
      if (!tracks || !(tracks as any[]).length) return
      const list = tracks as any[]
      let firstIdx = queue.length
      list.forEach((t) => {
        if (queue.find((q) => q.slug === t.slug)) return
-        setQueue((q) => [...q, t])
+        queue.push({
+          slug: t.slug,
+          title: t.title,
+          artist: t.artist_name,
+          album_slug: albumSlug,
+          duration: t.duration_secs,
+        })
      })
      updateQueueModel()
      if (playFirst || queueIndex === -1) playIndex(firstIdx)
@@ -276,7 +280,7 @@ export function FurumiPlayer() {
    }

    async function playAllArtistTracks(artistSlug: string) {
-      const tracks = await getArtistTracks(artistSlug)
+      const tracks = await api('/artists/' + artistSlug + '/tracks')
      if (!tracks || !(tracks as any[]).length) return
      const list = tracks as any[]
      clearQueue()
@@ -298,7 +302,7 @@ export function FurumiPlayer() {
      if (i < 0 || i >= queue.length) return
      queueIndex = i
      const track = queue[i]
-      audio.src = `${API_ROOT}/stream/${track.slug}`
+      audio.src = `${API}/stream/${track.slug}`
      void audio.play().catch(() => {})
      updateNowPlaying(track)
      updateQueueModel()
@@ -316,7 +320,7 @@ export function FurumiPlayer() {

      document.title = `${track.title} — Furumi`

-      const coverUrl = `${API_ROOT}/tracks/${track.slug}/cover`
+      const coverUrl = `${API}/tracks/${track.slug}/cover`
      if ('mediaSession' in navigator) {
        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
        navigator.mediaSession.metadata = new window.MediaMetadata({
@@ -351,7 +355,7 @@ export function FurumiPlayer() {

    function updateQueueModel() {
      const order = currentOrder()
-      setQueueItemsView(queue)
+      setQueueItemsView(queue.slice())
      setQueueOrderView(order.slice())
      setQueuePlayingOrigIdxView(queueIndex)
    }
@@ -365,10 +369,7 @@ export function FurumiPlayer() {
      } else if (queueIndex > idx) {
        queueIndex--
      }
-
-      // queue.splice(idx, 1)
-      setQueue((q) => q.filter((_, i) => i !== idx));
-
+      queue.splice(idx, 1)
      if (shuffle) {
        const si = shuffleOrder.indexOf(idx)
        if (si !== -1) shuffleOrder.splice(si, 1)
@@ -401,7 +402,7 @@ export function FurumiPlayer() {
    }

    function clearQueue() {
-      setQueue([]);
+      queue = []
      queueIndex = -1
      shuffleOrder = []
      audio.pause()
@@ -494,7 +495,7 @@ export function FurumiPlayer() {
        return
      }
      searchTimer = window.setTimeout(async () => {
-        const results = await searchTracks(q)
+        const results = await api('/search?q=' + encodeURIComponent(q))
        if (!results || !(results as any[]).length) {
          closeSearch()
          return
@@ -518,12 +519,27 @@ export function FurumiPlayer() {
          { slug, title: '', artist: '', album_slug: null, duration: null },
          true,
        )
-        void preloadStream(slug)
+        void api('/stream/' + slug).catch(() => null)
      }
    }
    searchSelectRef.current = onSearchSelect

    // --- Helpers ---
+    function fmt(secs: number) {
+      if (!secs || Number.isNaN(secs)) return '0:00'
+      const s = Math.floor(secs)
+      const m = Math.floor(s / 60)
+      const h = Math.floor(m / 60)
+      if (h > 0) {
+        return `${h}:${pad(m % 60)}:${pad(s % 60)}`
+      }
+      return `${m}:${pad(s % 60)}`
+    }
+
+    function pad(n: number) {
+      return String(n).padStart(2, '0')
+    }
+
    function showToast(msg: string) {
      const t = document.getElementById('toast')
      if (!t) return
@@ -609,7 +625,7 @@ export function FurumiPlayer() {
      const url = new URL(window.location.href)
      const urlSlug = url.searchParams.get('t')
      if (urlSlug) {
-        const info = await getTrackInfo(urlSlug)
+        const info = await api('/tracks/' + urlSlug)
        if (info) {
          addTrackToQueue(
            {
@@ -631,38 +647,120 @@ export function FurumiPlayer() {
      queueActionsRef.current = null
      audio.pause()
    }
-  }, [])
+  }, [apiRoot])

  return (
    <div className="furumi-root">
-      <Header
-        searchOpen={searchOpen}
-        searchResults={searchResults}
-        onSearchSelect={(type, slug) => searchSelectRef.current(type, slug)}
-      />
+      <header className="header">
+        <div className="header-logo">
+          <button className="btn-menu">&#9776;</button>
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
+            <circle cx="9" cy="18" r="3" />
+            <circle cx="18" cy="15" r="3" />
+            <path d="M12 18V6l9-3v3" />
+          </svg>
+          Furumi
+          <span className="header-version">v</span>
+        </div>
+        <div style={{ display: 'flex', alignItems: 'center', gap: '1rem' }}>
+          <div className="search-wrap">
+            <input id="searchInput" placeholder="Search..." />
+            <SearchDropdown
+              isOpen={searchOpen}
+              results={searchResults}
+              onSelect={(type, slug) => searchSelectRef.current(type, slug)}
+            />
+          </div>
+        </div>
+      </header>

-      <MainPanel
-        breadcrumbs={breadcrumbs}
-        libraryLoading={libraryLoading}
-        libraryError={libraryError}
-        libraryItems={libraryItems}
-        queueItemsView={queueItemsView}
-        queueOrderView={queueOrderView}
-        queuePlayingOrigIdxView={queuePlayingOrigIdxView}
-        queueScrollSignal={queueScrollSignal}
-        onQueuePlay={(origIdx) => queueActionsRef.current?.playIndex(origIdx)}
-        onQueueRemove={(origIdx) =>
-          queueActionsRef.current?.removeFromQueue(origIdx)
-        }
-        onQueueMove={(fromPos, toPos) =>
-          queueActionsRef.current?.moveQueueItem(fromPos, toPos)
-        }
-      />
+      <div className="main">
+        <div className="sidebar-overlay" id="sidebarOverlay" />
+        <aside className="sidebar" id="sidebar">
+          <div className="sidebar-header">Library</div>
+          <Breadcrumbs items={breadcrumbs} />
+          <div className="file-list" id="fileList">
+            <LibraryList loading={libraryLoading} error={libraryError} items={libraryItems} />
+          </div>
+        </aside>

-      <PlayerBar track={nowPlayingTrack} />
+        <section className="queue-panel">
+          <div className="queue-header">
+            <span>Queue</span>
+            <div className="queue-actions">
+              <button className="queue-btn active" id="btnShuffle">
+                Shuffle
+              </button>
+              <button className="queue-btn active" id="btnRepeat">
+                Repeat
+              </button>
+              <button className="queue-btn" id="btnClearQueue">
+                Clear
+              </button>
+            </div>
+          </div>
+          <div className="queue-list" id="queueList">
+            <QueueList
+              apiRoot={apiRoot}
+              queue={queueItemsView}
+              order={queueOrderView}
+              playingOrigIdx={queuePlayingOrigIdxView}
+              scrollSignal={queueScrollSignal}
+              onPlay={(origIdx) => queueActionsRef.current?.playIndex(origIdx)}
+              onRemove={(origIdx) =>
+                queueActionsRef.current?.removeFromQueue(origIdx)
+              }
+              onMove={(fromPos, toPos) =>
+                queueActionsRef.current?.moveQueueItem(fromPos, toPos)
+              }
+            />
+          </div>
+        </section>
+      </div>
+
+      <div className="player-bar">
+        <NowPlaying apiRoot={apiRoot} track={nowPlayingTrack} />
+        <div className="controls">
+          <div className="ctrl-btns">
+            <button className="ctrl-btn" id="btnPrev">
+              &#9198;
+            </button>
+            <button className="ctrl-btn ctrl-btn-main" id="btnPlayPause">
+              &#9654;
+            </button>
+            <button className="ctrl-btn" id="btnNext">
+              &#9197;
+            </button>
+          </div>
+          <div className="progress-row">
+            <span className="time" id="timeElapsed">
+              0:00
+            </span>
+            <div className="progress-bar" id="progressBar">
+              <div className="progress-fill" id="progressFill" style={{ width: '0%' }} />
+            </div>
+            <span className="time" id="timeDuration">
+              0:00
+            </span>
+          </div>
+        </div>
+        <div className="volume-row">
+          <span className="vol-icon" id="volIcon">
+            &#128266;
+          </span>
+          <input
+            type="range"
+            className="volume-slider"
+            id="volSlider"
+            min={0}
+            max={100}
+            defaultValue={80}
+          />
+        </div>
+      </div>

      <div className="toast" id="toast" />
-      <audio ref={audioRef} />
+      <audio id="audioEl" />
    </div>
  )
 }
@@ -1,45 +0,0 @@
-import { SearchDropdown } from './SearchDropdown'
-
-type SearchResultItem = {
-  result_type: string
-  slug: string
-  name: string
-  detail?: string
-}
-
-type HeaderProps = {
-  searchOpen: boolean
-  searchResults: SearchResultItem[]
-  onSearchSelect: (type: string, slug: string) => void
-}
-
-export function Header({
-  searchOpen,
-  searchResults,
-  onSearchSelect,
-}: HeaderProps) {
-  return (
-    <header className="header">
-      <div className="header-logo">
-        <button className="btn-menu">&#9776;</button>
-        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
-          <circle cx="9" cy="18" r="3" />
-          <circle cx="18" cy="15" r="3" />
-          <path d="M12 18V6l9-3v3" />
-        </svg>
-        Furumi
-        <span className="header-version">v</span>
-      </div>
-      <div style={{ display: 'flex', alignItems: 'center', gap: '1rem' }}>
-        <div className="search-wrap">
-          <input id="searchInput" placeholder="Search..." />
-          <SearchDropdown
-            isOpen={searchOpen}
-            results={searchResults}
-            onSelect={onSearchSelect}
-          />
-        </div>
-      </div>
-    </header>
-  )
-}
@@ -1,86 +0,0 @@
-import type { MouseEvent as ReactMouseEvent } from 'react'
-import { Breadcrumbs } from './Breadcrumbs'
-import { LibraryList } from './LibraryList'
-import { QueueList, type QueueItem } from './QueueList'
-
-export type Crumb = { label: string; action?: () => void }
-
-export type LibraryListItem = {
-  key: string
-  className: string
-  icon: string
-  name: string
-  detail?: string
-  nameClassName?: string
-  onClick: () => void
-  button?: { title: string; onClick: (ev: ReactMouseEvent<HTMLButtonElement>) => void }
-}
-
-type MainPanelProps = {
-  breadcrumbs: Crumb[]
-  libraryLoading: boolean
-  libraryError: string | null
-  libraryItems: LibraryListItem[]
-  queueItemsView: QueueItem[]
-  queueOrderView: number[]
-  queuePlayingOrigIdxView: number
-  queueScrollSignal: number
-  onQueuePlay: (origIdx: number) => void
-  onQueueRemove: (origIdx: number) => void
-  onQueueMove: (fromPos: number, toPos: number) => void
-}
-
-export function MainPanel({
-  breadcrumbs,
-  libraryLoading,
-  libraryError,
-  libraryItems,
-  queueItemsView,
-  queueOrderView,
-  queuePlayingOrigIdxView,
-  queueScrollSignal,
-  onQueuePlay,
-  onQueueRemove,
-  onQueueMove,
-}: MainPanelProps) {
-  return (
-    <div className="main">
-      <div className="sidebar-overlay" id="sidebarOverlay" />
-      <aside className="sidebar" id="sidebar">
-        <div className="sidebar-header">Library</div>
-        <Breadcrumbs items={breadcrumbs} />
-        <div className="file-list" id="fileList">
-          <LibraryList loading={libraryLoading} error={libraryError} items={libraryItems} />
-        </div>
-      </aside>
-
-      <section className="queue-panel">
-        <div className="queue-header">
-          <span>Queue</span>
-          <div className="queue-actions">
-            <button className="queue-btn active" id="btnShuffle">
-              Shuffle
-            </button>
-            <button className="queue-btn active" id="btnRepeat">
-              Repeat
-            </button>
-            <button className="queue-btn" id="btnClearQueue">
-              Clear
-            </button>
-          </div>
-        </div>
-        <div className="queue-list" id="queueList">
-          <QueueList
-            queue={queueItemsView}
-            order={queueOrderView}
-            playingOrigIdx={queuePlayingOrigIdxView}
-            scrollSignal={queueScrollSignal}
-            onPlay={onQueuePlay}
-            onRemove={onQueueRemove}
-            onMove={onQueueMove}
-          />
-        </div>
-      </section>
-    </div>
-  )
-}
@@ -1,5 +1,4 @@
 import { useEffect, useState } from 'react'
-import { API_ROOT } from '../furumiApi'
 import type { QueueItem } from './QueueList'

 function Cover({ src }: { src: string }) {
@@ -13,7 +12,7 @@ function Cover({ src }: { src: string }) {
  return <img src={src} alt="" onError={() => setErrored(true)} />
 }

-export function NowPlaying({ track }: { track: QueueItem | null }) {
+export function NowPlaying({ apiRoot, track }: { apiRoot: string; track: QueueItem | null }) {
  if (!track) {
    return (
      <div className="np-info">
@@ -32,7 +31,7 @@ export function NowPlaying({ track }: { track: QueueItem | null }) {
    )
  }

-  const coverUrl = `${API_ROOT}/tracks/${track.slug}/cover`
+  const coverUrl = `${apiRoot}/tracks/${track.slug}/cover`

  return (
    <div className="np-info">
@@ -1,47 +0,0 @@
-import { NowPlaying } from './NowPlaying'
-import type { QueueItem } from './QueueList'
-
-export function PlayerBar({ track }: { track: QueueItem | null }) {
-  return (
-    <div className="player-bar">
-      <NowPlaying track={track} />
-      <div className="controls">
-        <div className="ctrl-btns">
-          <button className="ctrl-btn" id="btnPrev">
-            &#9198;
-          </button>
-          <button className="ctrl-btn ctrl-btn-main" id="btnPlayPause">
-            &#9654;
-          </button>
-          <button className="ctrl-btn" id="btnNext">
-            &#9197;
-          </button>
-        </div>
-        <div className="progress-row">
-          <span className="time" id="timeElapsed">
-            0:00
-          </span>
-          <div className="progress-bar" id="progressBar">
-            <div className="progress-fill" id="progressFill" style={{ width: '0%' }} />
-          </div>
-          <span className="time" id="timeDuration">
-            0:00
-          </span>
-        </div>
-      </div>
-      <div className="volume-row">
-        <span className="vol-icon" id="volIcon">
-          &#128266;
-        </span>
-        <input
-          type="range"
-          className="volume-slider"
-          id="volSlider"
-          min={0}
-          max={100}
-          defaultValue={80}
-        />
-      </div>
-    </div>
-  )
-}
@@ -1,5 +1,4 @@
 import { useEffect, useRef, useState } from 'react'
-import { API_ROOT } from '../furumiApi'

 export type QueueItem = {
  slug: string
@@ -10,6 +9,7 @@ export type QueueItem = {
 }

 type QueueListProps = {
+  apiRoot: string
  queue: QueueItem[]
  order: number[]
  playingOrigIdx: number
@@ -43,6 +43,7 @@ function Cover({ src }: { src: string }) {
 }

 export function QueueList({
+  apiRoot,
  queue,
  order,
  playingOrigIdx,
@@ -77,7 +78,7 @@ export function QueueList({
        if (!t) return null

        const isPlaying = origIdx === playingOrigIdx
-        const coverSrc = t.album_slug ? `${API_ROOT}/tracks/${t.slug}/cover` : ''
+        const coverSrc = t.album_slug ? `${apiRoot}/tracks/${t.slug}/cover` : ''
        const dur = t.duration ? fmt(t.duration) : ''
        const isDragging = draggingPos === pos
        const isDragOver = dragOverPos === pos
@@ -1,46 +1,12 @@
-import axios from 'axios'
+export type FurumiApiClient = (path: string) => Promise<unknown | null>

-const API_BASE = import.meta.env.VITE_API_BASE_URL ?? ''
-export const API_ROOT = `${API_BASE}/api`
+export function createFurumiApiClient(apiRoot: string): FurumiApiClient {
+  const API = apiRoot

-const apiKey = import.meta.env.VITE_API_KEY
-
-export const furumiApi = axios.create({
-  baseURL: API_ROOT,
-  headers: apiKey ? { 'x-api-key': apiKey } : {},
-})
-
-export async function getArtists() {
-  const res = await furumiApi.get('/artists').catch(() => null)
-  return res?.data ?? null
-}
-
-export async function getArtistAlbums(artistSlug: string) {
-  const res = await furumiApi.get(`/artists/${artistSlug}/albums`).catch(() => null)
-  return res?.data ?? null
-}
-
-export async function getAlbumTracks(albumSlug: string) {
-  const res = await furumiApi.get(`/albums/${albumSlug}`).catch(() => null)
-  return res?.data ?? null
-}
-
-export async function getArtistTracks(artistSlug: string) {
-  const res = await furumiApi.get(`/artists/${artistSlug}/tracks`).catch(() => null)
-  return res?.data ?? null
-}
-
-export async function searchTracks(query: string) {
-  const res = await furumiApi.get(`/search?q=${encodeURIComponent(query)}`).catch(() => null)
-  return res?.data ?? null
-}
-
-export async function getTrackInfo(trackSlug: string) {
-  const res = await furumiApi.get(`/tracks/${trackSlug}`).catch(() => null)
-  return res?.data ?? null
-}
-
-export async function preloadStream(trackSlug: string) {
-  await furumiApi.get(`/stream/${trackSlug}`).catch(() => null)
+  return async function api(path: string) {
+    const r = await fetch(API + path)
+    if (!r.ok) return null
+    return r.json()
+  }
 }

@@ -1,14 +0,0 @@
-function pad(n: number) {
-  return String(n).padStart(2, '0')
-}
-
-export function fmt(secs: number) {
-  if (!secs || Number.isNaN(secs)) return '0:00'
-  const s = Math.floor(secs)
-  const m = Math.floor(s / 60)
-  const h = Math.floor(m / 60)
-  if (h > 0) {
-    return `${h}:${pad(m % 60)}:${pad(s % 60)}`
-  }
-  return `${m}:${pad(s % 60)}`
-}
@@ -25,4 +25,3 @@ base64 = "0.22"
 rand = "0.8"
 urlencoding = "2.1.3"
 rustls = { version = "0.23", features = ["ring"] }
-tower-http = { version = "0.6", features = ["cors"] }
@@ -39,10 +39,6 @@ struct Args {
    /// OIDC Session Secret (32+ chars, for HMAC). Random if not provided.
    #[arg(long, env = "FURUMI_PLAYER_OIDC_SESSION_SECRET")]
    oidc_session_secret: Option<String>,
-
-    /// API key for x-api-key header auth (alternative to OIDC session)
-    #[arg(long, env = "FURUMI_PLAYER_API_KEY")]
-    api_key: Option<String>,
 }

 #[tokio::main]
@@ -94,15 +90,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
        std::process::exit(1);
    });

-    if args.api_key.is_some() {
-        tracing::info!("x-api-key auth: enabled");
-    }
-
    let state = Arc::new(web::AppState {
        pool,
        storage_dir: Arc::new(args.storage_dir),
        oidc: oidc_state,
-        api_key: args.api_key,
    });

    tracing::info!("Web player: http://{}", bind_addr);
@@ -5,8 +5,6 @@ use axum::{
    middleware::Next,
    response::{Html, IntoResponse, Redirect, Response},
 };
-
-const X_API_KEY: &str = "x-api-key";
 use openidconnect::{
    core::{CoreClient, CoreProviderMetadata, CoreResponseType},
    reqwest::async_http_client,
@@ -94,51 +92,37 @@ fn verify_sso_cookie(secret: &[u8], cookie_val: &str) -> Option<String> {
    }
 }

-/// Auth middleware: requires valid SSO session cookie or x-api-key header.
+/// Auth middleware: requires valid SSO session cookie.
 pub async fn require_auth(
    State(state): State<Arc<AppState>>,
    req: Request,
    next: Next,
 ) -> Response {
-    // 1. Check x-api-key header (if configured)
-    if let Some(ref expected) = state.api_key {
-        if let Some(val) = req
-            .headers()
-            .get(X_API_KEY)
-            .and_then(|v| v.to_str().ok())
-        {
-            if val == expected {
+    let oidc = match &state.oidc {
+        Some(o) => o,
+        None => return next.run(req).await, // No OIDC configured = no auth
+    };
+
+    let cookies = req
+        .headers()
+        .get(header::COOKIE)
+        .and_then(|v| v.to_str().ok())
+        .unwrap_or("");
+
+    for c in cookies.split(';') {
+        let c = c.trim();
+        if let Some(val) = c.strip_prefix(&format!("{}=", SESSION_COOKIE)) {
+            if verify_sso_cookie(&oidc.session_secret, val).is_some() {
                return next.run(req).await;
            }
        }
    }

-    // 2. Check SSO session cookie (if OIDC configured)
-    if let Some(ref oidc) = state.oidc {
-        let cookies = req
-            .headers()
-            .get(header::COOKIE)
-            .and_then(|v| v.to_str().ok())
-            .unwrap_or("");
-
-        for c in cookies.split(';') {
-            let c = c.trim();
-            if let Some(val) = c.strip_prefix(&format!("{}=", SESSION_COOKIE)) {
-                if verify_sso_cookie(&oidc.session_secret, val).is_some() {
-                    return next.run(req).await;
-                }
-            }
-        }
-    }
-
    let uri = req.uri().to_string();
    if uri.starts_with("/api/") {
        (StatusCode::UNAUTHORIZED, "Unauthorized").into_response()
-    } else if state.oidc.is_some() {
-        Redirect::to("/login").into_response()
    } else {
-        // Only API key configured — no web login available
-        (StatusCode::UNAUTHORIZED, "Unauthorized").into_response()
+        Redirect::to("/login").into_response()
    }
 }

@@ -3,12 +3,9 @@ pub mod auth;

 use std::sync::Arc;
 use std::path::PathBuf;
-use std::time::Duration;

 use axum::{Router, routing::get, middleware};
-use axum::http::{header, Method};
 use sqlx::PgPool;
-use tower_http::cors::{Any, CorsLayer};

 #[derive(Clone)]
 pub struct AppState {
@@ -16,7 +13,6 @@ pub struct AppState {
    #[allow(dead_code)]
    pub storage_dir: Arc<PathBuf>,
    pub oidc: Option<Arc<auth::OidcState>>,
-    pub api_key: Option<String>,
 }

 pub fn build_router(state: Arc<AppState>) -> Router {
@@ -36,28 +32,21 @@ pub fn build_router(state: Arc<AppState>) -> Router {
        .route("/", get(player_html))
        .nest("/api", library);

-    let requires_auth = state.oidc.is_some();
+    let has_oidc = state.oidc.is_some();

-    let app = if requires_auth {
+    let app = if has_oidc {
        authed
            .route_layer(middleware::from_fn_with_state(state.clone(), auth::require_auth))
    } else {
        authed
    };

-    let cors = CorsLayer::new()
-        .allow_origin(Any)
-        .allow_methods([Method::GET, Method::OPTIONS, Method::HEAD])
-        .allow_headers([header::ACCEPT, header::CONTENT_TYPE, header::HeaderName::from_static("x-api-key")])
-        .max_age(Duration::from_secs(600));
-
    Router::new()
        .route("/login", get(auth::login_page))
        .route("/logout", get(auth::logout))
        .route("/auth/login", get(auth::oidc_login))
        .route("/auth/callback", get(auth::oidc_callback))
        .merge(app)
-        .layer(cors)
        .with_state(state)
 }
Author	SHA1	Message	Date
ab	761306eb9d	Fixed openai api endpoint Publish Metadata Agent Image / build-and-push-image (push) Successful in 3m40s Details Publish Web Player Image / build-and-push-image (push) Successful in 3m45s Details	2026-04-07 19:35:24 +01:00
ab	e85ed32b7b	Merge pull request 'Fix source-missing auto-merge and remove Pink Floyd examples from prompts' (#6 ) from DEV into main Publish Metadata Agent Image / build-and-push-image (push) Successful in 1m11s Details Publish Web Player Image / build-and-push-image (push) Successful in 1m15s Details Reviewed-on: #6	2026-03-20 01:07:15 +00:00
ab	71d5a38f21	Fix source-missing auto-merge and remove Pink Floyd examples from prompts Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 1m10s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 1m10s Details Auto-merge: when ingest pipeline detects "source file missing", now checks if the track already exists in the library by file_hash. If so, marks the pending entry as 'merged' instead of 'error' — avoiding stale error entries for files that were already successfully ingested in a previous run. Prompts: replaced Pink Floyd/The Wall/Have a Cigar examples in both normalize.txt and merge.txt with Deep Purple examples. The LLM was using these famous artist/album/track names as fallback output when raw metadata was empty or ambiguous, causing hallucinated metadata like "artist: Pink Floyd, title: Have a Cigar" for completely unrelated tracks. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>	2026-03-20 01:05:22 +00:00
ab	e34440498c	Merge pull request 'Disabled obsolete CI' (#5 ) from DEV into main Publish Metadata Agent Image / build-and-push-image (push) Successful in 1m17s Details Publish Web Player Image / build-and-push-image (push) Successful in 1m15s Details Reviewed-on: #5	2026-03-20 00:49:45 +00:00
ab	8d70a5133a	Disabled obsolete CI Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 1m17s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 1m14s Details	2026-03-20 00:49:27 +00:00
ab	f873542d02	Merge pull request 'DEV' (#4 ) from DEV into main Publish Metadata Agent Image / build-and-push-image (push) Failing after 10s Details Publish Web Player Image / build-and-push-image (push) Failing after 10s Details Reviewed-on: #4	2026-03-20 00:02:49 +00:00
ab	56760be586	Disabled obsolete CI Publish Metadata Agent Image (dev) / build-and-push-image (push) Failing after 10s Details Publish Web Player Image (dev) / build-and-push-image (push) Failing after 9s Details	2026-03-20 00:01:30 +00:00
ab	108c374c6d	ci: update Dockerfile paths after moving to docker/ directory Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>	2026-03-20 00:00:42 +00:00
ab	2129dc8007	Merge pull request 'feat: added express + vite app + oidc' (#1 ) from feature/node-app into DEV Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 1m18s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 1m25s Details Publish Server Image / build-and-push-image (push) Successful in 2m56s Details Reviewed-on: #1	2026-03-19 23:44:29 +00:00
ab	3f2013e9d5	Merge pull request 'Fix phantom duplicate tracks created on Merged file ingestion' (#3 ) from DEV into main Publish Metadata Agent Image / build-and-push-image (push) Successful in 1m47s Details Publish Web Player Image / build-and-push-image (push) Successful in 1m41s Details Publish Server Image / build-and-push-image (push) Successful in 3m1s Details Reviewed-on: #3	2026-03-19 23:43:36 +00:00
ab	cc3ef04cbe	Fix phantom duplicate tracks created on Merged file ingestion Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 1m16s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 1m10s Details Publish Server Image / build-and-push-image (push) Successful in 2m36s Details When the mover returns MoveOutcome::Merged (destination already exists, source deleted), approve_and_finalize was checking only file_hash to detect duplicates. Since the second ingestion had a different hash (different quality/mastering), it bypassed the check and created a phantom track record pointing to an existing storage_path with the wrong hash (of the now-deleted source file). Added a second dedup check by storage_path: if a non-hidden track already exists at that path, mark pending as 'merged' instead of inserting a new track row. This prevents phantom entries for any subsequent ingestion of a different-quality version of an already stored file. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>	2026-03-19 23:37:33 +00:00
ab	7ede23ff94	Merge pull request 'Improved admin UI' (#2 ) from DEV into main Publish Metadata Agent Image / build-and-push-image (push) Successful in 1m14s Details Publish Web Player Image / build-and-push-image (push) Successful in 1m16s Details Publish Server Image / build-and-push-image (push) Successful in 2m20s Details Reviewed-on: #2	2026-03-19 15:33:26 +00:00
ab	a730ab568c	Improved admin UI Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 1m6s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 1m7s Details Publish Server Image / build-and-push-image (push) Successful in 2m13s Details	2026-03-19 15:28:25 +00:00