Merge pull request 'fix(android/resilience): auto-recover failed loads on reconnect' (#106 ) from dev into main

Merge pull request 'M9 diagnostics follow-ups: playback relabel, sort, connected fix, per-skip + track-identity' (#105 ) from dev into main
Merge pull request 'M9 — Device diagnostics & debug reporting (connectivity + UPnP desync)' (#104 ) from dev into main
2026-07-02 16:45:13 -04:00 · 2026-06-30 19:19:15 -04:00 · 2026-06-29 19:24:16 -04:00 · 2026-06-20 20:57:39 -04:00 · 2026-06-20 11:40:56 -04:00 · 2026-06-20 10:58:07 -04:00
149 changed files with 945 additions and 12056 deletions
@@ -1,48 +0,0 @@
-package com.fabledsword.minstrel.admin.data
-
-import com.fabledsword.minstrel.api.endpoints.AdminTagSourcesApi
-import com.fabledsword.minstrel.api.endpoints.UpdateTagSourceBody
-import com.fabledsword.minstrel.models.AdminTagSourceRef
-import com.fabledsword.minstrel.models.TagSourceTestResult
-import com.fabledsword.minstrel.models.wire.AdminTagSourceWire
-import com.fabledsword.minstrel.models.wire.TestTagSourceWire
-import retrofit2.Retrofit
-import retrofit2.create
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * Read-through accessor for the tag-enrichment provider settings (#1521).
- * No Room caching — admin settings are infrequent point-and-shoot edits;
- * mutations fire direct REST and the ViewModel reconciles on failure.
- * Exceptions propagate to the ViewModel (which maps them via ErrorCopy).
- */
-@Singleton
-class AdminTagSourcesRepository @Inject constructor(
-    retrofit: Retrofit,
-) {
-    private val api: AdminTagSourcesApi = retrofit.create()
-
-    suspend fun list(): List<AdminTagSourceRef> = api.list().providers.map { it.toDomain() }
-
-    suspend fun setEnabled(id: String, enabled: Boolean): AdminTagSourceRef =
-        api.update(id, UpdateTagSourceBody(enabled = enabled)).toDomain()
-
-    suspend fun setApiKey(id: String, apiKey: String): AdminTagSourceRef =
-        api.update(id, UpdateTagSourceBody(apiKey = apiKey)).toDomain()
-
-    suspend fun test(id: String): TagSourceTestResult = api.test(id).toResult()
-}
-
-private fun AdminTagSourceWire.toDomain(): AdminTagSourceRef = AdminTagSourceRef(
-    id = id,
-    displayName = displayName,
-    requiresApiKey = requiresApiKey,
-    supports = supports,
-    enabled = enabled,
-    apiKeySet = apiKeySet,
-    testable = testable,
-)
-
-private fun TestTagSourceWire.toResult(): TagSourceTestResult =
-    TagSourceTestResult(ok = ok, durationMs = durationMs, error = error)
@@ -28,18 +28,15 @@ import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavHostController
 import com.composables.icons.lucide.Inbox
 import com.composables.icons.lucide.Lucide
-import com.composables.icons.lucide.Music
 import com.composables.icons.lucide.TriangleAlert
 import com.composables.icons.lucide.Users
 import com.fabledsword.minstrel.admin.data.AdminQuarantineRepository
 import com.fabledsword.minstrel.admin.data.AdminRequestsRepository
-import com.fabledsword.minstrel.admin.data.AdminTagSourcesRepository
 import com.fabledsword.minstrel.admin.data.AdminUsersRepository
 import com.fabledsword.minstrel.api.ErrorCopy
 import com.fabledsword.minstrel.nav.Admin
 import com.fabledsword.minstrel.nav.AdminQuarantine
 import com.fabledsword.minstrel.nav.AdminRequests
-import com.fabledsword.minstrel.nav.AdminTagSources
 import com.fabledsword.minstrel.nav.AdminUsers
 import com.fabledsword.minstrel.shared.widgets.EmptyState
 import com.fabledsword.minstrel.shared.widgets.LoadingCentered
@@ -57,7 +54,7 @@ import javax.inject.Inject

 // ─── State ───────────────────────────────────────────────────────────

-data class AdminCounts(val requests: Int, val quarantine: Int, val users: Int, val tagSources: Int)
+data class AdminCounts(val requests: Int, val quarantine: Int, val users: Int)

 sealed interface AdminLandingUiState {
    data object Loading : AdminLandingUiState
@@ -72,7 +69,6 @@ class AdminLandingViewModel @Inject constructor(
    private val requestsRepo: AdminRequestsRepository,
    private val quarantineRepo: AdminQuarantineRepository,
    private val usersRepo: AdminUsersRepository,
-    private val tagSourcesRepo: AdminTagSourcesRepository,
 ) : ViewModel() {

    private val internal = MutableStateFlow<AdminLandingUiState>(AdminLandingUiState.Loading)
@@ -89,8 +85,7 @@ class AdminLandingViewModel @Inject constructor(
                val req = async { requestsRepo.list().size }
                val qua = async { quarantineRepo.list().size }
                val usr = async { usersRepo.list().size }
-                val tag = async { tagSourcesRepo.list().count { it.enabled } }
-                AdminCounts(req.await(), qua.await(), usr.await(), tag.await())
+                AdminCounts(req.await(), qua.await(), usr.await())
            }
            internal.value = AdminLandingUiState.Success(counts)
        } catch (
@@ -175,15 +170,6 @@ private fun SectionList(counts: AdminCounts, navController: NavHostController) {
                onClick = { navController.navigate(AdminUsers) },
            )
        }
-        item {
-            SectionCard(
-                icon = Lucide.Music,
-                title = "Tag sources",
-                subtitle = "Metadata enrichment providers",
-                count = counts.tagSources,
-                onClick = { navController.navigate(AdminTagSources) },
-            )
-        }
    }
 }

@@ -1,220 +0,0 @@
-package com.fabledsword.minstrel.admin.ui
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Button
-import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavHostController
-import com.fabledsword.minstrel.models.AdminTagSourceRef
-import com.fabledsword.minstrel.models.TagSourceTestResult
-import com.fabledsword.minstrel.nav.AdminTagSources
-import com.fabledsword.minstrel.shared.widgets.EmptyState
-import com.fabledsword.minstrel.shared.widgets.ErrorRetry
-import com.fabledsword.minstrel.shared.widgets.LoadingCentered
-import com.fabledsword.minstrel.shared.widgets.MinstrelTopAppBar
-import com.fabledsword.minstrel.shared.widgets.PullToRefreshScaffold
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AdminTagSourcesScreen(
-    navController: NavHostController,
-    viewModel: AdminTagSourcesViewModel = hiltViewModel(),
-) {
-    val state by viewModel.uiState.collectAsStateWithLifecycle()
-    Scaffold(
-        modifier = Modifier.fillMaxSize(),
-        topBar = {
-            MinstrelTopAppBar(
-                title = "Admin · Tag sources",
-                navController = navController,
-                currentRouteName = AdminTagSources::class.qualifiedName,
-                onBack = { navController.popBackStack() },
-            )
-        },
-    ) { inner ->
-        PullToRefreshScaffold(
-            onRefresh = { viewModel.refresh().join() },
-            modifier = Modifier.fillMaxSize().padding(inner),
-        ) {
-            when (val s = state) {
-                AdminTagSourcesUiState.Loading -> LoadingCentered()
-                AdminTagSourcesUiState.Empty -> EmptyState(
-                    title = "No tag sources",
-                    body = "Tag-enrichment providers register on the server; none are available.",
-                )
-                is AdminTagSourcesUiState.Error -> ErrorRetry(
-                    title = "Couldn't load tag sources",
-                    message = s.message,
-                    onRetry = { viewModel.refresh() },
-                )
-                is AdminTagSourcesUiState.Success -> TagSourceList(
-                    providers = s.providers,
-                    testResults = s.testResults,
-                    onToggle = viewModel::setEnabled,
-                    onSaveKey = viewModel::saveApiKey,
-                    onTest = viewModel::test,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun TagSourceList(
-    providers: List<AdminTagSourceRef>,
-    testResults: Map<String, TagSourceTestResult>,
-    onToggle: (String, Boolean) -> Unit,
-    onSaveKey: (String, String) -> Unit,
-    onTest: (String) -> Unit,
-) {
-    LazyColumn(
-        modifier = Modifier.fillMaxSize(),
-        contentPadding = PaddingValues(16.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp),
-    ) {
-        items(items = providers, key = { it.id }) { provider ->
-            TagSourceCard(
-                provider = provider,
-                testResult = testResults[provider.id],
-                onToggle = onToggle,
-                onSaveKey = onSaveKey,
-                onTest = onTest,
-            )
-        }
-    }
-}
-
-@Composable
-private fun TagSourceCard(
-    provider: AdminTagSourceRef,
-    testResult: TagSourceTestResult?,
-    onToggle: (String, Boolean) -> Unit,
-    onSaveKey: (String, String) -> Unit,
-    onTest: (String) -> Unit,
-) {
-    ElevatedCard(modifier = Modifier.fillMaxWidth()) {
-        Column(
-            modifier = Modifier.fillMaxWidth().padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(10.dp),
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween,
-            ) {
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(provider.displayName, style = MaterialTheme.typography.titleMedium)
-                    Text(
-                        text = provider.supports.joinToString(", ") { it.replace('_', ' ') },
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-                Switch(
-                    checked = provider.enabled,
-                    onCheckedChange = { onToggle(provider.id, it) },
-                )
-            }
-            if (provider.requiresApiKey) {
-                ApiKeyRow(provider = provider, onSaveKey = onSaveKey)
-            }
-            if (provider.testable) {
-                TestRow(provider = provider, testResult = testResult, onTest = onTest)
-            }
-        }
-    }
-}
-
-@Composable
-private fun ApiKeyRow(provider: AdminTagSourceRef, onSaveKey: (String, String) -> Unit) {
-    var key by remember(provider.id) { mutableStateOf("") }
-    OutlinedTextField(
-        value = key,
-        onValueChange = { key = it },
-        modifier = Modifier.fillMaxWidth(),
-        label = { Text("API key") },
-        placeholder = {
-            Text(
-                if (provider.apiKeySet) {
-                    "••• saved — leave blank to keep"
-                } else {
-                    "Paste your API key to enable this source"
-                },
-            )
-        },
-        singleLine = true,
-        visualTransformation = PasswordVisualTransformation(),
-        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
-    )
-    Row(
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Button(
-            onClick = {
-                onSaveKey(provider.id, key)
-                key = ""
-            },
-            enabled = key.isNotBlank(),
-        ) { Text("Save key") }
-        if (provider.apiKeySet) {
-            Text("✓ Set", style = MaterialTheme.typography.bodySmall)
-        }
-    }
-}
-
-@Composable
-private fun TestRow(
-    provider: AdminTagSourceRef,
-    testResult: TagSourceTestResult?,
-    onTest: (String) -> Unit,
-) {
-    Row(
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        OutlinedButton(onClick = { onTest(provider.id) }) { Text("Test connection") }
-        testResult?.let { result ->
-            if (result.ok) {
-                Text(
-                    text = "OK (${result.durationMs}ms)",
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.primary,
-                )
-            } else {
-                Text(
-                    text = "Failed — ${result.error}",
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.error,
-                )
-            }
-        }
-    }
-}
@@ -1,116 +0,0 @@
-package com.fabledsword.minstrel.admin.ui
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.fabledsword.minstrel.admin.data.AdminTagSourcesRepository
-import com.fabledsword.minstrel.api.ErrorCopy
-import com.fabledsword.minstrel.connectivity.NetworkStatusController
-import com.fabledsword.minstrel.connectivity.recoveries
-import com.fabledsword.minstrel.models.AdminTagSourceRef
-import com.fabledsword.minstrel.models.TagSourceTestResult
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-sealed interface AdminTagSourcesUiState {
-    data object Loading : AdminTagSourcesUiState
-    data object Empty : AdminTagSourcesUiState
-    data class Success(
-        val providers: List<AdminTagSourceRef>,
-        val testResults: Map<String, TagSourceTestResult>,
-    ) : AdminTagSourcesUiState
-    data class Error(val message: String) : AdminTagSourcesUiState
-}
-
-@HiltViewModel
-class AdminTagSourcesViewModel @Inject constructor(
-    private val repository: AdminTagSourcesRepository,
-    networkStatus: NetworkStatusController,
-) : ViewModel() {
-
-    private val internal = MutableStateFlow<AdminTagSourcesUiState>(AdminTagSourcesUiState.Loading)
-    val uiState: StateFlow<AdminTagSourcesUiState> = internal.asStateFlow()
-
-    init {
-        refresh()
-        // Screen-level auto-recovery: reload a failed list when server
-        // health returns instead of waiting for a manual pull (issue #1245).
-        viewModelScope.launch {
-            networkStatus.recoveries().collect {
-                if (internal.value is AdminTagSourcesUiState.Error) refresh()
-            }
-        }
-    }
-
-    fun refresh(): Job = viewModelScope.launch {
-        internal.value = AdminTagSourcesUiState.Loading
-        try {
-            val providers = repository.list()
-            internal.value = if (providers.isEmpty()) {
-                AdminTagSourcesUiState.Empty
-            } else {
-                AdminTagSourcesUiState.Success(providers, emptyMap())
-            }
-        } catch (
-            @Suppress("TooGenericExceptionCaught") e: Throwable,
-        ) {
-            internal.value = AdminTagSourcesUiState.Error(ErrorCopy.fromThrowable(e))
-        }
-    }
-
-    fun setEnabled(id: String, enabled: Boolean) {
-        val before = internal.value as? AdminTagSourcesUiState.Success ?: return
-        // Optimistic toggle; reconcile via refresh() if the server rejects.
-        internal.value = before.copy(
-            providers = before.providers.map {
-                if (it.id == id) it.copy(enabled = enabled) else it
-            },
-        )
-        viewModelScope.launch {
-            try {
-                repository.setEnabled(id, enabled)
-            } catch (
-                @Suppress("TooGenericExceptionCaught", "SwallowedException") e: Throwable,
-            ) {
-                refresh()
-            }
-        }
-    }
-
-    fun saveApiKey(id: String, apiKey: String) {
-        viewModelScope.launch {
-            try {
-                replaceProvider(repository.setApiKey(id, apiKey))
-            } catch (
-                @Suppress("TooGenericExceptionCaught", "SwallowedException") e: Throwable,
-            ) {
-                refresh()
-            }
-        }
-    }
-
-    fun test(id: String) {
-        viewModelScope.launch {
-            val result = try {
-                repository.test(id)
-            } catch (
-                @Suppress("TooGenericExceptionCaught") e: Throwable,
-            ) {
-                TagSourceTestResult(ok = false, error = ErrorCopy.fromThrowable(e))
-            }
-            val current = internal.value as? AdminTagSourcesUiState.Success ?: return@launch
-            internal.value = current.copy(testResults = current.testResults + (id to result))
-        }
-    }
-
-    private fun replaceProvider(updated: AdminTagSourceRef) {
-        val current = internal.value as? AdminTagSourcesUiState.Success ?: return
-        internal.value = current.copy(
-            providers = current.providers.map { if (it.id == updated.id) updated else it },
-        )
-    }
-}
@@ -1,41 +0,0 @@
-package com.fabledsword.minstrel.api.endpoints
-
-import com.fabledsword.minstrel.models.wire.AdminTagSourceWire
-import com.fabledsword.minstrel.models.wire.AdminTagSourcesListWire
-import com.fabledsword.minstrel.models.wire.TestTagSourceWire
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.PATCH
-import retrofit2.http.POST
-import retrofit2.http.Path
-
-/**
- * Retrofit interface for `/api/admin/tag-sources` (#1521) — the admin
- * surface for the tag-enrichment provider settings (#1490). Mirrors the
- * web integrations "Tag enrichment sources" card. Same shape as the
- * cover-sources admin surface; kept independent so a new tag source is
- * added without touching art settings.
- */
-interface AdminTagSourcesApi {
-    @GET("api/admin/tag-sources")
-    suspend fun list(): AdminTagSourcesListWire
-
-    @PATCH("api/admin/tag-sources/{id}")
-    suspend fun update(@Path("id") id: String, @Body body: UpdateTagSourceBody): AdminTagSourceWire
-
-    @POST("api/admin/tag-sources/{id}/test")
-    suspend fun test(@Path("id") id: String): TestTagSourceWire
-}
-
-/**
- * PATCH body. Both fields are nullable + default-null so kotlinx omits the
- * untouched one (the server reads a missing/null field as "leave
- * unchanged"): send only `enabled` to toggle, only `apiKey` to set a key.
- */
-@Serializable
-data class UpdateTagSourceBody(
-    val enabled: Boolean? = null,
-    @SerialName("api_key") val apiKey: String? = null,
-)
@@ -239,9 +239,6 @@ data class PlayOfflinePayload(
    val atIso: String,
    val durationPlayedMs: Long,
    val source: String? = null,
-    // #1551: device class for context conditioning; null on payloads queued
-    // before this field existed (decodes to null → server stores NULL).
-    val deviceClass: String? = null,
 )

 /**
@@ -254,7 +254,6 @@ class MutationReplayer @Inject constructor(
                at = decoded.atIso,
                durationPlayedMs = decoded.durationPlayedMs,
                source = decoded.source,
-                deviceClass = decoded.deviceClass,
            ),
        )
        return Outcome.SENT
@@ -2,19 +2,11 @@

 package com.fabledsword.minstrel.home.ui

-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -35,7 +27,6 @@ import androidx.compose.foundation.lazy.grid.items as gridItems
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -97,7 +88,6 @@ import com.fabledsword.minstrel.shared.widgets.SkeletonSectionHeader
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -120,16 +110,6 @@ private const val BOTTOM_PADDING_FOR_MINIPLAYER_DP = 140
 private const val RECENTLY_ADDED_GRID_ROWS = 2
 private const val RECENTLY_ADDED_GRID_HEIGHT_DP = 440

-// "Updating your mixes…" veil (automatic refresh). Held through the pull
-// plus VEIL_SETTLE_MS so per-tile hydration lands behind it before it wipes
-// off; near-opaque (VEIL_ALPHA) so the section churn never bleeds through.
-private const val VEIL_SETTLE_MS = 500L
-private const val VEIL_WIPE_MS = 280
-private const val VEIL_ALPHA = 0.96f
-private const val VEIL_SPINNER_DP = 22
-private const val VEIL_SPINNER_STROKE_DP = 2
-private const val VEIL_LABEL_GAP_DP = 12
-
 // ─── State ───────────────────────────────────────────────────────────

 data class HomeSections(
@@ -197,36 +177,22 @@ class HomeViewModel @Inject constructor(
     */
    private val refreshError = MutableStateFlow<String?>(null)

-    private val updatingInternal = MutableStateFlow(false)
-
-    /**
-     * True while an automatic background refresh (the 03:00 daily rebuild
-     * or a reconnect re-pull) is repopulating Home. Drives the "Updating
-     * your mixes…" veil so the section churn — delete-then-insert in
-     * [HomeRepository.refreshIndex] plus per-tile hydration — happens
-     * hidden behind the veil instead of on screen. Manual pull-to-refresh
-     * and cold start are NOT veiled (they own the pull spinner / skeleton).
-     */
-    val isUpdating: StateFlow<Boolean> = updatingInternal.asStateFlow()
-
    init {
        refresh()
        // Screen-level auto-recovery (issue #1245): a Home that failed to
        // load while the server was unreachable re-pulls itself the moment
        // health returns — same idiom as SyncController, one layer up.
-        // Veiled: content is already on screen and would otherwise churn.
        viewModelScope.launch {
-            networkStatus.recoveries().collect { refreshBehindVeil() }
+            networkStatus.recoveries().collect { refresh() }
        }
        // #968: the daily 03:00 rebuild (and manual refresh) emit
        // playlist.system_rebuilt; re-pull Home so the system-playlist tiles
        // and You-might-like rows reflect the new snapshot without a manual
-        // reload. Mirrors the web SSE consumer. Veiled so the multi-section
-        // rebuild churn hides behind "Updating your mixes…".
+        // reload. Mirrors the web SSE consumer.
        viewModelScope.launch {
            eventsStream.events
                .filter { it.kind == "playlist.system_rebuilt" }
-                .collect { refreshBehindVeil() }
+                .collect { refresh() }
        }
    }

@@ -357,26 +323,6 @@ class HomeViewModel @Inject constructor(
        status.join()
    }

-    /**
-     * Automatic background refresh with the "Updating your mixes…" veil
-     * raised (see [isUpdating]). Used by the daily-rebuild + reconnect
-     * paths where Home is already on screen. Holds the veil through the
-     * pull plus a short settle so per-tile hydration lands behind it, then
-     * lets it wipe off. Overlapping automatic refreshes are rare enough
-     * (once-daily rebuild, reconnect) that a plain flag beats a counter.
-     */
-    private fun refreshBehindVeil() {
-        viewModelScope.launch {
-            updatingInternal.value = true
-            try {
-                refresh().join()
-                delay(VEIL_SETTLE_MS)
-            } finally {
-                updatingInternal.value = false
-            }
-        }
-    }
-
    val uiState: StateFlow<UiState<HomeSections>> =
        combineHomeFlows().asCacheFirstStateFlow(viewModelScope)

@@ -452,108 +398,47 @@ fun HomeScreen(
        val state by viewModel.uiState.collectAsStateWithLifecycle()
        val systemStatus by viewModel.systemStatus.collectAsStateWithLifecycle()
        val offline by viewModel.offline.collectAsStateWithLifecycle()
-        val updating by viewModel.isUpdating.collectAsStateWithLifecycle()
        PullToRefreshScaffold(
            onRefresh = { viewModel.refresh().join() },
            modifier = Modifier.fillMaxSize().padding(inner),
        ) {
-            Box(Modifier.fillMaxSize()) {
-                HomeStateCrossfade(state, systemStatus, offline, navController, viewModel)
-                // Automatic-refresh veil: the daily rebuild / reconnect
-                // churn hides behind an "Updating your mixes…" wipe. Manual
-                // pull owns the PullToRefreshBox spinner instead.
-                UpdatingVeil(visible = updating)
-            }
-        }
-    }
-}
-
-/**
- * The Loading/Empty/Error/Success switch for Home, crossfaded on state.
- *
- * Key the Crossfade on the state CLASS, not the instance. Each section
- * emission produces a new UiState.Success(data); if we keyed on `state`
- * directly, every per-section hydration tick would re-run the 300ms
- * crossfade, and first-sign-in (six sections cascading in) reads as
- * continuous flicker. Keying on the class restricts the animation to
- * Loading↔Success↔Empty↔Error transitions and lets normal Success→Success
- * recompositions update the LazyColumn without a fade.
- */
-@Composable
-private fun HomeStateCrossfade(
-    state: UiState<HomeSections>,
-    systemStatus: SystemPlaylistsStatus,
-    offline: Boolean,
-    navController: NavHostController,
-    viewModel: HomeViewModel,
-) {
-    Crossfade(targetState = state::class, label = "home-state") { _ ->
-        when (val s = state) {
-            UiState.Loading -> HomeSkeletonContent()
-            UiState.Empty -> EmptyState(
-                title = "Welcome to Minstrel",
-                body = "Nothing to show yet — scan a folder in your server " +
-                    "settings, then come back here for system playlists " +
-                    "and recommendations.",
-            )
-            is UiState.Error -> ErrorRetry(
-                title = "Couldn't load home",
-                message = s.message,
-                onRetry = { viewModel.refresh() },
-            )
-            is UiState.Success -> HomeSuccessContent(
-                sections = s.data,
-                systemStatus = systemStatus,
-                offline = offline,
-                onAlbumClick = { id -> navController.navigate(AlbumDetail(id)) },
-                onArtistClick = { id -> navController.navigate(ArtistDetail(id)) },
-                onPlaylistClick = { id -> navController.navigate(PlaylistDetail(id)) },
-                onMostPlayedTap = viewModel::playMostPlayed,
-                onPlayPool = viewModel::playPool,
-                onPlayAlbum = viewModel::playAlbum,
-                onPlayArtist = viewModel::playArtistShuffled,
-                onPlayPlaylist = viewModel::playPlaylist,
-            )
-        }
-    }
-}
-
-/**
- * Full-bleed "Updating your mixes…" veil that wipes in from the left,
- * holds while an automatic refresh repopulates Home, then wipes off.
- * Near-opaque so the section churn underneath never shows; swallows taps
- * while raised so a mid-hydration tile can't be hit.
- */
-@Composable
-private fun BoxScope.UpdatingVeil(visible: Boolean) {
-    AnimatedVisibility(
-        visible = visible,
-        enter = slideInHorizontally(tween(VEIL_WIPE_MS)) { -it } + fadeIn(tween(VEIL_WIPE_MS)),
-        exit = slideOutHorizontally(tween(VEIL_WIPE_MS)) { it } + fadeOut(tween(VEIL_WIPE_MS)),
-        modifier = Modifier.matchParentSize(),
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(MaterialTheme.colorScheme.background.copy(alpha = VEIL_ALPHA))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                ) {},
-            contentAlignment = Alignment.Center,
-        ) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                CircularProgressIndicator(
-                    modifier = Modifier.size(VEIL_SPINNER_DP.dp),
-                    strokeWidth = VEIL_SPINNER_STROKE_DP.dp,
-                    color = MaterialTheme.colorScheme.primary,
-                )
-                Spacer(Modifier.width(VEIL_LABEL_GAP_DP.dp))
-                Text(
-                    text = "Updating your mixes…",
-                    style = MaterialTheme.typography.titleMedium,
-                    color = MaterialTheme.colorScheme.onBackground,
-                )
+            // Key Crossfade on the state CLASS, not the instance. Each
+            // section emission produces a new UiState.Success(data); if
+            // we keyed on `state` directly, every per-section
+            // hydration tick would re-run the 300ms crossfade, and
+            // first-sign-in (six sections cascading in) reads as
+            // continuous flicker. Keying on the class restricts the
+            // animation to Loading↔Success↔Empty↔Error transitions and
+            // lets normal Success→Success recompositions update the
+            // LazyColumn without a fade.
+            Crossfade(targetState = state::class, label = "home-state") { _ ->
+                when (val s = state) {
+                    UiState.Loading -> HomeSkeletonContent()
+                    UiState.Empty -> EmptyState(
+                        title = "Welcome to Minstrel",
+                        body = "Nothing to show yet — scan a folder in your server " +
+                            "settings, then come back here for system playlists " +
+                            "and recommendations.",
+                    )
+                    is UiState.Error -> ErrorRetry(
+                        title = "Couldn't load home",
+                        message = s.message,
+                        onRetry = { viewModel.refresh() },
+                    )
+                    is UiState.Success -> HomeSuccessContent(
+                        sections = s.data,
+                        systemStatus = systemStatus,
+                        offline = offline,
+                        onAlbumClick = { id -> navController.navigate(AlbumDetail(id)) },
+                        onArtistClick = { id -> navController.navigate(ArtistDetail(id)) },
+                        onPlaylistClick = { id -> navController.navigate(PlaylistDetail(id)) },
+                        onMostPlayedTap = viewModel::playMostPlayed,
+                        onPlayPool = viewModel::playPool,
+                        onPlayAlbum = viewModel::playAlbum,
+                        onPlayArtist = viewModel::playArtistShuffled,
+                        onPlayPlaylist = viewModel::playPlaylist,
+                    )
+                }
            }
        }
    }
@@ -623,12 +508,10 @@ private fun HomeSuccessContent(
    ) {
        item {
            // Always rendered: real system/user playlists, with
-            // placeholder cards filling the For You / Discover slots
-            // that haven't generated yet. When offline, the cache-backed
-            // pool cards lead the row. Songs-like now lives in its own
-            // dedicated row below (#1491), no longer inside this carousel.
+            // placeholder cards filling the For You / Discover /
+            // 3× Songs-like slots that haven't generated yet. When
+            // offline, the cache-backed pool cards lead the row.
            PlaylistsRow(
-                title = "Playlists",
                rowItems = buildPlaylistsRow(sections.playlists, systemStatus, offline),
                offline = offline,
                onPlaylistClick = onPlaylistClick,
@@ -636,18 +519,6 @@ private fun HomeSuccessContent(
                onPlayPlaylist = onPlayPlaylist,
            )
        }
-        // Songs-like is the best-performing surface (#1491) — promoted out
-        // of the Playlists carousel into its own row so it shows a wider
-        // spread of "Songs like {artist}" mixes. Hidden when there's
-        // nothing to show (offline with none cached).
-        songsLikeSection(
-            playlists = sections.playlists,
-            status = systemStatus,
-            offline = offline,
-            onPlaylistClick = onPlaylistClick,
-            onPlayPool = onPlayPool,
-            onPlayPlaylist = onPlayPlaylist,
-        )
        youMightLikeSection(
            albums = sections.youMightLikeAlbums,
            artists = sections.youMightLikeArtists,
@@ -671,35 +542,6 @@ private fun HomeSuccessContent(
    }
 }

-/**
- * The dedicated "Songs like…" row (#1491). Reuses [PlaylistsRow]'s card
- * rendering with a distinct title; hidden entirely when there's nothing
- * to show (offline with no cached mixes). Online with none generated yet
- * still shows a few placeholders so the building / seed-needed state is
- * visible, matching the pre-promotion carousel behavior.
- */
-private fun LazyListScope.songsLikeSection(
-    playlists: List<PlaylistRef>,
-    status: SystemPlaylistsStatus,
-    offline: Boolean,
-    onPlaylistClick: (String) -> Unit,
-    onPlayPool: (OfflinePoolKind) -> Unit,
-    onPlayPlaylist: suspend (PlaylistRef) -> Unit,
-) {
-    val rowItems = buildSongsLikeRow(playlists, status, offline)
-    if (rowItems.isEmpty()) return
-    item {
-        PlaylistsRow(
-            title = "Songs like…",
-            rowItems = rowItems,
-            offline = offline,
-            onPlaylistClick = onPlaylistClick,
-            onPlayPool = onPlayPool,
-            onPlayPlaylist = onPlayPlaylist,
-        )
-    }
-}
-
 private fun LazyListScope.recentlyAddedSection(
    albums: List<HomeTile<AlbumRef>>,
    onAlbumClick: (String) -> Unit,
@@ -969,14 +811,13 @@ private fun AlbumsRow(

@Composable
 private fun PlaylistsRow(
-    title: String,
    rowItems: List<PlaylistRowItem>,
    offline: Boolean,
    onPlaylistClick: (String) -> Unit,
    onPlayPool: (OfflinePoolKind) -> Unit,
    onPlayPlaylist: suspend (PlaylistRef) -> Unit,
 ) {
-    HorizontalScrollRow(title = title) {
+    HorizontalScrollRow(title = "Playlists") {
        itemsIndexed(items = rowItems) { _, item ->
            when (item) {
                is PlaylistRowItem.OfflinePool -> OfflinePoolCard(
@@ -1027,12 +868,11 @@ enum class OfflinePoolKind(val label: String) {
 /**
 * Builds the Home Playlists row.
 *
- * Online: For You + Discover fixed slots (real card when generated,
- * placeholder otherwise), then the secondary system kinds (deep cuts /
- * rediscover / new for you / on this day / first listens) when they exist —
+ * Online: For You + Discover + 3× Songs-like fixed slots (real card when
+ * generated, placeholder otherwise), then the secondary system kinds (deep cuts
+ * / rediscover / new for you / on this day / first listens) when they exist —
 * no placeholders for these since they're conditional on library shape — then
- * user-owned playlists. Songs-like has its own dedicated row (#1491) via
- * [buildSongsLikeRow] and no longer appears in this carousel.
+ * user-owned playlists.
 *
 * Offline: the two cache-backed pools (Recently played, Liked) lead, then the
 * same real playlists in curated order but stably partitioned fully-cached
@@ -1059,7 +899,7 @@ internal fun buildPlaylistsRow(
    return out
 }

-/** The online layout: For You + Discover slots (with placeholders), secondary, user. */
+/** The online layout: fixed system slots (with placeholders), secondary, user. */
 private fun buildOnlineRow(
    owned: List<PlaylistRef>,
    status: SystemPlaylistsStatus,
@@ -1071,7 +911,12 @@ private fun buildOnlineRow(
    out += owned.firstOrNull { it.systemVariant == "discover" }
        ?.let { PlaylistRowItem.Real(it) }
        ?: PlaylistRowItem.Placeholder("Discover", variantFor("discover", status))
-    // Songs-like is no longer here — it has its own dedicated row (#1491).
+    val songsLike = owned.filter { it.systemVariant == "songs_like_artist" }.take(SONGS_LIKE_SLOTS)
+    for (i in 0 until SONGS_LIKE_SLOTS) {
+        out += songsLike.getOrNull(i)
+            ?.let { PlaylistRowItem.Real(it) }
+            ?: PlaylistRowItem.Placeholder("Songs like…", variantFor("songs-like", status))
+    }
    for (variant in SECONDARY_SYSTEM_VARIANTS) {
        owned.firstOrNull { it.systemVariant == variant }?.let { out += PlaylistRowItem.Real(it) }
    }
@@ -1079,44 +924,16 @@ private fun buildOnlineRow(
    return out
 }

-/**
- * Builds the dedicated Songs-like row (#1491): all "Songs like {artist}"
- * mixes the server generated, no longer capped to the 3 carousel slots.
- *
- * Online: every generated mix as a real card; when none exist yet, a few
- * placeholders so the building / seed-needed state stays visible.
- * Offline: the cached mixes only (fully-cached first, greyed after), and
- * an empty list — hiding the whole section — when nothing is cached.
- */
-internal fun buildSongsLikeRow(
-    owned: List<PlaylistRef>,
-    status: SystemPlaylistsStatus,
-    offline: Boolean,
-): List<PlaylistRowItem> {
-    val mixes = owned.filter { it.systemVariant == "songs_like_artist" }
-    return when {
-        offline -> {
-            val (available, greyed) = mixes.partition { !it.unavailableOffline }
-            (available + greyed).map { PlaylistRowItem.Real(it) }
-        }
-        mixes.isNotEmpty() -> mixes.map { PlaylistRowItem.Real(it) }
-        else -> List(SONGS_LIKE_PLACEHOLDER_SLOTS) {
-            PlaylistRowItem.Placeholder("Songs like…", variantFor("songs-like", status))
-        }
-    }
-}
-
 /**
 * Curated real-playlist order (system primaries, then secondary, then user).
 * Must mirror [buildOnlineRow]'s slot order — the offline row reuses this and
 * only differs by dropping placeholders + partitioning available-first.
- * Songs-like is excluded here too — it renders in its own row via
- * [buildSongsLikeRow] in both online and offline modes (#1491).
 */
 private fun orderedRealPlaylists(owned: List<PlaylistRef>): List<PlaylistRef> {
    val out = mutableListOf<PlaylistRef>()
    owned.firstOrNull { it.systemVariant == "for_you" }?.let { out += it }
    owned.firstOrNull { it.systemVariant == "discover" }?.let { out += it }
+    out += owned.filter { it.systemVariant == "songs_like_artist" }.take(SONGS_LIKE_SLOTS)
    for (variant in SECONDARY_SYSTEM_VARIANTS) {
        owned.firstOrNull { it.systemVariant == variant }?.let { out += it }
    }
@@ -1131,10 +948,7 @@ private fun variantFor(slot: String, s: SystemPlaylistsStatus): String = when {
    else -> "pending"
 }

-// How many "Songs like…" placeholder cards the dedicated row shows while
-// the mixes haven't generated yet (building / seed-needed). Real mixes,
-// once generated, are shown in full and no longer capped by this (#1491).
-private const val SONGS_LIKE_PLACEHOLDER_SLOTS = 3
+private const val SONGS_LIKE_SLOTS = 3

 /**
 * The 5 system playlist kinds the server generates that aren't pinned
@@ -1,19 +0,0 @@
-package com.fabledsword.minstrel.models
-
-/** Domain model for one tag-enrichment provider in the admin surface (#1521). */
-data class AdminTagSourceRef(
-    val id: String,
-    val displayName: String,
-    val requiresApiKey: Boolean,
-    val supports: List<String>,
-    val enabled: Boolean,
-    val apiKeySet: Boolean,
-    val testable: Boolean,
-)
-
-/** Result of a provider "test connection" call. */
-data class TagSourceTestResult(
-    val ok: Boolean,
-    val durationMs: Long = 0,
-    val error: String = "",
-)
@@ -1,35 +0,0 @@
-package com.fabledsword.minstrel.models.wire
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * Wire DTOs for the `/api/admin/tag-sources` admin surface (#1521).
- * Every field defaults defensively so a missing JSON key never crashes
- * deserialization. `versionBumped` is present only on the PATCH response.
- */
-@Serializable
-data class AdminTagSourceWire(
-    val id: String = "",
-    @SerialName("display_name") val displayName: String = "",
-    @SerialName("requires_api_key") val requiresApiKey: Boolean = false,
-    val supports: List<String> = emptyList(),
-    val enabled: Boolean = false,
-    @SerialName("api_key_set") val apiKeySet: Boolean = false,
-    @SerialName("display_order") val displayOrder: Int = 0,
-    val testable: Boolean = false,
-    @SerialName("version_bumped") val versionBumped: Boolean = false,
-)
-
-@Serializable
-data class AdminTagSourcesListWire(
-    val providers: List<AdminTagSourceWire> = emptyList(),
-    @SerialName("sources_version") val sourcesVersion: Int = 0,
-)
-
-@Serializable
-data class TestTagSourceWire(
-    val ok: Boolean = false,
-    @SerialName("duration_ms") val durationMs: Long = 0,
-    val error: String = "",
-)
@@ -27,8 +27,6 @@ data class PlayStartedRequest(
    @SerialName("track_id") val trackId: String,
    @SerialName("client_id") val clientId: String,
    val source: String? = null,
-    // #1551: device class for context conditioning (server normalizes).
-    @SerialName("device_class") val deviceClass: String? = null,
 )

@Serializable
@@ -58,6 +56,4 @@ data class PlayOfflineRequest(
    val at: String,
    @SerialName("duration_played_ms") val durationPlayedMs: Long,
    val source: String? = null,
-    // #1551: device class for context conditioning (server normalizes).
-    @SerialName("device_class") val deviceClass: String? = null,
 )
@@ -16,7 +16,6 @@ import androidx.navigation.compose.composable
 import com.fabledsword.minstrel.admin.ui.AdminLandingScreen
 import com.fabledsword.minstrel.admin.ui.AdminQuarantineScreen
 import com.fabledsword.minstrel.admin.ui.AdminRequestsScreen
-import com.fabledsword.minstrel.admin.ui.AdminTagSourcesScreen
 import com.fabledsword.minstrel.admin.ui.AdminUsersScreen
 import com.fabledsword.minstrel.auth.ui.LoginScreen
 import com.fabledsword.minstrel.auth.ui.ServerUrlScreen
@@ -191,13 +190,6 @@ private fun NavGraphBuilder.inShellDetail(
            }
        }
    }
-    composable<AdminTagSources> {
-        WithAnimatedScope {
-            ShellScaffold(onExpandPlayer = expandPlayer) {
-                AdminTagSourcesScreen(navController = navController)
-            }
-        }
-    }
 }

 private fun NavGraphBuilder.outsideShell(navController: NavHostController) {
@@ -22,7 +22,6 @@ import kotlinx.serialization.Serializable
@Serializable data object AdminRequests
@Serializable data object AdminQuarantine
@Serializable data object AdminUsers
-@Serializable data object AdminTagSources

 // ── Outside-shell full-screen routes ──────────────────────────────────

@@ -17,7 +17,6 @@ import com.fabledsword.minstrel.player.output.ActiveUpnpHolder
 import com.fabledsword.minstrel.player.output.upnp.SoapFaultException
 import com.fabledsword.minstrel.player.output.upnp.TransportState
 import java.io.IOException
-import kotlin.math.abs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -59,10 +58,8 @@ import timber.log.Timber
 * native queue via ClearQueue + AddURIToQueue, then points the
 * transport at x-rincon-queue:<udn>#0. Skip/prev/seekTo delegate to
 * AVTransport Next/Previous/SeekToTrack so Sonos manages gap-free
- * advance natively. PollLoop keeps the local cursor aligned to the
- * track the renderer is actually playing, matched by track identity
- * (the id in GetPositionInfo's TrackURI) so it survives queue-reload
- * index drift -- see [syncLocalCursorToRemote].
+ * advance natively. PollLoop syncs the local cursor by comparing the
+ * 1-based Track index from GetPositionInfo.
 */
 class MinstrelForwardingPlayer(
    private val delegate: Player,
@@ -342,23 +339,6 @@ class MinstrelForwardingPlayer(
        }
    }

-    // The system media notification / lock-screen / Android Auto / Wear 'next'
-    // and 'previous' buttons issue COMMAND_SEEK_TO_NEXT / COMMAND_SEEK_TO_PREVIOUS
-    // -> Player.seekToNext() / seekToPrevious(), which are DISTINCT from the
-    // *MediaItem variants the in-app transport buttons call. Un-overridden, the
-    // base ForwardingPlayer forwards these to the paused local delegate -- so
-    // the notification next/prev only nudged the local cursor (which the poll
-    // then re-synced back to Sonos), reading as dead buttons while casting.
-    // Route them through the same Sonos path as the media-item variants when a
-    // UPnP route is engaged; plain local playback keeps the default behaviour.
-    override fun seekToNext() {
-        if (isRemote() || isLoadingUpnp()) seekToNextMediaItem() else super.seekToNext()
-    }
-
-    override fun seekToPrevious() {
-        if (isRemote() || isLoadingUpnp()) seekToPreviousMediaItem() else super.seekToPrevious()
-    }
-
    override fun getCurrentPosition(): Long =
        if (isRemote()) remoteState.positionMs else super.getCurrentPosition()

@@ -546,8 +526,18 @@ class MinstrelForwardingPlayer(

    /**
     * One poll tick: read position + transport state from Sonos, apply to
-     * [remoteState], and sync the local cursor to the track the renderer is
-     * actually playing (see [syncLocalCursorToRemote]).
+     * [remoteState], and forward-sync the local cursor to Sonos's Track
+     * index when not in queue load.
+     *
+     * Cursor sync is gated on `holder.target == null` (= not loading)
+     * because during load Sonos reports Track=1 while we're still
+     * appending, and syncing would race the SetAV+Seek that lands
+     * after. Outside load, forward sync catches Sonos auto-advances
+     * (queue end-of-track), Sonos-app driven Next presses, and any
+     * drift after a brief poll-failure burst that didn't trip the
+     * drop threshold. Forward-only because a Next override we just
+     * issued can race with a poll still reporting the prior Track --
+     * the next poll catches up safely.
     */
    private suspend fun pollOnce(active: ActiveUpnp) {
        val info = active.avTransport.getPositionInfo()
@@ -563,7 +553,7 @@ class MinstrelForwardingPlayer(
            trackUri = info.trackUri,
            trackNumber = info.track,
        )
-        syncLocalCursorToRemote(sonosTrack = info.track, trackUri = info.trackUri)
+        maybeSyncLocalCursor(info.track)
        val transport = active.avTransport.getTransportInfo()
        when (transport.state) {
            TransportState.PLAYING -> {
@@ -587,95 +577,23 @@ class MinstrelForwardingPlayer(
        notifyRemoteStateChanged()
    }

-    /**
-     * Align the paused local delegate cursor to the track the renderer is
-     * actually playing, so the un-overridden current-item getters
-     * (getCurrentMediaItem/Index -- what both the in-app player UI via
-     * PlayerController.onEvents AND the MediaSession notification read) always
-     * resolve to that track. This is THE single source of truth for "what's
-     * playing" during a cast.
-     *
-     * Identity-first: match the track-id embedded in the renderer's current URI
-     * against the delegate's MediaItem.mediaId (PlayerController sets mediaId =
-     * TrackRef.id), so the index-offset wobble across queue reloads / re-casts
-     * can never park the cursor on a stale (pre-cast) track. Falls back to the
-     * 1-based Sonos Track index only when the URI can't be resolved to a queue
-     * item. Unlike the old forward-only sync this moves the cursor in BOTH
-     * directions -- a renderer Previous / re-cast to a lower track pulls it back
-     * too. Runs on the application looper (delegate access contract).
-     *
-     * Suppressed while:
-     *  - loading ([isLoadingUpnp]) -- the native Sonos queue is still being
-     *    (re)uploaded, so its Track index is meaningless; and
-     *  - a user transport (next/prev/seekTo idx) is pending Sonos's ack --
-     *    the override already advanced the delegate optimistically, and Sonos
-     *    still reports the OLD track for a beat, so syncing now would undo the
-     *    user's press. The pending deadline is honoured directly so a missed
-     *    clear can't wedge the sync.
-     */
-    private fun syncLocalCursorToRemote(sonosTrack: Int, trackUri: String) {
-        if (isLoadingUpnp()) return
-        val pendingDeadline = remoteState.pendingTransportDeadlineMs
-        if (pendingDeadline > 0L && SystemClock.elapsedRealtime() < pendingDeadline) return
+    private fun maybeSyncLocalCursor(sonosTrack: Int) {
+        if (holder.target.value != null) return
+        if (sonosTrack <= 0) return
+        val sonosIdx = sonosTrack - 1
        handler.post {
-            val target = resolveRemoteCursorIndex(sonosTrack, trackUri) ?: return@post
-            if (target != delegate.currentMediaItemIndex) {
+            val localIdx = delegate.currentMediaItemIndex
+            if (sonosIdx > localIdx && sonosIdx < delegate.mediaItemCount) {
                Timber.w(
-                    "UPnP cursor sync: local=%d -> %d",
-                    delegate.currentMediaItemIndex, target,
+                    "UPnP cursor catch-up: local=%d -> sonos=%d",
+                    localIdx, sonosIdx,
                )
-                delegate.seekTo(target, 0L)
+                delegate.seekTo(sonosIdx, 0L)
            }
        }
    }

-    /**
-     * Most-authoritative -> most-degraded (project rule #48): the track-id
-     * parsed from the renderer's current URI wins; else the 1-based Sonos Track
-     * index; else null (leave the cursor put rather than surface a wrong track).
-     * Must run on the application looper -- reads the delegate timeline.
-     */
-    private fun resolveRemoteCursorIndex(sonosTrack: Int, trackUri: String): Int? {
-        val byId = trackIdFromStreamUri(trackUri)?.let { id ->
-            nearestIndexWithMediaId(id, preferNear = sonosTrack - 1)
-        }
-        return byId ?: (sonosTrack - 1).takeIf { it in 0 until delegate.mediaItemCount }
-    }
-
-    /**
-     * Index of the delegate MediaItem whose mediaId == [mediaId], preferring the
-     * occurrence nearest [preferNear] so a track that appears twice in the queue
-     * doesn't snap the cursor across the queue. null if the id isn't present.
-     */
-    private fun nearestIndexWithMediaId(mediaId: String, preferNear: Int): Int? {
-        var best: Int? = null
-        var bestDist = Int.MAX_VALUE
-        for (i in 0 until delegate.mediaItemCount) {
-            if (delegate.getMediaItemAt(i).mediaId == mediaId) {
-                val dist = abs(i - preferNear)
-                if (dist < bestDist) {
-                    best = i
-                    bestDist = dist
-                }
-            }
-        }
-        return best
-    }
-
-    /** Extract `{id}` from a `.../api/tracks/{id}/stream...` stream URI. */
-    private fun trackIdFromStreamUri(uri: String): String? {
-        val start = uri.indexOf(TRACKS_PATH_MARKER)
-        if (start < 0) return null
-        val idStart = start + TRACKS_PATH_MARKER.length
-        val idEnd = uri.indexOf('/', idStart)
-        return if (idEnd > idStart) uri.substring(idStart, idEnd) else null
-    }
-
    private companion object {
-        // Path segment that precedes the track-id in a stream URI
-        // (…/api/tracks/{id}/stream…) — used to map the renderer's current URI
-        // back to a delegate MediaItem by identity.
-        const val TRACKS_PATH_MARKER = "/api/tracks/"
        const val POLL_INTERVAL_MS = 1_000L
        const val NON_PLAYING_CONFIRM = 2
        const val SEEK_ACK_WINDOW_MS = 2_000L
@@ -155,7 +155,6 @@ class PlayEventsReporter @Inject constructor(
                        trackId = trackId,
                        clientId = cid,
                        source = source.takeIf { !it.isNullOrEmpty() },
-                        deviceClass = DEVICE_CLASS,
                    ),
                )
                if (curTrackId == trackId) {
@@ -249,7 +248,6 @@ class PlayEventsReporter @Inject constructor(
                    atIso = startedAt.toString(),
                    durationPlayedMs = durationPlayedMs,
                    source = source.takeIf { !it.isNullOrEmpty() },
-                    deviceClass = DEVICE_CLASS,
                ),
            )
        }
@@ -270,12 +268,6 @@ class PlayEventsReporter @Inject constructor(

    // ── Lifecycle: durable-close on app background / detach ────────

-    companion object {
-        // #1551: Android is a mobile client. Refine to tablet/tv via device
-        // configuration later if the metrics trend view shows it matters.
-        private const val DEVICE_CLASS = "mobile"
-    }
-
    override fun onStop(owner: LifecycleOwner) {
        // App backgrounded. If the tracked play is still PLAYING, leave it
        // alone: the foreground media service keeps the process — and this
@@ -598,19 +598,18 @@ class PlayerController @Inject constructor(
    }

    /**
-     * One position-polling tick. Patches ONLY the smoothly-changing transport
-     * fields (position / duration / play-pause / buffer) via `.copy()`. The
-     * queue index + current track are owned solely by [onEvents], which reads
-     * the authoritative delegate cursor: during a cast,
-     * [MinstrelForwardingPlayer.syncLocalCursorToRemote] keeps that cursor on
-     * the track the renderer is actually playing (matched by identity), so there
-     * is exactly one writer of "what's playing" and a stale tick can never
-     * revert it to the old track. (Previously the tick was a second index writer
-     * that fought onEvents — the flicker-to-stale-track bug.)
+     * One position-polling tick. Owns track-change detection too: when UPnP
+     * is active and the wrapped ExoPlayer is paused, `delegate.seekTo` from
+     * `maybeSyncLocalCursor` may not fire `onMediaItemTransition`, leaving
+     * uiState.queueIndex stuck on the old track even after Sonos has
+     * advanced. So the tick reads Sonos's reported Track as the source of
+     * truth, rebuilds the index/title fields itself, and force-syncs the
+     * wrapped player as defense in depth.
     */
    private fun tickPositionPoll(controller: MediaController) {
        val upnpActive = activeUpnpHolder.active.value != null
        resolvePendingTransport(controller, upnpActive)
+        val pendingTransport = upnpActive && remoteState.pendingTransportDeadlineMs > 0L
        val effectiveIsPlaying =
            if (upnpActive) remoteState.isPlaying else controller.isPlaying
        val effectivePosition = if (upnpActive) {
@@ -618,29 +617,27 @@ class PlayerController @Inject constructor(
        } else {
            controller.currentPosition
        }
-        val idx = controller.currentMediaItemIndex
+        val desiredIdx = desiredQueueIndex(controller, upnpActive)
        val current = uiStateInternal.value
        val newPos = effectivePosition.coerceAtLeast(0)
        val newDur = effectiveDuration(
            upnpActive,
            remoteState.durationMs,
            controller.duration,
-            desiredIdx = idx,
-            controllerIdx = idx,
+            desiredIdx = desiredIdx,
+            controllerIdx = controller.currentMediaItemIndex,
        )
        val newBuf = controller.bufferedPosition.coerceAtLeast(0)
-        val somethingChanged = current.isPlaying != effectiveIsPlaying ||
-            current.positionMs != newPos ||
-            current.durationMs != newDur ||
-            current.bufferedPositionMs != newBuf
-        if (somethingChanged) {
-            uiStateInternal.value = current.copy(
-                isPlaying = effectiveIsPlaying,
-                positionMs = newPos,
-                durationMs = newDur,
-                bufferedPositionMs = newBuf,
-            )
-        }
+        // Track adjustments are forward-only AND suppressed while a user
+        // transport press is pending Sonos confirmation. Together those keep
+        // either direction of user input from being undone by a stale poll.
+        val trackChanged = !pendingTransport &&
+            desiredIdx > current.queueIndex &&
+            desiredIdx in queueRefs.indices
+        publishTickIfChanged(
+            current, trackChanged, desiredIdx,
+            effectiveIsPlaying, newPos, newDur, newBuf,
+        )
    }

    /**
@@ -657,6 +654,48 @@ class PlayerController @Inject constructor(
        }
    }

+    @Suppress("LongParameterList") // assembled at one tick call site; refactor would cost clarity
+    private fun publishTickIfChanged(
+        current: PlayerUiState,
+        trackChanged: Boolean,
+        desiredIdx: Int,
+        effectiveIsPlaying: Boolean,
+        newPos: Long,
+        newDur: Long,
+        newBuf: Long,
+    ) {
+        val somethingChanged = trackChanged ||
+            current.isPlaying != effectiveIsPlaying ||
+            current.positionMs != newPos ||
+            current.durationMs != newDur
+        if (!somethingChanged) return
+        val newTrack = if (trackChanged) queueRefs[desiredIdx] else current.currentTrack
+        val newIdx = if (trackChanged) desiredIdx else current.queueIndex
+        uiStateInternal.value = current.copy(
+            currentTrack = newTrack,
+            queueIndex = newIdx,
+            isPlaying = effectiveIsPlaying,
+            positionMs = newPos,
+            durationMs = newDur,
+            bufferedPositionMs = newBuf,
+        )
+        // Intentionally do NOT call controller.seekTo here. That would route
+        // through MinstrelForwardingPlayer's seekTo override and re-issue
+        // AVTransport.SeekToTrack to Sonos -- which seeks Sonos back to the
+        // start of the same track it's already playing, restarting the song.
+        // The wrapped player's index is kept in sync by maybeSyncLocalCursor's
+        // delegate.seekTo (which bypasses the override). If it lags briefly,
+        // the next pollOnce catches up; the uiState above already reflects
+        // Sonos's truth for the user.
+    }
+
+    private fun desiredQueueIndex(controller: MediaController, upnpActive: Boolean): Int =
+        if (upnpActive) {
+            (remoteState.trackNumber - 1).coerceAtLeast(0)
+        } else {
+            controller.currentMediaItemIndex
+        }
+
    // ── Remote position interpolation state ──────────────────────────────
    // remoteState.positionMs is only refreshed by ForwardingPlayer's 1Hz
    // SOAP poll (and only when the round-trip completes -- screen-off WiFi
@@ -1,16 +1,11 @@
 package com.fabledsword.minstrel.player.ui

 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.fabledsword.minstrel.likes.data.LikesRepository
 import com.fabledsword.minstrel.player.PlayerController
 import com.fabledsword.minstrel.player.PlayerUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import javax.inject.Inject

 /**
@@ -27,26 +22,11 @@ import javax.inject.Inject
@HiltViewModel
 class PlayerViewModel @Inject constructor(
    private val controller: PlayerController,
-    private val likes: LikesRepository,
 ) : ViewModel() {

    val uiState: StateFlow<PlayerUiState> = controller.uiState
    val dropEvents: SharedFlow<String> = controller.dropEvents

-    /**
-     * Reactive set of liked track ids — the set-based pattern the queue
-     * (and playlist/album/artist detail) uses to color each row's
-     * [com.fabledsword.minstrel.shared.widgets.LikeButton] without a
-     * per-row Flow subscription.
-     */
-    val likedTrackIds: StateFlow<Set<String>> =
-        likes.observeLikedTrackIds()
-            .stateIn(
-                scope = viewModelScope,
-                started = SharingStarted.WhileSubscribed(SHARE_STOP_TIMEOUT_MS),
-                initialValue = emptySet(),
-            )
-
    fun play() = controller.play()
    fun pause() = controller.pause()
    fun seekTo(positionMs: Long) = controller.seekTo(positionMs)
@@ -55,13 +35,4 @@ class PlayerViewModel @Inject constructor(
    fun seekToIndex(index: Int) = controller.seekToIndex(index)
    fun toggleShuffle() = controller.toggleShuffle()
    fun cycleRepeat() = controller.cycleRepeat()
-
-    fun toggleLikeTrack(trackId: String) {
-        val desired = trackId !in likedTrackIds.value
-        viewModelScope.launch {
-            likes.toggleLike(LikesRepository.ENTITY_TRACK, trackId, desired)
-        }
-    }
 }
-
-private const val SHARE_STOP_TIMEOUT_MS = 5_000L
@@ -36,7 +36,6 @@ import com.composables.icons.lucide.Volume2
 import com.fabledsword.minstrel.models.TrackRef
 import com.fabledsword.minstrel.shared.formatDuration
 import com.fabledsword.minstrel.shared.widgets.EmptyState
-import com.fabledsword.minstrel.shared.widgets.LikeButton

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -45,7 +44,6 @@ fun QueueScreen(
    viewModel: PlayerViewModel = hiltViewModel(),
 ) {
    val state by viewModel.uiState.collectAsStateWithLifecycle()
-    val likedTrackIds by viewModel.likedTrackIds.collectAsStateWithLifecycle()
    Scaffold(
        modifier = Modifier.fillMaxSize(),
        topBar = {
@@ -69,9 +67,7 @@ fun QueueScreen(
                QueueList(
                    tracks = state.queue,
                    currentIndex = state.queueIndex,
-                    likedTrackIds = likedTrackIds,
                    onJumpTo = viewModel::seekToIndex,
-                    onToggleLike = viewModel::toggleLikeTrack,
                )
            }
        }
@@ -82,18 +78,14 @@ fun QueueScreen(
 private fun QueueList(
    tracks: List<TrackRef>,
    currentIndex: Int,
-    likedTrackIds: Set<String>,
    onJumpTo: (Int) -> Unit,
-    onToggleLike: (String) -> Unit,
 ) {
    LazyColumn(modifier = Modifier.fillMaxSize()) {
        itemsIndexed(items = tracks, key = { _, track -> track.id }) { index, track ->
            QueueRow(
                track = track,
                isCurrent = index == currentIndex,
-                liked = track.id in likedTrackIds,
                onClick = { onJumpTo(index) },
-                onToggleLike = { onToggleLike(track.id) },
            )
            HorizontalDivider()
        }
@@ -101,13 +93,7 @@ private fun QueueList(
 }

@Composable
-private fun QueueRow(
-    track: TrackRef,
-    isCurrent: Boolean,
-    liked: Boolean,
-    onClick: () -> Unit,
-    onToggleLike: () -> Unit,
-) {
+private fun QueueRow(track: TrackRef, isCurrent: Boolean, onClick: () -> Unit) {
    val highlight = if (isCurrent) {
        MaterialTheme.colorScheme.primary.copy(alpha = HIGHLIGHT_ALPHA)
    } else {
@@ -156,7 +142,6 @@ private fun QueueRow(
                color = MaterialTheme.colorScheme.onSurfaceVariant,
            )
        }
-        LikeButton(liked = liked, onToggle = onToggleLike)
    }
 }

@@ -23,12 +23,8 @@ import com.fabledsword.minstrel.theme.FabledSwordFlatTokens
 * ServerImage + fallback structure was identical at all three sites.
 *
 * [overlay] is a `BoxScope` slot for things drawn on top of the cover
- * (e.g. the `VariantPill` system-playlist label, the play button) —
- * callers can use `Modifier.align(...)` inside it. The overlay sits on
- * an outer, UN-clipped box so corner-anchored widgets are not cut off by
- * [shape]: a `BottomEnd` play button on a `CircleShape` avatar falls in
- * the square's corner, outside the circle, and would otherwise be clipped
- * away. Only the artwork + background are clipped to [shape].
+ * (e.g. the `VariantPill` system-playlist label) — callers can use
+ * `Modifier.align(...)` inside it.
 */
@Composable
 fun CoverTile(
@@ -42,23 +38,18 @@ fun CoverTile(
    overlay: @Composable BoxScope.() -> Unit = {},
 ) {
    Box(
-        modifier = modifier.size(size),
+        modifier = modifier
+            .size(size)
+            .clip(shape)
+            .background(background),
        contentAlignment = Alignment.Center,
    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .clip(shape)
-                .background(background),
-            contentAlignment = Alignment.Center,
+        ServerImage(
+            url = url,
+            contentDescription = contentDescription,
+            modifier = Modifier.fillMaxSize(),
        ) {
-            ServerImage(
-                url = url,
-                contentDescription = contentDescription,
-                modifier = Modifier.fillMaxSize(),
-            ) {
-                fallback()
-            }
+            fallback()
        }
        overlay()
    }
@@ -56,51 +56,4 @@ class BuildPlaylistsRowTest {
        assertTrue(row.none { it is PlaylistRowItem.OfflinePool })
        assertTrue(row.any { it is PlaylistRowItem.Placeholder })
    }
-
-    private fun songsLike(id: String, cached: Boolean) = PlaylistRef(
-        id = id,
-        userId = "u",
-        name = "Songs like $id",
-        systemVariant = "songs_like_artist",
-        trackCount = 25,
-        fullyCached = cached,
-    )
-
-    @Test
-    fun `songs-like no longer appears in the main playlists carousel`() {
-        val owned = listOf(songsLike("a", cached = true), user("u1", cached = true))
-        val row = buildPlaylistsRow(owned, SystemPlaylistsStatus(), offline = false)
-        val reals = row.filterIsInstance<PlaylistRowItem.Real>().map { it.playlist.id }
-        assertTrue("a" !in reals, "songs-like mix leaked into the Playlists row: $reals")
-        assertTrue("u1" in reals)
-    }
-
-    @Test
-    fun `online songs-like row shows every generated mix uncapped`() {
-        // Six generated mixes — the old carousel capped at 3; the dedicated row shows all.
-        val owned = (1..6).map { songsLike("a$it", cached = true) }
-        val row = buildSongsLikeRow(owned, SystemPlaylistsStatus(), offline = false)
-        val reals = row.filterIsInstance<PlaylistRowItem.Real>().map { it.playlist.id }
-        assertEquals((1..6).map { "a$it" }, reals)
-    }
-
-    @Test
-    fun `online songs-like row shows placeholders when none generated`() {
-        val row = buildSongsLikeRow(emptyList(), SystemPlaylistsStatus(), offline = false)
-        assertTrue(row.isNotEmpty())
-        assertTrue(row.all { it is PlaylistRowItem.Placeholder })
-    }
-
-    @Test
-    fun `offline songs-like row shows cached mixes available-first, none hides it`() {
-        val owned = listOf(songsLike("partial", cached = false), songsLike("full", cached = true))
-        val row = buildSongsLikeRow(owned, SystemPlaylistsStatus(), offline = true)
-        val reals = row.filterIsInstance<PlaylistRowItem.Real>().map { it.playlist.id }
-        // Fully-cached songs-like mix (not refreshable) is available; the
-        // un-cached one greys and sorts after. No placeholders offline.
-        assertEquals(listOf("full", "partial"), reals)
-        assertTrue(row.none { it is PlaylistRowItem.Placeholder })
-
-        assertTrue(buildSongsLikeRow(emptyList(), SystemPlaylistsStatus(), offline = true).isEmpty())
-    }
 }
@@ -15,7 +15,6 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"

 	"git.fabledsword.com/bvandeusen/minstrel/internal/config"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/coplay"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/coverart"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/db"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/eventbus"
@@ -26,14 +25,12 @@ import (
 	"git.fabledsword.com/bvandeusen/minstrel/internal/lidarrrequests"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/logging"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/playlists"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/recsettings"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/scrobble"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/scrobble/listenbrainz"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/server"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/similarity"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/subsonic"
 	syncpkg "git.fabledsword.com/bvandeusen/minstrel/internal/sync"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/tags"
 )

 func main() {
@@ -149,16 +146,6 @@ func run() error {
 	coverEnricher := coverart.NewEnricher(pool, logger.With("component", "coverart"), coverSettings)
 	coverEnricher.DataDir = cfg.Storage.DataDir

-	// Recommendation tuning lab (#1250): seeds shipped defaults on first
-	// boot and pushes the daily_mix weights + taste config into package
-	// playlists — must precede the scheduler so the first builds score
-	// with the operator's tuned values, not the pre-push literals.
-	recSettings, err := recsettings.New(ctx, pool, logger.With("component", "recsettings"))
-	if err != nil {
-		logger.Error("recommendation settings service init failed", "err", err)
-		os.Exit(1)
-	}
-
 	// One unified scan chain: library walk → MBID backfill → cover enrich.
 	// Boot-time scan and manual-trigger scans share this path; results land
 	// in scan_runs for the admin overview.
@@ -207,31 +194,6 @@ func run() error {
 	similarityWorker := similarity.NewWorker(pool, listenbrainz.NewClient(), logger.With("component", "similarity"))
 	go similarityWorker.Run(ctx)

-	// Start the household co-play worker (#1533). Recomputes artist–artist
-	// co-occurrence edges (source='user_cooccurrence') from play_events every
-	// 6h — a collaborative candidate arm for the radio/mix pools. Pure local
-	// SQL, no external calls; empty on single-user servers.
-	go coplay.NewWorker(pool, logger.With("component", "coplay")).Run(ctx)
-
-	// Start the tag-enrichment worker (#1490). Reconciles the compiled-in
-	// tag providers with tag_provider_settings, bumps the sources version if
-	// the provider set changed (re-opening settled rows), then drains tracks
-	// needing folksonomy tags on a periodic tick. Standalone (not in the file
-	// scan chain) because tag lookups need only DB fields — MBID / artist /
-	// title — that a scan has already imported.
-	tagSettings, err := tags.NewSettingsService(ctx, pool, logger.With("component", "tags"))
-	if err != nil {
-		logger.Error("tag settings service init failed", "err", err)
-		os.Exit(1)
-	}
-	if newVer, bumped, berr := tagSettings.BumpVersionIfProvidersChanged(ctx); berr != nil {
-		logger.Warn("tags: provider-hash boot check failed", "err", berr)
-	} else if bumped {
-		logger.Info("tags: registered provider set changed; version bumped", "new_version", newVer)
-	}
-	tagEnricher := tags.NewEnricher(pool, logger.With("component", "tags"), tagSettings)
-	go tags.NewWorker(tagEnricher, logger.With("component", "tags")).Run(ctx)
-
 	// Start the GC worker. Runs every 1h and sweeps lifecycle tables
 	// that have no writer-side close path or retention policy:
 	// orphan play_events, stale play_sessions, expired
@@ -332,8 +294,6 @@ func run() error {
 	}, cfg.Events, cfg.Recommendation, cfg.Storage.DataDir, cfg.Branding, coverEnricher, coverSettings, scanner, scanCfg)
 	srv.Bus = bus
 	srv.PlaylistScheduler = playlistScheduler
-	srv.RecSettings = recSettings
-	srv.TagSettings = tagSettings
 	srv.StreamSecret = cfg.StreamSecret
 	httpServer := &http.Server{
 		Addr:              cfg.Server.Address,
@@ -1,202 +0,0 @@
-// Admin recommendation-trends endpoint (#1251): weekly per-surface
-// outcome series with tuning-audit markers — the verify half of the
-// tune→verify loop the tuning lab (#1250) opens. Aggregated across
-// all users because the knobs are global; rows carry rates only.
-package api
-
-import (
-	"encoding/json"
-	"net/http"
-	"sort"
-	"strconv"
-	"time"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
-)
-
-const (
-	trendsDefaultWeeks = 12
-	trendsMaxWeeks     = 52
-	// trendsAuditFetchCap bounds the audit fetch; markers older than
-	// the window are dropped in Go. Far above any real knob-turn count
-	// inside a year.
-	trendsAuditFetchCap = 500
-)
-
-// trendPoint is one week of one surface family's outcomes.
-type trendPoint struct {
-	WeekStart     string  `json:"week_start"` // ISO date (Monday)
-	Plays         int64   `json:"plays"`
-	Skips         int64   `json:"skips"`
-	SkipRate      float64 `json:"skip_rate"`
-	AvgCompletion float64 `json:"avg_completion"`
-	// TasteHitRate is the share of plays whose track's artist carries a
-	// positive weight in the player's current taste profile — a drifted
-	// but retroactive read on whether the surface feeds taste-fitting
-	// tracks.
-	TasteHitRate float64 `json:"taste_hit_rate"`
-	// completionN carries the completion sample count through same-week
-	// merges so avg_completion stays sample-weighted; not serialized.
-	completionN int64
-}
-
-// trendSeries is one surface family's weekly series.
-type trendSeries struct {
-	Key    string       `json:"key"`
-	Label  string       `json:"label"`
-	Intent string       `json:"intent"` // go_to | discovery | direct; "" for the manual baseline
-	Plays  int64        `json:"plays"`  // window total, for sorting/volume-gating
-	Points []trendPoint `json:"points"`
-}
-
-// trendMarker is one tuning-audit event annotated on the timeline.
-type trendMarker struct {
-	ChangedAt string          `json:"changed_at"`
-	Scope     string          `json:"scope"`
-	Action    string          `json:"action"`
-	Changes   json.RawMessage `json:"changes"`
-}
-
-type trendsResp struct {
-	Weeks   int           `json:"weeks"`
-	Series  []trendSeries `json:"series"`
-	Markers []trendMarker `json:"markers"`
-}
-
-// handleGetRecommendationTrends implements
-// GET /api/admin/recommendation-trends?weeks=N (default 12, cap 52).
-func (h *handlers) handleGetRecommendationTrends(w http.ResponseWriter, r *http.Request) {
-	weeks := trendsDefaultWeeks
-	if v := r.URL.Query().Get("weeks"); v != "" {
-		n, err := strconv.Atoi(v)
-		if err != nil || n < 1 {
-			writeErr(w, apierror.BadRequest("bad_request", "invalid weeks"))
-			return
-		}
-		if n > trendsMaxWeeks {
-			n = trendsMaxWeeks
-		}
-		weeks = n
-	}
-
-	q := dbq.New(h.pool)
-	rows, err := q.RecommendationWeeklyTrends(r.Context(), int32(weeks))
-	if err != nil {
-		h.logger.Error("api: recommendation trends", "err", err)
-		writeErr(w, apierror.InternalMsg("lookup failed", err))
-		return
-	}
-	audits, err := q.ListTuningAudit(r.Context(), trendsAuditFetchCap)
-	if err != nil {
-		h.logger.Error("api: recommendation trends audit", "err", err)
-		writeErr(w, apierror.InternalMsg("lookup failed", err))
-		return
-	}
-
-	writeJSON(w, http.StatusOK, buildTrendsResponse(weeks, time.Now().UTC(), rows, audits))
-}
-
-// buildTrendsResponse folds weekly rows into per-family series and
-// windows the audit markers. Split from the handler for pure-unit
-// testability.
-func buildTrendsResponse(
-	weeks int, now time.Time,
-	rows []dbq.RecommendationWeeklyTrendsRow,
-	audits []dbq.RecommendationTuningAudit,
-) trendsResp {
-	type accum struct {
-		fam    recFamily
-		plays  int64
-		points []trendPoint
-	}
-	families := map[string]*accum{}
-	for _, row := range rows {
-		fam := recFamily{key: "manual", label: "Manual library plays"}
-		if row.Source != nil && *row.Source != "" {
-			fam = bucketRecSource(*row.Source)
-		}
-		acc, ok := families[fam.key]
-		if !ok {
-			acc = &accum{fam: fam}
-			families[fam.key] = acc
-		}
-		acc.plays += row.Plays
-		p := trendPoint{
-			WeekStart:     row.WeekStart.Time.Format("2006-01-02"),
-			Plays:         row.Plays,
-			Skips:         row.Skips,
-			AvgCompletion: row.AvgCompletion,
-			completionN:   row.CompletionN,
-		}
-		if row.Plays > 0 {
-			p.SkipRate = float64(row.Skips) / float64(row.Plays)
-			p.TasteHitRate = float64(row.TasteHits) / float64(row.Plays)
-		}
-		// Same family can arrive as several raw sources (radio:<uuid>);
-		// merge same-week points play-weighted.
-		if n := len(acc.points); n > 0 && acc.points[n-1].WeekStart == p.WeekStart {
-			acc.points[n-1] = mergeTrendPoints(acc.points[n-1], p)
-		} else {
-			acc.points = append(acc.points, p)
-		}
-	}
-
-	resp := trendsResp{Weeks: weeks, Series: []trendSeries{}, Markers: []trendMarker{}}
-	for _, acc := range families {
-		resp.Series = append(resp.Series, trendSeries{
-			Key:    acc.fam.key,
-			Label:  acc.fam.label,
-			Intent: acc.fam.intent,
-			Plays:  acc.plays,
-			Points: acc.points,
-		})
-	}
-	sort.Slice(resp.Series, func(i, j int) bool {
-		if resp.Series[i].Plays != resp.Series[j].Plays {
-			return resp.Series[i].Plays > resp.Series[j].Plays
-		}
-		return resp.Series[i].Key < resp.Series[j].Key
-	})
-
-	cutoff := now.Add(-time.Duration(weeks) * 7 * 24 * time.Hour)
-	for _, a := range audits {
-		if a.ChangedAt.Time.Before(cutoff) {
-			continue
-		}
-		resp.Markers = append(resp.Markers, trendMarker{
-			ChangedAt: a.ChangedAt.Time.UTC().Format(time.RFC3339),
-			Scope:     a.Scope,
-			Action:    a.Action,
-			Changes:   json.RawMessage(a.Changes),
-		})
-	}
-	// ListTuningAudit returns newest-first; the timeline reads better
-	// oldest-first.
-	sort.Slice(resp.Markers, func(i, j int) bool {
-		return resp.Markers[i].ChangedAt < resp.Markers[j].ChangedAt
-	})
-	return resp
-}
-
-// mergeTrendPoints combines two same-week points of one family:
-// counts add, skip/taste rates re-derive from the merged counts, and
-// avg_completion is weighted by each side's completion sample count.
-func mergeTrendPoints(a, b trendPoint) trendPoint {
-	out := trendPoint{
-		WeekStart:   a.WeekStart,
-		Plays:       a.Plays + b.Plays,
-		Skips:       a.Skips + b.Skips,
-		completionN: a.completionN + b.completionN,
-	}
-	if out.Plays > 0 {
-		out.SkipRate = float64(out.Skips) / float64(out.Plays)
-		out.TasteHitRate = (a.TasteHitRate*float64(a.Plays) + b.TasteHitRate*float64(b.Plays)) /
-			float64(out.Plays)
-	}
-	if out.completionN > 0 {
-		out.AvgCompletion = (a.AvgCompletion*float64(a.completionN) + b.AvgCompletion*float64(b.completionN)) /
-			float64(out.completionN)
-	}
-	return out
-}
@@ -1,152 +0,0 @@
-package api
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/go-chi/chi/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
-)
-
-func date(s string) pgtype.Date {
-	t, _ := time.Parse("2006-01-02", s)
-	return pgtype.Date{Time: t, Valid: true}
-}
-
-func TestBuildTrendsResponse_SeriesMergingAndMarkers(t *testing.T) {
-	src := func(s string) *string { return &s }
-	now := time.Date(2026, 7, 3, 12, 0, 0, 0, time.UTC)
-	rows := []dbq.RecommendationWeeklyTrendsRow{
-		// Two radio session sources in the same week collapse into one
-		// family point; completion weighting by sample count.
-		{WeekStart: date("2026-06-22"), Source: src("radio:aaaa"),
-			Plays: 3, Skips: 1, CompletionN: 3, AvgCompletion: 0.6, TasteHits: 3},
-		{WeekStart: date("2026-06-22"), Source: src("radio:bbbb"),
-			Plays: 1, Skips: 1, CompletionN: 1, AvgCompletion: 0.2, TasteHits: 0},
-		{WeekStart: date("2026-06-29"), Source: src("radio:aaaa"),
-			Plays: 2, Skips: 0, CompletionN: 2, AvgCompletion: 0.9, TasteHits: 1},
-		// NULL source = manual baseline family.
-		{WeekStart: date("2026-06-29"), Source: nil,
-			Plays: 5, Skips: 1, CompletionN: 5, AvgCompletion: 0.8, TasteHits: 4},
-	}
-	audits := []dbq.RecommendationTuningAudit{
-		{ID: 2, ChangedAt: pgtype.Timestamptz{Time: now.Add(-24 * time.Hour), Valid: true},
-			Scope: "radio", Action: "update", Changes: []byte(`[{"field":"taste_weight","old":1,"new":2}]`)},
-		// Older than the window → dropped.
-		{ID: 1, ChangedAt: pgtype.Timestamptz{Time: now.Add(-100 * 7 * 24 * time.Hour), Valid: true},
-			Scope: "taste", Action: "reset", Changes: []byte(`[]`)},
-	}
-
-	resp := buildTrendsResponse(12, now, rows, audits)
-
-	if len(resp.Series) != 2 {
-		t.Fatalf("series = %d, want 2 (radio + manual)", len(resp.Series))
-	}
-	radio := resp.Series[0] // 6 plays > manual's 5 → sorted first
-	if radio.Key != "radio" || radio.Plays != 6 {
-		t.Fatalf("series[0] = %s/%d, want radio/6", radio.Key, radio.Plays)
-	}
-	if len(radio.Points) != 2 {
-		t.Fatalf("radio points = %d, want 2 weeks", len(radio.Points))
-	}
-	wk1 := radio.Points[0]
-	if wk1.WeekStart != "2026-06-22" || wk1.Plays != 4 || wk1.Skips != 2 {
-		t.Errorf("week1 = %+v, want 2026-06-22 with 4 plays / 2 skips", wk1)
-	}
-	if wk1.SkipRate != 0.5 {
-		t.Errorf("week1 skip_rate = %v, want 0.5", wk1.SkipRate)
-	}
-	// Completion weighted by sample count: (0.6*3 + 0.2*1) / 4 = 0.5.
-	if wk1.AvgCompletion < 0.49 || wk1.AvgCompletion > 0.51 {
-		t.Errorf("week1 avg_completion = %v, want 0.5", wk1.AvgCompletion)
-	}
-	// Taste hits: 3 of 4 plays.
-	if wk1.TasteHitRate != 0.75 {
-		t.Errorf("week1 taste_hit_rate = %v, want 0.75", wk1.TasteHitRate)
-	}
-	if manual := resp.Series[1]; manual.Key != "manual" || manual.Intent != "" {
-		t.Errorf("series[1] = %+v, want the manual baseline family", manual)
-	}
-
-	if len(resp.Markers) != 1 {
-		t.Fatalf("markers = %d, want 1 (out-of-window marker dropped)", len(resp.Markers))
-	}
-	if resp.Markers[0].Scope != "radio" || resp.Markers[0].Action != "update" {
-		t.Errorf("marker = %+v, want radio/update", resp.Markers[0])
-	}
-}
-
-func newTrendsRouter(h *handlers) chi.Router {
-	r := chi.NewRouter()
-	r.Get("/api/admin/recommendation-trends", h.handleGetRecommendationTrends)
-	return r
-}
-
-func TestRecommendationTrends_EndToEnd(t *testing.T) {
-	h, pool := testHandlers(t)
-	user := seedUser(t, pool, "trends", "pw", true)
-	artist := seedArtist(t, pool, "TrendArtist")
-	album := seedAlbum(t, pool, artist.ID, "TrendAlbum", 2020)
-	tk := seedTrack(t, pool, album.ID, artist.ID, "TrendTrack", 1, 200000)
-	session := seedPlaySession(t, pool, user.ID, time.Now())
-
-	// Positive taste weight for the artist → plays count as taste hits.
-	if _, err := pool.Exec(context.Background(),
-		`INSERT INTO taste_profile_artists (user_id, artist_id, weight) VALUES ($1, $2, 1.5)`,
-		user.ID, artist.ID); err != nil {
-		t.Fatalf("seed taste profile: %v", err)
-	}
-	radio := "radio"
-	seedSourcedPlay(t, h, user.ID, tk.ID, session, &radio, nil, 0.9, false)
-	// A knob turn to mark the timeline.
-	if err := h.recSettings.UpdateProfile(context.Background(), "radio",
-		map[string]float64{"taste_weight": 2}); err != nil {
-		t.Fatalf("UpdateProfile: %v", err)
-	}
-
-	req := httptest.NewRequest(http.MethodGet, "/api/admin/recommendation-trends", nil)
-	rec := httptest.NewRecorder()
-	newTrendsRouter(h).ServeHTTP(rec, req)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status = %d, want 200 (%s)", rec.Code, rec.Body.String())
-	}
-	var resp trendsResp
-	if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("decode: %v", err)
-	}
-	if resp.Weeks != trendsDefaultWeeks {
-		t.Errorf("weeks = %d, want %d", resp.Weeks, trendsDefaultWeeks)
-	}
-	var radioSeries *trendSeries
-	for i := range resp.Series {
-		if resp.Series[i].Key == "radio" {
-			radioSeries = &resp.Series[i]
-		}
-	}
-	if radioSeries == nil || len(radioSeries.Points) != 1 {
-		t.Fatalf("radio series = %+v, want one point", radioSeries)
-	}
-	if radioSeries.Points[0].TasteHitRate != 1.0 {
-		t.Errorf("taste_hit_rate = %v, want 1.0 (positive-weight artist)",
-			radioSeries.Points[0].TasteHitRate)
-	}
-	if len(resp.Markers) != 1 || resp.Markers[0].Scope != "radio" {
-		t.Errorf("markers = %+v, want the radio knob turn", resp.Markers)
-	}
-}
-
-func TestRecommendationTrends_InvalidWeeks(t *testing.T) {
-	h, _ := testHandlers(t)
-	req := httptest.NewRequest(http.MethodGet, "/api/admin/recommendation-trends?weeks=zero", nil)
-	rec := httptest.NewRecorder()
-	newTrendsRouter(h).ServeHTTP(rec, req)
-	if rec.Code != http.StatusBadRequest {
-		t.Errorf("status = %d, want 400", rec.Code)
-	}
-}
@@ -1,160 +0,0 @@
-// Admin recommendation-tuning endpoints (#1250): the defaults-
-// discovery lab. GET returns current values + shipped defaults for
-// every scope; PATCH applies a partial update to one scope; reset
-// restores a scope to shipped defaults. Every change writes an audit
-// row (consumed by the metrics trend view, #1251).
-package api
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-
-	"github.com/go-chi/chi/v5"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/recommendation"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/recsettings"
-)
-
-// weightsResp is one weight profile on the wire, keyed by the same
-// snake_case field names the PATCH body accepts.
-type weightsResp struct {
-	BaseWeight        float64 `json:"base_weight"`
-	LikeBoost         float64 `json:"like_boost"`
-	RecencyWeight     float64 `json:"recency_weight"`
-	SkipPenalty       float64 `json:"skip_penalty"`
-	JitterMagnitude   float64 `json:"jitter_magnitude"`
-	ContextWeight     float64 `json:"context_weight"`
-	SimilarityWeight  float64 `json:"similarity_weight"`
-	TasteWeight       float64 `json:"taste_weight"`
-	ContextTimeWeight float64 `json:"context_time_weight"`
-}
-
-func weightsRespFrom(w recommendation.ScoringWeights) weightsResp {
-	return weightsResp{
-		BaseWeight:        w.BaseWeight,
-		LikeBoost:         w.LikeBoost,
-		RecencyWeight:     w.RecencyWeight,
-		SkipPenalty:       w.SkipPenalty,
-		JitterMagnitude:   w.JitterMagnitude,
-		ContextWeight:     w.ContextWeight,
-		SimilarityWeight:  w.SimilarityWeight,
-		TasteWeight:       w.TasteWeight,
-		ContextTimeWeight: w.ContextTimeWeight,
-	}
-}
-
-type tasteTuningResp struct {
-	HalfLifeDays       float64 `json:"half_life_days"`
-	EngagementHardSkip float64 `json:"engagement_hard_skip"`
-	EngagementNeutral  float64 `json:"engagement_neutral"`
-	EngagementFull     float64 `json:"engagement_full"`
-	EnrichedTagScale   float64 `json:"enriched_tag_scale"`
-	EraScale           float64 `json:"era_scale"`
-	MoodScale          float64 `json:"mood_scale"`
-}
-
-func tasteRespFrom(t recsettings.TasteTuning) tasteTuningResp {
-	return tasteTuningResp{
-		HalfLifeDays:       t.HalfLifeDays,
-		EngagementHardSkip: t.EngagementHardSkip,
-		EngagementNeutral:  t.EngagementNeutral,
-		EngagementFull:     t.EngagementFull,
-		EnrichedTagScale:   t.EnrichedTagScale,
-		EraScale:           t.EraScale,
-		MoodScale:          t.MoodScale,
-	}
-}
-
-// tuningSnapshot is both the GET response and the post-mutation echo:
-// current values alongside shipped defaults so the card can mark
-// which knobs deviate.
-type tuningSnapshot struct {
-	Profiles map[string]weightsResp `json:"profiles"`
-	Taste    tasteTuningResp        `json:"taste"`
-	Shipped  struct {
-		Profiles map[string]weightsResp `json:"profiles"`
-		Taste    tasteTuningResp        `json:"taste"`
-	} `json:"shipped"`
-}
-
-func (h *handlers) tuningSnapshot() tuningSnapshot {
-	var out tuningSnapshot
-	out.Profiles = map[string]weightsResp{
-		recsettings.ScopeRadio:    weightsRespFrom(h.recSettings.Weights(recsettings.ScopeRadio)),
-		recsettings.ScopeDailyMix: weightsRespFrom(h.recSettings.Weights(recsettings.ScopeDailyMix)),
-	}
-	out.Taste = tasteRespFrom(h.recSettings.Taste())
-	out.Shipped.Profiles = map[string]weightsResp{
-		recsettings.ScopeRadio:    weightsRespFrom(recsettings.ShippedRadioWeights()),
-		recsettings.ScopeDailyMix: weightsRespFrom(recsettings.ShippedDailyMixWeights()),
-	}
-	out.Shipped.Taste = tasteRespFrom(recsettings.ShippedTasteTuning())
-	return out
-}
-
-// handleGetRecommendationTuning implements GET /api/admin/recommendation-tuning.
-func (h *handlers) handleGetRecommendationTuning(w http.ResponseWriter, _ *http.Request) {
-	writeJSON(w, http.StatusOK, h.tuningSnapshot())
-}
-
-// patchTuningReq carries the partial update: field name → new value,
-// using the same snake_case names the GET response emits.
-type patchTuningReq struct {
-	Values map[string]float64 `json:"values"`
-}
-
-// handlePatchRecommendationTuning implements
-// PATCH /api/admin/recommendation-tuning/{scope}.
-func (h *handlers) handlePatchRecommendationTuning(w http.ResponseWriter, r *http.Request) {
-	scope := chi.URLParam(r, "scope")
-	var body patchTuningReq
-	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-		writeErr(w, apierror.BadRequest("bad_body", "invalid JSON"))
-		return
-	}
-	if len(body.Values) == 0 {
-		writeErr(w, apierror.BadRequest("bad_body", "values is empty"))
-		return
-	}
-
-	var err error
-	if scope == recsettings.ScopeTaste {
-		err = h.recSettings.UpdateTaste(r.Context(), body.Values)
-	} else {
-		err = h.recSettings.UpdateProfile(r.Context(), scope, body.Values)
-	}
-	if err != nil {
-		writeTuningErr(w, h, scope, err)
-		return
-	}
-	writeJSON(w, http.StatusOK, h.tuningSnapshot())
-}
-
-// handleResetRecommendationTuning implements
-// POST /api/admin/recommendation-tuning/{scope}/reset.
-func (h *handlers) handleResetRecommendationTuning(w http.ResponseWriter, r *http.Request) {
-	scope := chi.URLParam(r, "scope")
-	if err := h.recSettings.Reset(r.Context(), scope); err != nil {
-		writeTuningErr(w, h, scope, err)
-		return
-	}
-	writeJSON(w, http.StatusOK, h.tuningSnapshot())
-}
-
-// writeTuningErr maps recsettings validation errors to 400s and
-// everything else to a logged 500.
-func writeTuningErr(w http.ResponseWriter, h *handlers, scope string, err error) {
-	switch {
-	case errors.Is(err, recsettings.ErrUnknownScope):
-		writeErr(w, &apierror.Error{
-			Status: http.StatusNotFound, Code: "not_found", Message: "no such tuning scope",
-		})
-	case errors.Is(err, recsettings.ErrUnknownField), errors.Is(err, recsettings.ErrOutOfRange):
-		writeErr(w, apierror.BadRequest("invalid_tuning", err.Error()))
-	default:
-		h.logger.Error("admin: recommendation tuning", "scope", scope, "err", err)
-		writeErr(w, apierror.InternalMsg("tuning update failed", err))
-	}
-}
@@ -1,110 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/go-chi/chi/v5"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/recsettings"
-)
-
-func newTuningRouter(h *handlers) chi.Router {
-	r := chi.NewRouter()
-	r.Get("/api/admin/recommendation-tuning", h.handleGetRecommendationTuning)
-	r.Patch("/api/admin/recommendation-tuning/{scope}", h.handlePatchRecommendationTuning)
-	r.Post("/api/admin/recommendation-tuning/{scope}/reset", h.handleResetRecommendationTuning)
-	return r
-}
-
-func decodeTuning(t *testing.T, rec *httptest.ResponseRecorder) tuningSnapshot {
-	t.Helper()
-	var snap tuningSnapshot
-	if err := json.Unmarshal(rec.Body.Bytes(), &snap); err != nil {
-		t.Fatalf("decode: %v", err)
-	}
-	return snap
-}
-
-func TestRecommendationTuning_GetReturnsShippedDefaults(t *testing.T) {
-	h, _ := testHandlers(t)
-	req := httptest.NewRequest(http.MethodGet, "/api/admin/recommendation-tuning", nil)
-	rec := httptest.NewRecorder()
-	newTuningRouter(h).ServeHTTP(rec, req)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status = %d, want 200", rec.Code)
-	}
-	snap := decodeTuning(t, rec)
-	if snap.Profiles["radio"].TasteWeight != 1.0 || snap.Profiles["daily_mix"].TasteWeight != 1.5 {
-		t.Errorf("profiles = %+v, want shipped taste weights 1.0 / 1.5", snap.Profiles)
-	}
-	if snap.Taste.HalfLifeDays != 75 {
-		t.Errorf("taste half-life = %v, want shipped 75", snap.Taste.HalfLifeDays)
-	}
-	if snap.Shipped.Profiles["radio"] != snap.Profiles["radio"] {
-		t.Error("untouched values must equal shipped defaults")
-	}
-}
-
-func TestRecommendationTuning_PatchAndReset(t *testing.T) {
-	h, _ := testHandlers(t)
-	r := newTuningRouter(h)
-
-	req := httptest.NewRequest(http.MethodPatch, "/api/admin/recommendation-tuning/radio",
-		strings.NewReader(`{"values":{"taste_weight": 2.5}}`))
-	rec := httptest.NewRecorder()
-	r.ServeHTTP(rec, req)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("patch status = %d, want 200 (%s)", rec.Code, rec.Body.String())
-	}
-	snap := decodeTuning(t, rec)
-	if snap.Profiles["radio"].TasteWeight != 2.5 {
-		t.Errorf("patched taste_weight = %v, want 2.5", snap.Profiles["radio"].TasteWeight)
-	}
-	// The change is live for the radio scoring path.
-	if got := h.recSettings.Weights(recsettings.ScopeRadio).TasteWeight; got != 2.5 {
-		t.Errorf("service taste_weight = %v, want 2.5 (live effect)", got)
-	}
-
-	req = httptest.NewRequest(http.MethodPost, "/api/admin/recommendation-tuning/radio/reset", nil)
-	rec = httptest.NewRecorder()
-	r.ServeHTTP(rec, req)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("reset status = %d, want 200", rec.Code)
-	}
-	snap = decodeTuning(t, rec)
-	if snap.Profiles["radio"].TasteWeight != 1.0 {
-		t.Errorf("reset taste_weight = %v, want shipped 1.0", snap.Profiles["radio"].TasteWeight)
-	}
-}
-
-func TestRecommendationTuning_PatchErrors(t *testing.T) {
-	h, _ := testHandlers(t)
-	r := newTuningRouter(h)
-	cases := []struct {
-		name, path, body string
-		want             int
-	}{
-		{"unknown scope", "/api/admin/recommendation-tuning/banana",
-			`{"values":{"taste_weight":1}}`, http.StatusNotFound},
-		{"unknown field", "/api/admin/recommendation-tuning/radio",
-			`{"values":{"vibes":1}}`, http.StatusBadRequest},
-		{"out of range", "/api/admin/recommendation-tuning/taste",
-			`{"values":{"engagement_neutral":2}}`, http.StatusBadRequest},
-		{"empty values", "/api/admin/recommendation-tuning/radio",
-			`{"values":{}}`, http.StatusBadRequest},
-		{"bad json", "/api/admin/recommendation-tuning/radio",
-			`{`, http.StatusBadRequest},
-	}
-	for _, c := range cases {
-		req := httptest.NewRequest(http.MethodPatch, c.path, strings.NewReader(c.body))
-		rec := httptest.NewRecorder()
-		r.ServeHTTP(rec, req)
-		if rec.Code != c.want {
-			t.Errorf("%s: status = %d, want %d", c.name, rec.Code, c.want)
-		}
-	}
-}
@@ -1,153 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/go-chi/chi/v5"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/tags"
-)
-
-// tagSourceResp is the wire shape for one tag-enrichment provider in the
-// GET /api/admin/tag-sources list. Mirrors the cover-sources admin surface
-// (admin_cover_sources.go) — a separate, independent settings card so a new
-// tag source is added without touching art settings (#1490).
-type tagSourceResp struct {
-	ID             string   `json:"id"`
-	DisplayName    string   `json:"display_name"`
-	RequiresAPIKey bool     `json:"requires_api_key"`
-	Supports       []string `json:"supports"`
-	Enabled        bool     `json:"enabled"`
-	APIKeySet      bool     `json:"api_key_set"`
-	DisplayOrder   int32    `json:"display_order"`
-	Testable       bool     `json:"testable"`
-}
-
-func tagSourceRespFrom(info tags.ProviderInfo) tagSourceResp {
-	supports := info.Supports
-	if supports == nil {
-		supports = []string{}
-	}
-	return tagSourceResp{
-		ID:             info.ID,
-		DisplayName:    info.DisplayName,
-		RequiresAPIKey: info.RequiresAPIKey,
-		Supports:       supports,
-		Enabled:        info.Enabled,
-		APIKeySet:      info.APIKeySet,
-		DisplayOrder:   info.DisplayOrder,
-		Testable:       info.Testable,
-	}
-}
-
-type tagSourcesListResp struct {
-	Providers      []tagSourceResp `json:"providers"`
-	SourcesVersion int32           `json:"sources_version"`
-}
-
-// handleListTagSources implements GET /api/admin/tag-sources.
-func (h *handlers) handleListTagSources(w http.ResponseWriter, _ *http.Request) {
-	infos := h.tagSettings.ListProviderInfo()
-	out := tagSourcesListResp{
-		Providers:      make([]tagSourceResp, 0, len(infos)),
-		SourcesVersion: h.tagSettings.CurrentVersion(),
-	}
-	for _, info := range infos {
-		out.Providers = append(out.Providers, tagSourceRespFrom(info))
-	}
-	writeJSON(w, http.StatusOK, out)
-}
-
-// updateTagSourceReq is the PATCH body. nil pointers mean "leave
-// unchanged"; non-nil sets (empty api_key clears).
-type updateTagSourceReq struct {
-	Enabled *bool   `json:"enabled,omitempty"`
-	APIKey  *string `json:"api_key,omitempty"`
-}
-
-type updateTagSourceResp struct {
-	tagSourceResp
-	VersionBumped bool `json:"version_bumped"`
-}
-
-// handleUpdateTagSource implements PATCH /api/admin/tag-sources/{provider_id}.
-func (h *handlers) handleUpdateTagSource(w http.ResponseWriter, r *http.Request) {
-	id := chi.URLParam(r, "provider_id")
-
-	var body updateTagSourceReq
-	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-		writeErr(w, apierror.BadRequest("bad_body", "invalid JSON"))
-		return
-	}
-
-	bumped, err := h.tagSettings.UpdateProvider(r.Context(), id, tags.ProviderUpdatePatch{
-		Enabled: body.Enabled,
-		APIKey:  body.APIKey,
-	})
-	if err != nil {
-		if errors.Is(err, tags.ErrProviderNotFound) {
-			writeErr(w, &apierror.Error{Status: http.StatusNotFound, Code: "not_found", Message: "no such provider"})
-			return
-		}
-		h.logger.Error("admin: update tag source", "id", id, "err", err)
-		writeErr(w, apierror.InternalMsg("update failed", err))
-		return
-	}
-
-	var found tagSourceResp
-	for _, info := range h.tagSettings.ListProviderInfo() {
-		if info.ID == id {
-			found = tagSourceRespFrom(info)
-			break
-		}
-	}
-	writeJSON(w, http.StatusOK, updateTagSourceResp{tagSourceResp: found, VersionBumped: bumped})
-}
-
-type testTagSourceResp struct {
-	OK         bool   `json:"ok"`
-	DurationMs int64  `json:"duration_ms,omitempty"`
-	Error      string `json:"error,omitempty"`
-}
-
-// handleTestTagSource implements POST /api/admin/tag-sources/{provider_id}/test.
-func (h *handlers) handleTestTagSource(w http.ResponseWriter, r *http.Request) {
-	id := chi.URLParam(r, "provider_id")
-
-	start := time.Now()
-	err := h.tagSettings.TestProvider(r.Context(), id)
-	duration := time.Since(start).Milliseconds()
-
-	if err == nil {
-		writeJSON(w, http.StatusOK, testTagSourceResp{OK: true, DurationMs: duration})
-		return
-	}
-	if errors.Is(err, tags.ErrProviderNotFound) {
-		writeErr(w, &apierror.Error{Status: http.StatusNotFound, Code: "not_found", Message: "no such provider"})
-		return
-	}
-	// Not testable, or the test failed — both surface as ok=false with a
-	// 200 (the operation completed; the result is data, not an error).
-	writeJSON(w, http.StatusOK, testTagSourceResp{OK: false, DurationMs: duration, Error: err.Error()})
-}
-
-type researchTagsResp struct {
-	SourcesVersion int32 `json:"sources_version"`
-}
-
-// handleResearchTags implements POST /api/admin/tag-sources/research: bump
-// the sources version so every settled ('none') track becomes eligible for
-// a re-enrichment pass, then the background worker re-processes them.
-func (h *handlers) handleResearchTags(w http.ResponseWriter, r *http.Request) {
-	newVer, err := h.tagSettings.BumpVersion(r.Context())
-	if err != nil {
-		h.logger.Error("admin: research tags", "err", err)
-		writeErr(w, apierror.InternalMsg("research failed", err))
-		return
-	}
-	writeJSON(w, http.StatusOK, researchTagsResp{SourcesVersion: newVer})
-}
@@ -1,243 +0,0 @@
-package api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"testing"
-
-	"github.com/go-chi/chi/v5"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/auth"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/tags"
-)
-
-// apiTestTagProvider is a minimal TrackTagProvider for api-package tests.
-// Does not implement TestableProvider.
-type apiTestTagProvider struct {
-	id      string
-	display string
-}
-
-func (p *apiTestTagProvider) ID() string                              { return p.id }
-func (p *apiTestTagProvider) DisplayName() string                     { return p.display }
-func (p *apiTestTagProvider) RequiresAPIKey() bool                    { return false }
-func (p *apiTestTagProvider) DefaultEnabled() bool                    { return true }
-func (p *apiTestTagProvider) Configure(_ tags.ProviderSettings) error { return nil }
-func (p *apiTestTagProvider) FetchTrackTags(_ context.Context, _ tags.TrackRef) ([]tags.Tag, error) {
-	return []tags.Tag{{Name: "x", Weight: 1}}, nil
-}
-
-// apiTestTestableTagProvider also implements TestableProvider.
-type apiTestTestableTagProvider struct {
-	apiTestTagProvider
-}
-
-func (p *apiTestTestableTagProvider) TestConnection(_ context.Context) error { return nil }
-
-func newAdminTagSourcesRouter(h *handlers) chi.Router {
-	r := chi.NewRouter()
-	r.Route("/api/admin", func(admin chi.Router) {
-		admin.Use(auth.RequireAdmin())
-		admin.Get("/tag-sources", h.handleListTagSources)
-		admin.Patch("/tag-sources/{provider_id}", h.handleUpdateTagSource)
-		admin.Post("/tag-sources/{provider_id}/test", h.handleTestTagSource)
-	})
-	return r
-}
-
-// testHandlersWithTagSettings installs a tags.SettingsService backed by the
-// test DB. Register the needed fake providers BEFORE calling this, and pair
-// with tags.ResetRegistryForTests in t.Cleanup.
-func testHandlersWithTagSettings(t *testing.T) *handlers {
-	t.Helper()
-	h, pool := testHandlers(t)
-	s, err := tags.NewSettingsService(context.Background(), pool, h.logger)
-	if err != nil {
-		t.Fatalf("NewSettingsService: %v", err)
-	}
-	h.tagSettings = s
-	return h
-}
-
-func TestAdminListTagSources_ReturnsRegisteredProviders(t *testing.T) {
-	if os.Getenv("MINSTREL_TEST_DATABASE_URL") == "" {
-		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
-	}
-	tags.ResetRegistryForTests()
-	t.Cleanup(tags.ResetRegistryForTests)
-	tags.Register(&apiTestTagProvider{id: "test-tag-prov", display: "Test Tag Provider"})
-
-	h := testHandlersWithTagSettings(t)
-	admin := seedUser(t, h.pool, "tslist", "pw", true)
-
-	req := httptest.NewRequest(http.MethodGet, "/api/admin/tag-sources", nil)
-	req = withUser(req, admin)
-	rec := httptest.NewRecorder()
-	newAdminTagSourcesRouter(h).ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status = %d, want 200; body=%s", rec.Code, rec.Body.String())
-	}
-	var resp tagSourcesListResp
-	if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("decode: %v", err)
-	}
-	if len(resp.Providers) != 1 || resp.Providers[0].ID != "test-tag-prov" {
-		t.Fatalf("providers = %+v, want 1 (test-tag-prov)", resp.Providers)
-	}
-	found := false
-	for _, s := range resp.Providers[0].Supports {
-		if s == "track_tags" {
-			found = true
-		}
-	}
-	if !found {
-		t.Errorf("supports = %v, want to include track_tags", resp.Providers[0].Supports)
-	}
-	if resp.Providers[0].Testable {
-		t.Error("testable = true, want false (no TestConnection)")
-	}
-}
-
-func TestAdminUpdateTagSource_FlippingEnabledBumpsVersion(t *testing.T) {
-	if os.Getenv("MINSTREL_TEST_DATABASE_URL") == "" {
-		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
-	}
-	tags.ResetRegistryForTests()
-	t.Cleanup(tags.ResetRegistryForTests)
-	tags.Register(&apiTestTagProvider{id: "flip-tag", display: "Flip Tag"})
-
-	h := testHandlersWithTagSettings(t)
-	admin := seedUser(t, h.pool, "tsflip", "pw", true)
-
-	disabled := false
-	body, _ := json.Marshal(updateTagSourceReq{Enabled: &disabled})
-	req := httptest.NewRequest(http.MethodPatch, "/api/admin/tag-sources/flip-tag", bytes.NewReader(body))
-	req.Header.Set("Content-Type", "application/json")
-	req = withUser(req, admin)
-	rec := httptest.NewRecorder()
-	newAdminTagSourcesRouter(h).ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status = %d, want 200; body=%s", rec.Code, rec.Body.String())
-	}
-	var resp updateTagSourceResp
-	if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("decode: %v", err)
-	}
-	if !resp.VersionBumped {
-		t.Error("version_bumped = false, want true after flipping enabled")
-	}
-}
-
-func TestAdminUpdateTagSource_KeyOnlyDoesNotBump(t *testing.T) {
-	if os.Getenv("MINSTREL_TEST_DATABASE_URL") == "" {
-		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
-	}
-	tags.ResetRegistryForTests()
-	t.Cleanup(tags.ResetRegistryForTests)
-	tags.Register(&apiTestTagProvider{id: "key-tag", display: "Key Tag"})
-
-	h := testHandlersWithTagSettings(t)
-	admin := seedUser(t, h.pool, "tskey", "pw", true)
-
-	newKey := "newkey"
-	body, _ := json.Marshal(updateTagSourceReq{APIKey: &newKey})
-	req := httptest.NewRequest(http.MethodPatch, "/api/admin/tag-sources/key-tag", bytes.NewReader(body))
-	req.Header.Set("Content-Type", "application/json")
-	req = withUser(req, admin)
-	rec := httptest.NewRecorder()
-	newAdminTagSourcesRouter(h).ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status = %d, want 200; body=%s", rec.Code, rec.Body.String())
-	}
-	var resp updateTagSourceResp
-	if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("decode: %v", err)
-	}
-	if resp.VersionBumped {
-		t.Error("version_bumped = true, want false for key-only change")
-	}
-	if !resp.APIKeySet {
-		t.Error("api_key_set = false, want true after setting key")
-	}
-}
-
-func TestAdminUpdateTagSource_UnknownProvider404(t *testing.T) {
-	if os.Getenv("MINSTREL_TEST_DATABASE_URL") == "" {
-		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
-	}
-	tags.ResetRegistryForTests()
-	t.Cleanup(tags.ResetRegistryForTests)
-
-	h := testHandlersWithTagSettings(t)
-	admin := seedUser(t, h.pool, "ts404", "pw", true)
-
-	body, _ := json.Marshal(updateTagSourceReq{})
-	req := httptest.NewRequest(http.MethodPatch, "/api/admin/tag-sources/missing", bytes.NewReader(body))
-	req.Header.Set("Content-Type", "application/json")
-	req = withUser(req, admin)
-	rec := httptest.NewRecorder()
-	newAdminTagSourcesRouter(h).ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusNotFound {
-		t.Fatalf("status = %d, want 404; body=%s", rec.Code, rec.Body.String())
-	}
-}
-
-func TestAdminTestTagSource_NonAdminReturns403(t *testing.T) {
-	if os.Getenv("MINSTREL_TEST_DATABASE_URL") == "" {
-		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
-	}
-	tags.ResetRegistryForTests()
-	t.Cleanup(tags.ResetRegistryForTests)
-	tags.Register(&apiTestTestableTagProvider{apiTestTagProvider{id: "testable-tag", display: "Testable Tag"}})
-
-	h := testHandlersWithTagSettings(t)
-	nonAdmin := seedUser(t, h.pool, "tsnoadmin", "pw", false)
-
-	req := httptest.NewRequest(http.MethodPost, "/api/admin/tag-sources/testable-tag/test", nil)
-	req = withUser(req, nonAdmin)
-	rec := httptest.NewRecorder()
-	newAdminTagSourcesRouter(h).ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusForbidden {
-		t.Fatalf("status = %d, want 403; body=%s", rec.Code, rec.Body.String())
-	}
-}
-
-func TestAdminTestTagSource_NotTestableReturnsOkFalse(t *testing.T) {
-	if os.Getenv("MINSTREL_TEST_DATABASE_URL") == "" {
-		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
-	}
-	tags.ResetRegistryForTests()
-	t.Cleanup(tags.ResetRegistryForTests)
-	tags.Register(&apiTestTagProvider{id: "nontestable-tag", display: "Non-Testable Tag"})
-
-	h := testHandlersWithTagSettings(t)
-	admin := seedUser(t, h.pool, "tsntest", "pw", true)
-
-	req := httptest.NewRequest(http.MethodPost, "/api/admin/tag-sources/nontestable-tag/test", nil)
-	req = withUser(req, admin)
-	rec := httptest.NewRecorder()
-	newAdminTagSourcesRouter(h).ServeHTTP(rec, req)
-
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status = %d, want 200; body=%s", rec.Code, rec.Body.String())
-	}
-	var resp testTagSourceResp
-	if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("decode: %v", err)
-	}
-	if resp.OK {
-		t.Error("ok = true, want false for non-testable provider")
-	}
-	if resp.Error == "" {
-		t.Error("error string empty, want a message")
-	}
-}
@@ -22,19 +22,16 @@ import (
 	"git.fabledsword.com/bvandeusen/minstrel/internal/mailer"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/playevents"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/playlists"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/recsettings"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/tags"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/tracks"
 )

 // Mount attaches /api/* handlers to r. Public endpoints (login) are outside
 // RequireUser; everything else is gated by the middleware. The events writer
 // is shared with the Subsonic mount so /rest/scrobble feeds the same store.
-func Mount(r chi.Router, pool *pgxpool.Pool, logger *slog.Logger, events *playevents.Writer, recCfg config.RecommendationConfig, recSettings *recsettings.Service, lidarrCfg *lidarrconfig.Service, lidarrReqs *lidarrrequests.Service, lidarrQuar *lidarrquarantine.Service, tracksSvc *tracks.Service, playlistsSvc *playlists.Service, coverEnricher *coverart.Enricher, coverSettings *coverart.SettingsService, tagSettings *tags.SettingsService, scanner *library.Scanner, scanCfg library.RunScanConfig, dataDir string, sender mailer.Sender, bus *eventbus.Bus, playlistScheduler *playlists.Scheduler, streamSecret []byte) {
+func Mount(r chi.Router, pool *pgxpool.Pool, logger *slog.Logger, events *playevents.Writer, recCfg config.RecommendationConfig, lidarrCfg *lidarrconfig.Service, lidarrReqs *lidarrrequests.Service, lidarrQuar *lidarrquarantine.Service, tracksSvc *tracks.Service, playlistsSvc *playlists.Service, coverEnricher *coverart.Enricher, coverSettings *coverart.SettingsService, scanner *library.Scanner, scanCfg library.RunScanConfig, dataDir string, sender mailer.Sender, bus *eventbus.Bus, playlistScheduler *playlists.Scheduler, streamSecret []byte) {
 	rng := rand.New(rand.NewSource(rand.Int63()))
 	h := &handlers{
 		pool: pool, logger: logger, events: events, recCfg: recCfg,
-		recSettings:       recSettings,
 		rng:               rng.Float64,
 		lidarrCfg:         lidarrCfg,
 		lidarrRequests:    lidarrReqs,
@@ -43,7 +40,6 @@ func Mount(r chi.Router, pool *pgxpool.Pool, logger *slog.Logger, events *playev
 		playlists:         playlistsSvc,
 		coverart:          coverEnricher,
 		coverSettings:     coverSettings,
-		tagSettings:       tagSettings,
 		scanner:           scanner,
 		scanCfg:           scanCfg,
 		dataDir:           dataDir,
@@ -202,22 +198,9 @@ func Mount(r chi.Router, pool *pgxpool.Pool, logger *slog.Logger, events *playev
 				admin.Post("/cover-sources/{provider_id}/test", h.handleTestCoverSource)
 				admin.Post("/cover-sources/research", h.handleResearchMissingArt)

-				admin.Get("/tag-sources", h.handleListTagSources)
-				admin.Patch("/tag-sources/{provider_id}", h.handleUpdateTagSource)
-				admin.Post("/tag-sources/{provider_id}/test", h.handleTestTagSource)
-				admin.Post("/tag-sources/research", h.handleResearchTags)
-
 				admin.Get("/smtp-config", h.handleGetSMTPConfig)
 				admin.Put("/smtp-config", h.handleUpdateSMTPConfig)
 				admin.Post("/smtp-config/test", h.handleTestSMTPConfig)
-
-				// Recommendation tuning lab (#1250): scoring-weight
-				// profiles + taste-build knobs, DB-backed, live effect.
-				admin.Get("/recommendation-tuning", h.handleGetRecommendationTuning)
-				admin.Patch("/recommendation-tuning/{scope}", h.handlePatchRecommendationTuning)
-				admin.Post("/recommendation-tuning/{scope}/reset", h.handleResetRecommendationTuning)
-				// Weekly outcome trends + knob-turn markers (#1251).
-				admin.Get("/recommendation-trends", h.handleGetRecommendationTrends)
 			})

 			authed.Get("/playlists", h.handleListPlaylists)
@@ -240,7 +223,6 @@ type handlers struct {
 	logger            *slog.Logger
 	events            *playevents.Writer
 	recCfg            config.RecommendationConfig
-	recSettings       *recsettings.Service
 	rng               func() float64
 	lidarrCfg         *lidarrconfig.Service
 	lidarrRequests    *lidarrrequests.Service
@@ -249,7 +231,6 @@ type handlers struct {
 	playlists         *playlists.Service
 	coverart          *coverart.Enricher
 	coverSettings     *coverart.SettingsService
-	tagSettings       *tags.SettingsService
 	scanner           *library.Scanner
 	scanCfg           library.RunScanConfig
 	dataDir           string
@@ -29,7 +29,6 @@ import (
 	"git.fabledsword.com/bvandeusen/minstrel/internal/mailer"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/playevents"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/playlists"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/recsettings"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/tracks"
 )

@@ -57,12 +56,11 @@ func testHandlers(t *testing.T) (*handlers, *pgxpool.Pool) {
 	dbtest.ResetDB(t, pool)
 	w := playevents.NewWriter(pool, logger, 30*time.Minute, 0.5, 30000)
 	recCfg := config.RecommendationConfig{
+		BaseWeight: 1.0, LikeBoost: 2.0, RecencyWeight: 1.0,
+		SkipPenalty: 1.0, JitterMagnitude: 0.1,
+		ContextWeight: 2.0, SimilarityWeight: 2.0,
 		RecentlyPlayedHours: 1, RadioSize: 50, RadioSizeMax: 200,
 	}
-	recSettings, err := recsettings.New(context.Background(), pool, logger)
-	if err != nil {
-		t.Fatalf("recsettings: %v", err)
-	}
 	lidarrCfg := lidarrconfig.New(pool)
 	lidarrReqs := lidarrrequests.NewService(pool, lidarrCfg, nil, nil)
 	lidarrQuar := lidarrquarantine.NewService(pool, lidarrCfg, nil)
@@ -72,7 +70,7 @@ func testHandlers(t *testing.T) (*handlers, *pgxpool.Pool) {
 	dataDir := t.TempDir()
 	tracksSvc := tracks.NewService(pool, logger, nil, dataDir)
 	playlistsSvc := playlists.NewService(pool, logger, dataDir)
-	h := &handlers{pool: pool, logger: logger, events: w, recCfg: recCfg, recSettings: recSettings, rng: func() float64 { return 0.5 }, lidarrCfg: lidarrCfg, lidarrRequests: lidarrReqs, lidarrQuarantine: lidarrQuar, tracks: tracksSvc, playlists: playlistsSvc, dataDir: dataDir, scanner: nil, scanCfg: library.RunScanConfig{}, mailer: &mailer.FakeSender{}}
+	h := &handlers{pool: pool, logger: logger, events: w, recCfg: recCfg, rng: func() float64 { return 0.5 }, lidarrCfg: lidarrCfg, lidarrRequests: lidarrReqs, lidarrQuarantine: lidarrQuar, tracks: tracksSvc, playlists: playlistsSvc, dataDir: dataDir, scanner: nil, scanCfg: library.RunScanConfig{}, mailer: &mailer.FakeSender{}}
 	return h, pool
 }

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"net/http"
-	"strings"
 	"time"

 	"github.com/jackc/pgx/v5"
@@ -25,33 +24,6 @@ type eventRequest struct {
 	// / "discover" feed the system-playlist rotation dedup (#415);
 	// absent / "" for library, user-playlist, radio, Subsonic.
 	Source *string `json:"source"`
-	// DeviceClass is the client's self-reported device class (#1551),
-	// normalized + stored per play to condition radio on the current device.
-	DeviceClass *string `json:"device_class"`
-}
-
-// knownDeviceClasses whitelists the device classes the context-affinity facet
-// buckets by (#1551). A client sends one; anything unrecognized normalizes to
-// "other", and empty/absent to "" (stored NULL → excluded from the device
-// dimension). Kept permissive (no DB CHECK) so a new client class is one
-// whitelist entry, not a migration.
-var knownDeviceClasses = map[string]bool{
-	"mobile": true, "tablet": true, "desktop": true,
-	"web": true, "tv": true, "watch": true,
-}
-
-func normalizeDeviceClass(dc *string) string {
-	if dc == nil {
-		return ""
-	}
-	s := strings.ToLower(strings.TrimSpace(*dc))
-	if s == "" {
-		return ""
-	}
-	if knownDeviceClasses[s] {
-		return s
-	}
-	return "other"
 }

 type playStartedResponse struct {
@@ -59,26 +31,6 @@ type playStartedResponse struct {
 	SessionID   string `json:"session_id"`
 }

-// eventFutureSkew is the tolerated client-clock drift into the future
-// before a timestamp is treated as bogus and replaced with now.
-const eventFutureSkew = 5 * time.Minute
-
-// clampEventTime bounds a client-supplied event timestamp to sanity:
-// no earlier than the account's creation (offline replays can
-// legitimately be days old, but no play can predate the user) and no
-// later than now + a small skew allowance. Unbounded client clocks
-// previously let a skewed device write arbitrarily old plays, which
-// poisoned Rediscover's "not played in 6 months" ordering (#1246).
-func clampEventTime(at, userCreatedAt, now time.Time) time.Time {
-	if at.Before(userCreatedAt) {
-		return userCreatedAt
-	}
-	if at.After(now.Add(eventFutureSkew)) {
-		return now
-	}
-	return at
-}
-
 type okResponse struct {
 	OK bool `json:"ok"`
 }
@@ -100,7 +52,7 @@ func (h *handlers) handleEvents(w http.ResponseWriter, r *http.Request) {
 			writeErr(w, apierror.BadRequest("bad_request", "invalid `at` timestamp"))
 			return
 		}
-		at = clampEventTime(parsed.UTC(), user.CreatedAt.Time, time.Now().UTC())
+		at = parsed
 	}
 	clientID := ""
 	if req.ClientID != nil {
@@ -142,9 +94,7 @@ func (h *handlers) handleEventPlayStarted(
 	if req.Source != nil {
 		source = *req.Source
 	}
-	deviceClass := normalizeDeviceClass(req.DeviceClass)
-	res, err := h.events.RecordPlayStartedWithSource(
-		r.Context(), user.ID, trackID, clientID, source, deviceClass, at)
+	res, err := h.events.RecordPlayStartedWithSource(r.Context(), user.ID, trackID, clientID, source, at)
 	if err != nil {
 		h.logger.Error("api: events: play_started", "err", err)
 		writeErr(w, apierror.InternalMsg("record failed", err))
@@ -189,8 +139,7 @@ func (h *handlers) handleEventPlayOffline(
 		source = *req.Source
 	}
 	if err := h.events.RecordOfflinePlay(
-		r.Context(), user.ID, trackID, clientID, source,
-		normalizeDeviceClass(req.DeviceClass), at, *req.DurationPlayedMs,
+		r.Context(), user.ID, trackID, clientID, source, at, *req.DurationPlayedMs,
 	); err != nil {
 		h.logger.Error("api: events: play_offline", "err", err)
 		writeErr(w, apierror.InternalMsg("record failed", err))
@@ -465,7 +465,7 @@ func TestRoutesRegisteredInMount(t *testing.T) {
 	r := chi.NewRouter()
 	w := playevents.NewWriter(h.pool, slog.New(slog.NewTextHandler(io.Discard, nil)),
 		30*time.Minute, 0.5, 30000)
-	Mount(r, h.pool, h.logger, w, config.RecommendationConfig{RadioSize: 50, RadioSizeMax: 200, RecentlyPlayedHours: 1}, h.recSettings, h.lidarrCfg, h.lidarrRequests, h.lidarrQuarantine, h.tracks, h.playlists, h.coverart, h.coverSettings, h.tagSettings, h.scanner, h.scanCfg, h.dataDir, nil, eventbus.New(), nil, nil)
+	Mount(r, h.pool, h.logger, w, config.RecommendationConfig{RadioSize: 50, RadioSizeMax: 200, RecentlyPlayedHours: 1}, h.lidarrCfg, h.lidarrRequests, h.lidarrQuarantine, h.tracks, h.playlists, h.coverart, h.coverSettings, h.scanner, h.scanCfg, h.dataDir, nil, eventbus.New(), nil, nil)

 	paths := []string{
 		"/api/artists",
@@ -2,9 +2,7 @@ package api

 import (
 	"net/http"
-	"sort"
 	"strconv"
-	"strings"

 	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
@@ -13,142 +11,28 @@ import (
 const (
 	recMetricsDefaultDays = 30
 	recMetricsMaxDays     = 365
-
-	// recMetricsLowVolume marks a family as low-confidence rather than
-	// hiding it: with fewer plays than this a skip rate is anecdote, not
-	// signal, but silently dropping the row would misread as "surface
-	// unused". The web renders low-confidence rows dimmed.
-	recMetricsLowVolume = 20
 )

-// Surface intents (milestone #127): each family is judged against its
-// job, not one global bar — discovery mixes are EXPECTED to run higher
-// skip rates than the go-to surfaces.
-const (
-	intentGoTo      = "go_to"
-	intentDiscovery = "discovery"
-	intentDirect    = "direct"
-)
-
-// surfaceMetric is one bucketed surface family's outcomes.
-type surfaceMetric struct {
-	Key           string  `json:"key"`            // stable family key ("for_you", "radio", …)
-	Label         string  `json:"label"`          // display label
-	Plays         int64   `json:"plays"`          // plays launched from this family
+// recommendationMetric is one recommendation surface's outcomes.
+type recommendationMetric struct {
+	Source        string  `json:"source"`         // 'for_you' | 'discover' | mixes
+	Plays         int64   `json:"plays"`          // plays launched from this surface
 	Skips         int64   `json:"skips"`          // of those, marked skipped
 	SkipRate      float64 `json:"skip_rate"`      // skips / plays, [0,1]
 	AvgCompletion float64 `json:"avg_completion"` // mean completion ratio, [0,1]
-	LowConfidence bool    `json:"low_confidence"` // plays < recMetricsLowVolume
-	// Breakdown splits the family into the pick-kind populations its
-	// builder stamped (#1249, generalized #1270): For You's taste/fresh,
-	// Discover's buckets, tier1-3 for tiered mixes — plus earlier plays
-	// that predate attribution. Present only when the family has at
-	// least one attributed play; the parent row remains the sum of its
-	// breakdown.
-	Breakdown []surfaceMetric `json:"breakdown,omitempty"`
-}
-
-// surfaceGroup is one intent band of surface families.
-type surfaceGroup struct {
-	Intent   string          `json:"intent"` // go_to | discovery | direct
-	Label    string          `json:"label"`
-	Surfaces []surfaceMetric `json:"surfaces"`
 }

 type recommendationMetricsResp struct {
-	WindowDays int `json:"window_days"`
-	// Baseline is the control group: plays the user picked manually
-	// (source IS NULL). Surfaces are judged as deltas against it; nil
-	// when the window holds no manual plays.
-	Baseline *surfaceMetric `json:"baseline"`
-	Groups   []surfaceGroup `json:"groups"`
-}
-
-// recFamily is the bucketing target for a raw play_events.source value.
-type recFamily struct {
-	key    string
-	label  string
-	intent string
-}
-
-// bucketRecSource maps a raw client-stamped source string to its stable
-// family. One-off sources (album:<uuid>, radio:<uuid>) collapse into
-// their family so the table stays readable at any library size.
-func bucketRecSource(src string) recFamily {
-	switch {
-	case src == "for_you":
-		return recFamily{"for_you", "For You", intentGoTo}
-	case src == "songs_like_artist":
-		return recFamily{"songs_like_artist", "Songs like…", intentGoTo}
-	case src == "radio" || strings.HasPrefix(src, "radio:"):
-		return recFamily{"radio", "Radio", intentGoTo}
-	case src == "discover":
-		return recFamily{"discover", "Discover", intentDiscovery}
-	case src == "deep_cuts":
-		return recFamily{"deep_cuts", "Deep cuts", intentDiscovery}
-	case src == "rediscover":
-		return recFamily{"rediscover", "Rediscover", intentDiscovery}
-	case src == "new_for_you":
-		return recFamily{"new_for_you", "New for you", intentDiscovery}
-	case src == "on_this_day":
-		return recFamily{"on_this_day", "On this day", intentDiscovery}
-	case src == "first_listens":
-		return recFamily{"first_listens", "First listens", intentDiscovery}
-	case strings.HasPrefix(src, "album:"):
-		return recFamily{"direct_album", "Album plays", intentDirect}
-	case strings.HasPrefix(src, "artist:"):
-		return recFamily{"direct_artist", "Artist plays", intentDirect}
-	case strings.HasPrefix(src, "offline:"):
-		return recFamily{"offline", "Offline pools", intentDirect}
-	case strings.HasPrefix(src, "home:"):
-		return recFamily{"home", "Home sections", intentDirect}
-	case src == "history":
-		return recFamily{"history", "History", intentDirect}
-	default:
-		return recFamily{"other", "Other", intentDirect}
-	}
-}
-
-// familyAccum merges raw source rows into one family, carrying the
-// completion sample count so the merged average stays play-weighted.
-type familyAccum struct {
-	fam         recFamily
-	plays       int64
-	skips       int64
-	completionN int64
-	// completionSum is avg*count re-expanded, so merging N raw rows
-	// reduces to a single weighted division at the end.
-	completionSum float64
-}
-
-func (a *familyAccum) add(row dbq.RecommendationSourceMetricsForUserRow) {
-	a.plays += row.Plays
-	a.skips += row.Skips
-	a.completionN += row.CompletionN
-	a.completionSum += row.AvgCompletion * float64(row.CompletionN)
-}
-
-func (a *familyAccum) metric() surfaceMetric {
-	m := surfaceMetric{
-		Key:           a.fam.key,
-		Label:         a.fam.label,
-		Plays:         a.plays,
-		Skips:         a.skips,
-		LowConfidence: a.plays < recMetricsLowVolume,
-	}
-	if a.plays > 0 {
-		m.SkipRate = float64(a.skips) / float64(a.plays)
-	}
-	if a.completionN > 0 {
-		m.AvgCompletion = a.completionSum / float64(a.completionN)
-	}
-	return m
+	WindowDays int                    `json:"window_days"`
+	Sources    []recommendationMetric `json:"sources"`
 }

 // handleGetRecommendationMetrics implements GET /api/me/recommendation-metrics.
-// Bucketed per-surface-family outcomes for the caller over the last `days`
-// (default 30, capped at 365), grouped by surface intent and anchored by the
-// manual-plays baseline so the numbers are judgeable, not just observable.
+// Per-source play outcomes (plays / skips / skip-rate / avg-completion) for the
+// caller over the last `days` (default 30, capped at 365), so the operator can
+// see which recommendation surfaces are landing and tune the taste weights.
+// Only plays tagged with a system-playlist source count; library/radio plays
+// (no source) are excluded.
 func (h *handlers) handleGetRecommendationMetrics(w http.ResponseWriter, r *http.Request) {
 	caller, ok := requireUser(w, r)
 	if !ok {
@@ -167,142 +51,28 @@ func (h *handlers) handleGetRecommendationMetrics(w http.ResponseWriter, r *http
 		return
 	}

-	writeJSON(w, http.StatusOK, bucketMetricsResponse(days, rows))
-}
-
-// pickKindLabels is the display vocabulary for play_events.pick_kind
-// values (mirrors the CHECK in migration 0041). Every system mix that
-// stamps provenance gets its breakdown from this one map — adding a
-// stamping mix needs no metrics change.
-var pickKindLabels = map[string]string{
-	"taste":         "Taste picks",
-	"fresh":         "Fresh picks",
-	"dormant":       "Dormant artists",
-	"taste_unheard": "Taste-matched",
-	"cross_user":    "Liked by others",
-	"random":        "Random unheard",
-	"tier1":         "Tier 1 (exact)",
-	"tier2":         "Tier 2 (relaxed)",
-	"tier3":         "Tier 3 (stretched)",
-}
-
-// pickKindOrder fixes breakdown row order; unattributed ("", i.e. NULL
-// pick_kind — plays recorded before the mix stamped provenance, or
-// whose track had rotated out of the snapshot at ingestion) renders
-// last, kept visible so the parent row's sums stay transparent instead
-// of silently shrinking. The DB CHECK gates pick_kind to exactly this
-// vocabulary, so iterating the list is exhaustive.
-var pickKindOrder = []string{
-	"taste", "fresh", "dormant", "taste_unheard", "cross_user", "random",
-	"tier1", "tier2", "tier3", "",
-}
-
-// pickKindFamily derives the sub-family for one (family, pick_kind)
-// population, e.g. ("for_you", "taste") → for_you_taste "Taste picks".
-func pickKindFamily(parent recFamily, kind string) recFamily {
-	if kind == "" {
-		return recFamily{parent.key + "_unattributed", "Earlier plays", parent.intent}
+	out := recommendationMetricsResp{
+		WindowDays: days,
+		Sources:    make([]recommendationMetric, 0, len(rows)),
 	}
-	label, ok := pickKindLabels[kind]
-	if !ok {
-		label = kind
-	}
-	return recFamily{parent.key + "_" + kind, label, parent.intent}
-}
-
-// pickKindBreakdown folds a family's per-pick-kind accums into its
-// Breakdown rows. Attached only when at least one attributed play
-// exists — an all-unattributed breakdown would just repeat the parent
-// row, and families that never stamp (radio, direct plays) stay flat.
-func pickKindBreakdown(picks map[string]*familyAccum) []surfaceMetric {
-	attributed := int64(0)
-	for kind, acc := range picks {
-		if kind != "" {
-			attributed += acc.plays
-		}
-	}
-	if attributed == 0 {
-		return nil
-	}
-	out := make([]surfaceMetric, 0, len(picks))
-	for _, kind := range pickKindOrder {
-		if acc, ok := picks[kind]; ok && acc.plays > 0 {
-			out = append(out, acc.metric())
-		}
-	}
-	return out
-}
-
-// bucketMetricsResponse folds the raw per-source rows into the grouped,
-// baseline-anchored response shape. Split from the handler for pure-unit
-// testability.
-func bucketMetricsResponse(
-	days int, rows []dbq.RecommendationSourceMetricsForUserRow,
-) recommendationMetricsResp {
-	baseline := &familyAccum{fam: recFamily{"manual", "Manual library plays", ""}}
-	families := map[string]*familyAccum{}
-	picks := map[string]map[string]*familyAccum{}
 	for _, row := range rows {
-		if row.Source == nil || *row.Source == "" {
-			baseline.add(row)
-			continue
+		source := ""
+		if row.Source != nil {
+			source = *row.Source
 		}
-		fam := bucketRecSource(*row.Source)
-		acc, exists := families[fam.key]
-		if !exists {
-			acc = &familyAccum{fam: fam}
-			families[fam.key] = acc
+		var skipRate float64
+		if row.Plays > 0 {
+			skipRate = float64(row.Skips) / float64(row.Plays)
 		}
-		acc.add(row)
-		// Accumulate the pick-kind population unconditionally; families
-		// that never stamp end up all-unattributed and get no breakdown.
-		kind := ""
-		if row.PickKind != nil {
-			kind = *row.PickKind
-		}
-		byKind, ok := picks[fam.key]
-		if !ok {
-			byKind = map[string]*familyAccum{}
-			picks[fam.key] = byKind
-		}
-		pick, ok := byKind[kind]
-		if !ok {
-			pick = &familyAccum{fam: pickKindFamily(fam, kind)}
-			byKind[kind] = pick
-		}
-		pick.add(row)
-	}
-
-	resp := recommendationMetricsResp{WindowDays: days, Groups: []surfaceGroup{}}
-	if baseline.plays > 0 {
-		m := baseline.metric()
-		resp.Baseline = &m
-	}
-	for _, g := range []struct{ intent, label string }{
-		{intentGoTo, "Go-to surfaces"},
-		{intentDiscovery, "Discovery mixes"},
-		{intentDirect, "Direct plays"},
-	} {
-		group := surfaceGroup{Intent: g.intent, Label: g.label}
-		for _, acc := range families {
-			if acc.fam.intent == g.intent {
-				m := acc.metric()
-				m.Breakdown = pickKindBreakdown(picks[acc.fam.key])
-				group.Surfaces = append(group.Surfaces, m)
-			}
-		}
-		if len(group.Surfaces) == 0 {
-			continue
-		}
-		sort.Slice(group.Surfaces, func(i, j int) bool {
-			if group.Surfaces[i].Plays != group.Surfaces[j].Plays {
-				return group.Surfaces[i].Plays > group.Surfaces[j].Plays
-			}
-			return group.Surfaces[i].Key < group.Surfaces[j].Key
+		out.Sources = append(out.Sources, recommendationMetric{
+			Source:        source,
+			Plays:         row.Plays,
+			Skips:         row.Skips,
+			SkipRate:      skipRate,
+			AvgCompletion: row.AvgCompletion,
 		})
-		resp.Groups = append(resp.Groups, group)
 	}
-	return resp
+	writeJSON(w, http.StatusOK, out)
 }

 // parseMetricsDays reads the `days` query param (default 30, capped at 365).
@@ -11,8 +11,6 @@ import (

 	"github.com/go-chi/chi/v5"
 	"github.com/jackc/pgx/v5/pgtype"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
 )

 func newMetricsRouter(h *handlers) chi.Router {
@@ -22,19 +20,17 @@ func newMetricsRouter(h *handlers) chi.Router {
 }

 // seedSourcedPlay inserts a play_event with an explicit source + completion +
-// skip flag. A nil source inserts NULL (manual library play → baseline).
-// pickKind is the For You taste/fresh attribution (#1249); nil everywhere
-// except attributed for_you plays.
+// skip flag. A nil source inserts NULL (library/radio play).
 func seedSourcedPlay(
 	t *testing.T, h *handlers, userID, trackID, sessionID pgtype.UUID,
-	source, pickKind *string, completion float64, skipped bool,
+	source *string, completion float64, skipped bool,
 ) {
 	t.Helper()
 	if _, err := h.pool.Exec(context.Background(),
 		`INSERT INTO play_events
-		   (user_id, track_id, session_id, started_at, source, pick_kind, completion_ratio, was_skipped)
-		 VALUES ($1, $2, $3, now(), $4, $5, $6, $7)`,
-		userID, trackID, sessionID, source, pickKind, completion, skipped); err != nil {
+		   (user_id, track_id, session_id, started_at, source, completion_ratio, was_skipped)
+		 VALUES ($1, $2, $3, now(), $4, $5, $6)`,
+		userID, trackID, sessionID, source, completion, skipped); err != nil {
 		t.Fatalf("seed sourced play: %v", err)
 	}
 }
@@ -49,168 +45,7 @@ func TestRecommendationMetrics_NoSession401(t *testing.T) {
 	}
 }

-// findSurface returns the named family from any group, or nil.
-func findSurface(resp recommendationMetricsResp, key string) *surfaceMetric {
-	for _, g := range resp.Groups {
-		for i := range g.Surfaces {
-			if g.Surfaces[i].Key == key {
-				return &g.Surfaces[i]
-			}
-		}
-	}
-	return nil
-}
-
-func TestBucketMetricsResponse_FamiliesGroupsBaseline(t *testing.T) {
-	src := func(s string) *string { return &s }
-	rows := []dbq.RecommendationSourceMetricsForUserRow{
-		{Source: src("for_you"), Plays: 3, Skips: 1, CompletionN: 3, AvgCompletion: 2.0 / 3},
-		// Two radio sessions collapse into one "radio" family; weighted
-		// completion = (0.2*1 + 0.8*1) / 2 = 0.5.
-		{Source: src("radio:aaaa"), Plays: 1, Skips: 1, CompletionN: 1, AvgCompletion: 0.2},
-		{Source: src("radio:bbbb"), Plays: 1, Skips: 0, CompletionN: 1, AvgCompletion: 0.8},
-		{Source: src("album:cccc"), Plays: 1, Skips: 0, CompletionN: 0, AvgCompletion: 0},
-		{Source: src("discover"), Plays: 1, Skips: 0, CompletionN: 1, AvgCompletion: 0.8},
-		// NULL source = manual plays → baseline, not a group row.
-		{Source: nil, Plays: 25, Skips: 5, CompletionN: 20, AvgCompletion: 0.9},
-	}
-	resp := bucketMetricsResponse(recMetricsDefaultDays, rows)
-
-	if resp.Baseline == nil {
-		t.Fatal("baseline missing")
-	}
-	if resp.Baseline.Plays != 25 || resp.Baseline.SkipRate != 0.2 {
-		t.Errorf("baseline = %+v, want plays=25 skip_rate=0.2", resp.Baseline)
-	}
-	if resp.Baseline.LowConfidence {
-		t.Error("baseline with 25 plays should not be low-confidence")
-	}
-
-	radio := findSurface(resp, "radio")
-	if radio == nil {
-		t.Fatal("radio family missing")
-	}
-	if radio.Plays != 2 || radio.Skips != 1 {
-		t.Errorf("radio plays/skips = %d/%d, want 2/1", radio.Plays, radio.Skips)
-	}
-	if radio.AvgCompletion < 0.49 || radio.AvgCompletion > 0.51 {
-		t.Errorf("radio avg_completion = %.3f, want 0.5 (play-weighted merge)", radio.AvgCompletion)
-	}
-	if !radio.LowConfidence {
-		t.Error("radio with 2 plays should be low-confidence")
-	}
-
-	if s := findSurface(resp, "direct_album"); s == nil || s.Plays != 1 {
-		t.Errorf("direct_album = %+v, want plays=1", s)
-	}
-	if s := findSurface(resp, ""); s != nil {
-		t.Error("NULL source must not appear as a surface family")
-	}
-
-	// No attributed (taste/fresh) plays in this fixture → no breakdown;
-	// an all-unattributed breakdown would just repeat the parent row.
-	if fy := findSurface(resp, "for_you"); fy == nil || fy.Breakdown != nil {
-		t.Errorf("for_you breakdown = %+v, want nil without attributed plays", fy)
-	}
-
-	// Group ordering is intent-banded: go_to before discovery before direct.
-	wantOrder := []string{intentGoTo, intentDiscovery, intentDirect}
-	if len(resp.Groups) != len(wantOrder) {
-		t.Fatalf("groups = %d, want %d", len(resp.Groups), len(wantOrder))
-	}
-	for i, g := range resp.Groups {
-		if g.Intent != wantOrder[i] {
-			t.Errorf("group[%d].intent = %s, want %s", i, g.Intent, wantOrder[i])
-		}
-	}
-}
-
-func TestBucketMetricsResponse_ForYouBreakdown(t *testing.T) {
-	src := func(s string) *string { return &s }
-	kind := func(s string) *string { return &s }
-	rows := []dbq.RecommendationSourceMetricsForUserRow{
-		{Source: src("for_you"), PickKind: kind("taste"), Plays: 30, Skips: 3,
-			CompletionN: 30, AvgCompletion: 0.9},
-		{Source: src("for_you"), PickKind: kind("fresh"), Plays: 10, Skips: 4,
-			CompletionN: 10, AvgCompletion: 0.5},
-		// NULL pick_kind = plays that predate attribution.
-		{Source: src("for_you"), Plays: 5, Skips: 1, CompletionN: 5, AvgCompletion: 0.7},
-	}
-	resp := bucketMetricsResponse(recMetricsDefaultDays, rows)
-
-	fy := findSurface(resp, "for_you")
-	if fy == nil {
-		t.Fatal("for_you family missing")
-	}
-	// The parent row stays the sum of its breakdown.
-	if fy.Plays != 45 || fy.Skips != 8 {
-		t.Errorf("for_you plays/skips = %d/%d, want 45/8", fy.Plays, fy.Skips)
-	}
-	if len(fy.Breakdown) != 3 {
-		t.Fatalf("breakdown rows = %d, want 3 (taste, fresh, earlier)", len(fy.Breakdown))
-	}
-	wantKeys := []string{"for_you_taste", "for_you_fresh", "for_you_unattributed"}
-	for i, k := range wantKeys {
-		if fy.Breakdown[i].Key != k {
-			t.Errorf("breakdown[%d].key = %s, want %s", i, fy.Breakdown[i].Key, k)
-		}
-	}
-	taste, fresh := fy.Breakdown[0], fy.Breakdown[1]
-	if taste.Plays != 30 || taste.SkipRate != 0.1 || taste.LowConfidence {
-		t.Errorf("taste = %+v, want plays=30 skip_rate=0.1 confident", taste)
-	}
-	if fresh.Plays != 10 || fresh.SkipRate != 0.4 || !fresh.LowConfidence {
-		t.Errorf("fresh = %+v, want plays=10 skip_rate=0.4 low-confidence", fresh)
-	}
-	// Breakdown rows never appear as their own surface families.
-	if s := findSurface(resp, "for_you_taste"); s != nil {
-		t.Error("for_you_taste must not be a top-level surface")
-	}
-}
-
-func TestBucketMetricsResponse_DiscoverBucketBreakdown(t *testing.T) {
-	// Provenance is standard (#1270): Discover's bucket stamps surface as
-	// a breakdown exactly like For You's taste/fresh — this is what makes
-	// the bucket allocation judgeable instead of a guess.
-	src := func(s string) *string { return &s }
-	kind := func(s string) *string { return &s }
-	rows := []dbq.RecommendationSourceMetricsForUserRow{
-		{Source: src("discover"), PickKind: kind("dormant"), Plays: 8, Skips: 2,
-			CompletionN: 8, AvgCompletion: 0.8},
-		{Source: src("discover"), PickKind: kind("cross_user"), Plays: 6, Skips: 3,
-			CompletionN: 6, AvgCompletion: 0.6},
-		{Source: src("discover"), PickKind: kind("random"), Plays: 4, Skips: 3,
-			CompletionN: 4, AvgCompletion: 0.4},
-		// NULL pick_kind = plays that predate bucket stamping.
-		{Source: src("discover"), Plays: 2, Skips: 0, CompletionN: 2, AvgCompletion: 0.9},
-	}
-	resp := bucketMetricsResponse(recMetricsDefaultDays, rows)
-
-	d := findSurface(resp, "discover")
-	if d == nil {
-		t.Fatal("discover family missing")
-	}
-	if d.Plays != 20 || d.Skips != 8 {
-		t.Errorf("discover plays/skips = %d/%d, want 20/8", d.Plays, d.Skips)
-	}
-	wantKeys := []string{
-		"discover_dormant", "discover_cross_user", "discover_random",
-		"discover_unattributed",
-	}
-	if len(d.Breakdown) != len(wantKeys) {
-		t.Fatalf("breakdown rows = %d, want %d", len(d.Breakdown), len(wantKeys))
-	}
-	for i, k := range wantKeys {
-		if d.Breakdown[i].Key != k {
-			t.Errorf("breakdown[%d].key = %s, want %s", i, d.Breakdown[i].Key, k)
-		}
-	}
-	if b := d.Breakdown[0]; b.Label != "Dormant artists" || b.Plays != 8 {
-		t.Errorf("dormant row = %+v, want label=Dormant artists plays=8", b)
-	}
-}
-
-func TestRecommendationMetrics_BucketsWithBaseline(t *testing.T) {
+func TestRecommendationMetrics_AggregatesBySourceExcludingNull(t *testing.T) {
 	if os.Getenv("MINSTREL_TEST_DATABASE_URL") == "" {
 		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
 	}
@@ -222,17 +57,15 @@ func TestRecommendationMetrics_BucketsWithBaseline(t *testing.T) {
 	session := seedPlaySession(t, pool, user.ID, time.Now())

 	forYou := "for_you"
-	radioA := "radio:11111111-1111-1111-1111-111111111111"
-	taste, fresh := "taste", "fresh"
+	discover := "discover"
 	// for_you: 3 plays, 1 skipped; completions 1.0, 0.95, 0.05 → mean 0.6667.
-	// Two attributed as taste picks, the skipped one as a fresh pick (#1249).
-	seedSourcedPlay(t, h, user.ID, tk.ID, session, &forYou, &taste, 1.0, false)
-	seedSourcedPlay(t, h, user.ID, tk.ID, session, &forYou, &taste, 0.95, false)
-	seedSourcedPlay(t, h, user.ID, tk.ID, session, &forYou, &fresh, 0.05, true)
-	// A radio session play collapses into the "radio" family.
-	seedSourcedPlay(t, h, user.ID, tk.ID, session, &radioA, nil, 0.8, false)
-	// Manual play (NULL source) — the baseline row.
-	seedSourcedPlay(t, h, user.ID, tk.ID, session, nil, nil, 1.0, false)
+	seedSourcedPlay(t, h, user.ID, tk.ID, session, &forYou, 1.0, false)
+	seedSourcedPlay(t, h, user.ID, tk.ID, session, &forYou, 0.95, false)
+	seedSourcedPlay(t, h, user.ID, tk.ID, session, &forYou, 0.05, true)
+	// discover: 1 play.
+	seedSourcedPlay(t, h, user.ID, tk.ID, session, &discover, 0.8, false)
+	// library play (NULL source) — must be excluded.
+	seedSourcedPlay(t, h, user.ID, tk.ID, session, nil, 1.0, false)

 	req := httptest.NewRequest(http.MethodGet, "/api/me/recommendation-metrics", nil)
 	req = withUser(req, user)
@@ -249,11 +82,15 @@ func TestRecommendationMetrics_BucketsWithBaseline(t *testing.T) {
 	if resp.WindowDays != recMetricsDefaultDays {
 		t.Errorf("window_days = %d, want %d", resp.WindowDays, recMetricsDefaultDays)
 	}
-	if resp.Baseline == nil || resp.Baseline.Plays != 1 {
-		t.Fatalf("baseline = %+v, want plays=1", resp.Baseline)
+	bySource := map[string]recommendationMetric{}
+	for _, m := range resp.Sources {
+		bySource[m.Source] = m
 	}
-	fy := findSurface(resp, "for_you")
-	if fy == nil {
+	if _, present := bySource[""]; present {
+		t.Error("NULL-source (library) plays should be excluded")
+	}
+	fy, ok := bySource["for_you"]
+	if !ok {
 		t.Fatal("for_you metrics missing")
 	}
 	if fy.Plays != 3 || fy.Skips != 1 {
@@ -265,17 +102,7 @@ func TestRecommendationMetrics_BucketsWithBaseline(t *testing.T) {
 	if fy.AvgCompletion < 0.66 || fy.AvgCompletion > 0.67 {
 		t.Errorf("for_you avg_completion = %.4f, want ~0.6667", fy.AvgCompletion)
 	}
-	// Pick-kind attribution surfaces as the For You breakdown (#1249).
-	if len(fy.Breakdown) != 2 {
-		t.Fatalf("for_you breakdown rows = %d, want 2 (taste, fresh)", len(fy.Breakdown))
-	}
-	if b := fy.Breakdown[0]; b.Key != "for_you_taste" || b.Plays != 2 || b.Skips != 0 {
-		t.Errorf("breakdown[0] = %+v, want for_you_taste plays=2 skips=0", b)
-	}
-	if b := fy.Breakdown[1]; b.Key != "for_you_fresh" || b.Plays != 1 || b.Skips != 1 {
-		t.Errorf("breakdown[1] = %+v, want for_you_fresh plays=1 skips=1", b)
-	}
-	if radio := findSurface(resp, "radio"); radio == nil || radio.Plays != 1 {
-		t.Errorf("radio family = %+v, want plays=1 (collapsed from radio:<uuid>)", radio)
+	if d, ok := bySource["discover"]; !ok || d.Plays != 1 || d.Skips != 0 {
+		t.Errorf("discover metrics = %+v, want plays=1 skips=0", d)
 	}
 }
@@ -1,7 +1,6 @@
 package api

 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"log/slog"
@@ -16,7 +15,6 @@ import (
 	"git.fabledsword.com/bvandeusen/minstrel/internal/apierror"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/recommendation"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/recsettings"
 )

 // RadioResponse is the body of GET /api/radio.
@@ -82,9 +80,6 @@ func (h *handlers) handleRadio(w http.ResponseWriter, r *http.Request) {
 	}

 	currentVec := loadCurrentSessionVector(r, q, user.ID, h.logger)
-	// Condition on the current device (#1551): the latest play's device is a
-	// cheap, request-free proxy for what the user is on right now.
-	currentVec.DeviceClass = latestDeviceClass(r.Context(), q, user.ID, h.logger)

 	exclude := parseExcludeParam(r.URL.Query().Get("exclude"))
 	limits := recommendation.DefaultCandidateSourceLimits()
@@ -105,9 +100,16 @@ func (h *handlers) handleRadio(w http.ResponseWriter, r *http.Request) {
 		}
 	}

-	// Scoring weights come from the DB-backed tuning lab (#1250) —
-	// read per request so an admin change takes effect live.
-	weights := h.recSettings.Weights(recsettings.ScopeRadio)
+	weights := recommendation.ScoringWeights{
+		BaseWeight:       h.recCfg.BaseWeight,
+		LikeBoost:        h.recCfg.LikeBoost,
+		RecencyWeight:    h.recCfg.RecencyWeight,
+		SkipPenalty:      h.recCfg.SkipPenalty,
+		JitterMagnitude:  h.recCfg.JitterMagnitude,
+		ContextWeight:    h.recCfg.ContextWeight,
+		SimilarityWeight: h.recCfg.SimilarityWeight,
+		TasteWeight:      h.recCfg.TasteWeight,
+	}
 	picks := recommendation.Shuffle(candidates, weights, time.Now().UTC(), h.rng, limit-1)

 	out := make([]TrackRef, 0, len(picks)+1)
@@ -154,24 +156,6 @@ func loadCurrentSessionVector(r *http.Request, q *dbq.Queries, userID pgtype.UUI
 	return v
 }

-// latestDeviceClass returns the device_class of the user's most recent play as
-// the "current device" for context conditioning (#1551), or "" when unknown
-// (no plays yet, or the latest play predates device capture). Best-effort: a
-// lookup failure yields a device-agnostic ("") affinity cell.
-func latestDeviceClass(ctx context.Context, q *dbq.Queries, userID pgtype.UUID, logger *slog.Logger) string {
-	dc, err := q.GetLatestPlayDeviceClassForUser(ctx, userID)
-	if err != nil {
-		if !errors.Is(err, pgx.ErrNoRows) {
-			logger.Warn("api: radio: latest device class", "err", err)
-		}
-		return ""
-	}
-	if dc == nil {
-		return ""
-	}
-	return *dc
-}
-
 // parseExcludeParam parses a comma-separated list of UUIDs from the
 // `exclude` query string, silently dropping malformed entries. Returns
 // nil for empty or all-malformed input.
@@ -88,14 +88,20 @@ type EventsConfig struct {
 	SkipMaxDurationPlayedMs int     `yaml:"skip_max_duration_played_ms"`
 }

-// RecommendationConfig holds the radio path's operational knobs. The
-// scoring WEIGHTS moved to DB-backed admin settings (#1250,
-// internal/recsettings) — YAML is bootstrap-only; anything an operator
-// tunes lives in the UI with live effect.
+// RecommendationConfig governs the M3 weighted-shuffle scoring (spec §6).
+// All weights are operator-tunable; defaults match the spec recommendations.
 type RecommendationConfig struct {
-	RecentlyPlayedHours int `yaml:"recently_played_hours"`
-	RadioSize           int `yaml:"radio_size"`
-	RadioSizeMax        int `yaml:"radio_size_max"`
+	BaseWeight          float64 `yaml:"base_weight"`
+	LikeBoost           float64 `yaml:"like_boost"`
+	RecencyWeight       float64 `yaml:"recency_weight"`
+	SkipPenalty         float64 `yaml:"skip_penalty"`
+	JitterMagnitude     float64 `yaml:"jitter_magnitude"`
+	ContextWeight       float64 `yaml:"context_weight"`
+	SimilarityWeight    float64 `yaml:"similarity_weight"`
+	TasteWeight         float64 `yaml:"taste_weight"`
+	RecentlyPlayedHours int     `yaml:"recently_played_hours"`
+	RadioSize           int     `yaml:"radio_size"`
+	RadioSizeMax        int     `yaml:"radio_size_max"`
 }

 func Default() Config {
@@ -114,6 +120,16 @@ func Default() Config {
 			SkipMaxDurationPlayedMs: 30000,
 		},
 		Recommendation: RecommendationConfig{
+			BaseWeight:       1.0,
+			LikeBoost:        2.0,
+			RecencyWeight:    1.0,
+			SkipPenalty:      1.0,
+			JitterMagnitude:  0.1,
+			ContextWeight:    2.0,
+			SimilarityWeight: 2.0,
+			// Radio is seed-directed (the user picked a direction), so taste
+			// is a lighter nudge here than in the daily mixes (1.5).
+			TasteWeight:         1.0,
 			RecentlyPlayedHours: 1,
 			RadioSize:           50,
 			RadioSizeMax:        200,
@@ -1,86 +0,0 @@
-// Package coplay builds household co-play similarity edges (#1533, milestone
-// #160 Opt 5). Minstrel is a single shared-library, multi-user server (no
-// per-user library ACL), so the "household" is the whole instance's user set.
-// A periodic worker recomputes artist–artist co-occurrence from play_events
-// entirely in SQL (no external API) and stores the edges in artist_similarity
-// under source='user_cooccurrence' — the pre-provisioned co-occurrence source
-// from the 0009 schema — which the radio/mix candidate pool consumes as a
-// collaborative arm. Single-user servers produce no edges (the >= 2 co-player
-// gate), so the feature is a graceful no-op there.
-package coplay
-
-import (
-	"context"
-	"log/slog"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
-)
-
-// minJaccard is the co-play edge floor: prune weak pairs and self-limit hub
-// artists, whose large combined-audience denominators pull their Jaccard down.
-// 0.1 keeps only pairs whose co-player overlap is a real fraction of their
-// combined audience.
-const minJaccard = 0.1
-
-// Worker periodically rebuilds the household co-play edge set. Pure local SQL,
-// so there are no rate limits — but the pair self-join is roughly
-// O(users × artists_per_user²), so it ticks slowly: co-listening shifts over
-// days, not minutes, and a frequent rebuild would burn CPU for no fresher
-// signal.
-type Worker struct {
-	pool   *pgxpool.Pool
-	logger *slog.Logger
-	tick   time.Duration
-}
-
-// NewWorker constructs a worker with the production default 6h tick.
-func NewWorker(pool *pgxpool.Pool, logger *slog.Logger) *Worker {
-	return &Worker{pool: pool, logger: logger, tick: 6 * time.Hour}
-}
-
-// Run rebuilds once at startup (so edges exist without waiting a full tick),
-// then every w.tick until ctx is cancelled. Runs in its own goroutine, so a
-// slow initial rebuild never blocks boot.
-func (w *Worker) Run(ctx context.Context) {
-	if err := w.rebuild(ctx); err != nil {
-		w.logger.Error("coplay: initial rebuild failed", "err", err)
-	}
-	t := time.NewTicker(w.tick)
-	defer t.Stop()
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-t.C:
-			if err := w.rebuild(ctx); err != nil {
-				w.logger.Error("coplay: rebuild failed", "err", err)
-			}
-		}
-	}
-}
-
-// rebuild atomic-replaces the user_cooccurrence edge set inside one
-// transaction — delete the old edges, recompute from current play history — so
-// the candidate pool never observes a half-built set.
-func (w *Worker) rebuild(ctx context.Context) error {
-	tx, err := w.pool.Begin(ctx)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = tx.Rollback(ctx) }()
-	q := dbq.New(tx)
-	if err := q.DeleteArtistCoplayEdges(ctx); err != nil {
-		return err
-	}
-	if err := q.InsertArtistCoplayEdges(ctx, minJaccard); err != nil {
-		return err
-	}
-	if err := tx.Commit(ctx); err != nil {
-		return err
-	}
-	w.logger.Debug("coplay: edges rebuilt")
-	return nil
-}
@@ -1,162 +0,0 @@
-package coplay
-
-import (
-	"context"
-	"io"
-	"log/slog"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/db"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/dbtest"
-)
-
-func testPool(t *testing.T) *pgxpool.Pool {
-	t.Helper()
-	if testing.Short() {
-		t.Skip("skipping in -short mode")
-	}
-	dsn := os.Getenv("MINSTREL_TEST_DATABASE_URL")
-	if dsn == "" {
-		t.Skip("MINSTREL_TEST_DATABASE_URL not set")
-	}
-	if err := db.Migrate(dsn, slog.New(slog.NewTextHandler(io.Discard, nil))); err != nil {
-		t.Fatalf("migrate: %v", err)
-	}
-	pool, err := pgxpool.New(context.Background(), dsn)
-	if err != nil {
-		t.Fatalf("pool: %v", err)
-	}
-	t.Cleanup(pool.Close)
-	dbtest.ResetDB(t, pool)
-	return pool
-}
-
-func discardLogger() *slog.Logger { return slog.New(slog.NewTextHandler(io.Discard, nil)) }
-
-func seedUser(t *testing.T, q *dbq.Queries, name string) pgtype.UUID {
-	t.Helper()
-	u, err := q.CreateUser(context.Background(), dbq.CreateUserParams{
-		Username: dbtest.TestUserPrefix + name, PasswordHash: "x", ApiToken: name + "-tok", IsAdmin: false,
-	})
-	if err != nil {
-		t.Fatalf("seed user %s: %v", name, err)
-	}
-	return u.ID
-}
-
-// seedArtistTrack creates an artist + album + one track, returning both ids.
-func seedArtistTrack(t *testing.T, q *dbq.Queries, name string) (pgtype.UUID, pgtype.UUID) {
-	t.Helper()
-	ctx := context.Background()
-	a, err := q.UpsertArtist(ctx, dbq.UpsertArtistParams{Name: name, SortName: name})
-	if err != nil {
-		t.Fatalf("seed artist: %v", err)
-	}
-	al, err := q.UpsertAlbum(ctx, dbq.UpsertAlbumParams{Title: name, SortTitle: name, ArtistID: a.ID})
-	if err != nil {
-		t.Fatalf("seed album: %v", err)
-	}
-	tr, err := q.UpsertTrack(ctx, dbq.UpsertTrackParams{
-		Title: name, AlbumID: al.ID, ArtistID: a.ID,
-		DurationMs: 1000, FilePath: "/tmp/coplay-" + name + ".mp3",
-		FileSize: 1, FileFormat: "mp3",
-	})
-	if err != nil {
-		t.Fatalf("seed track: %v", err)
-	}
-	return a.ID, tr.ID
-}
-
-func play(t *testing.T, pool *pgxpool.Pool, userID, trackID pgtype.UUID) {
-	t.Helper()
-	ctx := context.Background()
-	at := time.Now()
-	var sessionID pgtype.UUID
-	if err := pool.QueryRow(ctx,
-		`INSERT INTO play_sessions (user_id, started_at, last_event_at, client_id)
-		 VALUES ($1, $2, $2, 'coplay-test') RETURNING id`,
-		userID, at).Scan(&sessionID); err != nil {
-		t.Fatalf("insert play_session: %v", err)
-	}
-	if _, err := pool.Exec(ctx,
-		`INSERT INTO play_events (user_id, track_id, session_id, started_at, was_skipped)
-		 VALUES ($1, $2, $3, $4, false)`,
-		userID, trackID, sessionID, at); err != nil {
-		t.Fatalf("insert play_event: %v", err)
-	}
-}
-
-func coplayEdgeCount(t *testing.T, pool *pgxpool.Pool) int {
-	t.Helper()
-	var n int
-	if err := pool.QueryRow(context.Background(),
-		`SELECT count(*) FROM artist_similarity WHERE source='user_cooccurrence'`).Scan(&n); err != nil {
-		t.Fatalf("count edges: %v", err)
-	}
-	return n
-}
-
-// TestCoplayWorker_BuildsEdges: two users who both play two artists produce a
-// perfect-overlap co-play edge (Jaccard 1.0) in each direction.
-func TestCoplayWorker_BuildsEdges(t *testing.T) {
-	pool := testPool(t)
-	ctx := context.Background()
-	q := dbq.New(pool)
-
-	u1 := seedUser(t, q, "cop1")
-	u2 := seedUser(t, q, "cop2")
-	aA, tA := seedArtistTrack(t, q, "ArtA")
-	aB, tB := seedArtistTrack(t, q, "ArtB")
-
-	for _, u := range []pgtype.UUID{u1, u2} {
-		play(t, pool, u, tA)
-		play(t, pool, u, tB)
-	}
-
-	if err := NewWorker(pool, discardLogger()).rebuild(ctx); err != nil {
-		t.Fatalf("rebuild: %v", err)
-	}
-
-	var score float64
-	if err := pool.QueryRow(ctx,
-		`SELECT score FROM artist_similarity
-		 WHERE artist_a_id=$1 AND artist_b_id=$2 AND source='user_cooccurrence'`,
-		aA, aB).Scan(&score); err != nil {
-		t.Fatalf("expected co-play edge ArtA→ArtB: %v", err)
-	}
-	// Jaccard of perfectly-overlapping player sets (both users play both):
-	// coplayers=2, players each=2 → 2/(2+2-2) = 1.0.
-	if score != 1.0 {
-		t.Errorf("edge score = %v, want 1.0 (perfect overlap)", score)
-	}
-	if got := coplayEdgeCount(t, pool); got != 2 {
-		t.Errorf("edge count = %d, want 2 (A→B and B→A)", got)
-	}
-}
-
-// TestCoplayWorker_SingleUserNoEdges: one user's own co-listening yields no
-// edges — the >= 2 distinct-co-player gate keeps single-user servers empty.
-func TestCoplayWorker_SingleUserNoEdges(t *testing.T) {
-	pool := testPool(t)
-	ctx := context.Background()
-	q := dbq.New(pool)
-
-	u := seedUser(t, q, "solo")
-	_, tA := seedArtistTrack(t, q, "SoloA")
-	_, tB := seedArtistTrack(t, q, "SoloB")
-	play(t, pool, u, tA)
-	play(t, pool, u, tB)
-
-	if err := NewWorker(pool, discardLogger()).rebuild(ctx); err != nil {
-		t.Fatalf("rebuild: %v", err)
-	}
-	if got := coplayEdgeCount(t, pool); got != 0 {
-		t.Errorf("single-user edge count = %d, want 0 (>= 2 co-player gate)", got)
-	}
-}
@@ -1,78 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: coplay.sql
-
-package dbq
-
-import (
-	"context"
-)
-
-const deleteArtistCoplayEdges = `-- name: DeleteArtistCoplayEdges :exec
-
-DELETE FROM artist_similarity WHERE source = 'user_cooccurrence'
-`
-
-// Household co-play similarity (#1533, milestone #160 Opt 5). Minstrel is a
-// single shared-library, multi-user server (no per-user library ACL), so the
-// "household" is the whole instance's user set. These queries recompute
-// artist–artist co-occurrence edges from play_events and store them in
-// artist_similarity under the pre-provisioned source = 'user_cooccurrence'
-// (whitelisted in the 0009 CHECK from day one). A periodic worker DELETEs then
-// re-INSERTs so edges that fall below threshold disappear. Single-user servers
-// produce no edges (the >= 2 co-player gate), so the arm is empty there.
-func (q *Queries) DeleteArtistCoplayEdges(ctx context.Context) error {
-	_, err := q.db.Exec(ctx, deleteArtistCoplayEdges)
-	return err
-}
-
-const insertArtistCoplayEdges = `-- name: InsertArtistCoplayEdges :exec
-WITH user_artists AS (
-    SELECT DISTINCT pe.user_id, t.artist_id
-    FROM play_events pe
-    JOIN tracks t ON t.id = pe.track_id
-    WHERE pe.was_skipped = false
-      AND pe.started_at > now() - interval '365 days'
-),
-artist_players AS (
-    SELECT artist_id, count(*)::float8 AS players
-    FROM user_artists
-    GROUP BY artist_id
-),
-pairs AS (
-    SELECT ua.artist_id AS a_id,
-           ub.artist_id AS b_id,
-           count(*)::float8 AS coplayers
-    FROM user_artists ua
-    JOIN user_artists ub
-      ON ua.user_id = ub.user_id AND ua.artist_id <> ub.artist_id
-    GROUP BY ua.artist_id, ub.artist_id
-    HAVING count(*) >= 2
-),
-scored AS (
-    SELECT p.a_id, p.b_id,
-           p.coplayers / (pa.players + pb.players - p.coplayers) AS score
-    FROM pairs p
-    JOIN artist_players pa ON pa.artist_id = p.a_id
-    JOIN artist_players pb ON pb.artist_id = p.b_id
-)
-INSERT INTO artist_similarity (artist_a_id, artist_b_id, score, source, fetched_at)
-SELECT a_id, b_id, score, 'user_cooccurrence', now()
-FROM scored
-WHERE score >= $1
-ON CONFLICT (artist_a_id, artist_b_id, source)
-DO UPDATE SET score = EXCLUDED.score, fetched_at = EXCLUDED.fetched_at
-`
-
-// Two artists are "co-played" when the same users play both. score is the
-// Jaccard of their distinct-player sets — coplayers / (playersA + playersB −
-// coplayers) in (0,1] — which controls for globally-popular artists (an artist
-// everyone plays would otherwise co-occur with everything). Only pairs with
-// >= 2 distinct co-players AND Jaccard >= $1 (a floor that both prunes weak
-// edges and self-limits hub artists, whose large denominators drag their
-// Jaccard down) are kept. Completed plays only, 365-day window.
-func (q *Queries) InsertArtistCoplayEdges(ctx context.Context, score float64) error {
-	_, err := q.db.Exec(ctx, insertArtistCoplayEdges, score)
-	return err
-}
@@ -211,69 +211,3 @@ func (q *Queries) ListRandomUnheardTracksForDiscover(ctx context.Context, arg Li
 	}
 	return items, nil
 }
-
-const listTasteUnheardTracksForDiscover = `-- name: ListTasteUnheardTracksForDiscover :many
-SELECT t.id, t.album_id, t.artist_id
-  FROM tracks t
-  JOIN LATERAL regexp_split_to_table(coalesce(t.genre, ''), '[;,]') AS g_split(g) ON true
-  JOIN taste_profile_tags nt ON nt.user_id = $1 AND trim(g_split.g) = nt.tag
- WHERE nt.weight > 0
-   AND trim(g_split.g) <> ''
-   AND NOT EXISTS (
-       SELECT 1 FROM play_events pe
-        WHERE pe.user_id = $1
-          AND pe.track_id = t.id
-          AND pe.was_skipped = false
-   )
-   AND NOT EXISTS (
-       SELECT 1 FROM general_likes gl
-        WHERE gl.user_id = $1 AND gl.track_id = t.id
-   )
-   AND NOT EXISTS (
-       SELECT 1 FROM lidarr_quarantine q
-        WHERE q.user_id = $1 AND q.track_id = t.id
-   )
- GROUP BY t.id, t.album_id, t.artist_id
- ORDER BY SUM(nt.weight) DESC, md5(t.id::text || $2::text)
- LIMIT 120
-`
-
-type ListTasteUnheardTracksForDiscoverParams struct {
-	UserID  pgtype.UUID
-	Column2 string
-}
-
-type ListTasteUnheardTracksForDiscoverRow struct {
-	ID       pgtype.UUID
-	AlbumID  pgtype.UUID
-	ArtistID pgtype.UUID
-}
-
-// Taste-targeted novelty: unheard tracks whose genres overlap the user's
-// taste-profile tags (taste_profile_tags, #796), ranked by summed tag
-// weight — "new to you, but your vibe" rather than the crude random arm.
-// Genres live inline on tracks.genre as a delimited string, split the
-// same way the radio tag_overlap arm does (regexp_split_to_table on
-// [;,]). Same exclusion filters as the other buckets. Returns nothing
-// when the user has no taste tags yet (cold start), so the caller
-// redistributes its slots to the other buckets. Stamped 'taste_unheard'.
-// $1 = user_id, $2 = date string for md5 tiebreak ordering.
-func (q *Queries) ListTasteUnheardTracksForDiscover(ctx context.Context, arg ListTasteUnheardTracksForDiscoverParams) ([]ListTasteUnheardTracksForDiscoverRow, error) {
-	rows, err := q.db.Query(ctx, listTasteUnheardTracksForDiscover, arg.UserID, arg.Column2)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []ListTasteUnheardTracksForDiscoverRow
-	for rows.Next() {
-		var i ListTasteUnheardTracksForDiscoverRow
-		if err := rows.Scan(&i.ID, &i.AlbumID, &i.ArtistID); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
@@ -54,7 +54,7 @@ func (q *Queries) GetMostRecentPlaySessionForUser(ctx context.Context, userID pg
 }

 const getOpenPlayEventForUser = `-- name: GetOpenPlayEventForUser :one
-SELECT id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source, pick_kind, device_class FROM play_events
+SELECT id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source FROM play_events
 WHERE user_id = $1 AND ended_at IS NULL
 ORDER BY started_at DESC
 LIMIT 1
@@ -79,14 +79,12 @@ func (q *Queries) GetOpenPlayEventForUser(ctx context.Context, userID pgtype.UUI
 		&i.SessionVectorAtPlay,
 		&i.ScrobbledAt,
 		&i.Source,
-		&i.PickKind,
-		&i.DeviceClass,
 	)
 	return i, err
 }

 const getPlayEventByID = `-- name: GetPlayEventByID :one
-SELECT id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source, pick_kind, device_class FROM play_events WHERE id = $1
+SELECT id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source FROM play_events WHERE id = $1
 `

 func (q *Queries) GetPlayEventByID(ctx context.Context, id pgtype.UUID) (PlayEvent, error) {
@@ -106,67 +104,26 @@ func (q *Queries) GetPlayEventByID(ctx context.Context, id pgtype.UUID) (PlayEve
 		&i.SessionVectorAtPlay,
 		&i.ScrobbledAt,
 		&i.Source,
-		&i.PickKind,
-		&i.DeviceClass,
 	)
 	return i, err
 }

-const getSystemPickKindForTrack = `-- name: GetSystemPickKindForTrack :one
-SELECT pt.pick_kind
-FROM playlist_tracks pt
-JOIN playlists p ON p.id = pt.playlist_id
-WHERE p.user_id = $1
-  AND p.system_variant = $2
-  AND pt.track_id = $3
-LIMIT 1
-`
-
-type GetSystemPickKindForTrackParams struct {
-	UserID        pgtype.UUID
-	SystemVariant *string
-	TrackID       pgtype.UUID
-}
-
-// Looks a track up in the user's CURRENT snapshot of the given system
-// variant and returns its pick_kind. Used at play-ingestion time to
-// freeze provenance onto the play_event — snapshots rebuild daily, so
-// attribution can't be reconstructed at read time (#1249/#1270). No
-// row = track not in today's snapshot (caller stores NULL); a row with
-// NULL pick_kind = the variant doesn't stamp (yet). songs_like_artist
-// is non-singleton (up to 3 mixes/user); a track in two of them takes
-// whichever LIMIT 1 hits — acceptable, tier stamps there describe the
-// same eligibility ladder.
-func (q *Queries) GetSystemPickKindForTrack(ctx context.Context, arg GetSystemPickKindForTrackParams) (*string, error) {
-	row := q.db.QueryRow(ctx, getSystemPickKindForTrack, arg.UserID, arg.SystemVariant, arg.TrackID)
-	var pick_kind *string
-	err := row.Scan(&pick_kind)
-	return pick_kind, err
-}
-
 const insertPlayEvent = `-- name: InsertPlayEvent :one
 INSERT INTO play_events (
-    user_id, track_id, session_id, started_at, client_id, source, pick_kind,
-    device_class
-) VALUES ($1, $2, $3, $4, $5, $6, $7::text,
-    $8::text)
-RETURNING id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source, pick_kind, device_class
+    user_id, track_id, session_id, started_at, client_id, source
+) VALUES ($1, $2, $3, $4, $5, $6)
+RETURNING id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source
 `

 type InsertPlayEventParams struct {
-	UserID      pgtype.UUID
-	TrackID     pgtype.UUID
-	SessionID   pgtype.UUID
-	StartedAt   pgtype.Timestamptz
-	ClientID    *string
-	Source      *string
-	PickKind    *string
-	DeviceClass *string
+	UserID    pgtype.UUID
+	TrackID   pgtype.UUID
+	SessionID pgtype.UUID
+	StartedAt pgtype.Timestamptz
+	ClientID  *string
+	Source    *string
 }

-// pick_kind is non-NULL only for system-playlist plays whose track was
-// found (with a stamped kind) in the user's live snapshot for that
-// variant at ingestion time (#1249, generalized in #1270).
 func (q *Queries) InsertPlayEvent(ctx context.Context, arg InsertPlayEventParams) (PlayEvent, error) {
 	row := q.db.QueryRow(ctx, insertPlayEvent,
 		arg.UserID,
@@ -175,8 +132,6 @@ func (q *Queries) InsertPlayEvent(ctx context.Context, arg InsertPlayEventParams
 		arg.StartedAt,
 		arg.ClientID,
 		arg.Source,
-		arg.PickKind,
-		arg.DeviceClass,
 	)
 	var i PlayEvent
 	err := row.Scan(
@@ -193,8 +148,6 @@ func (q *Queries) InsertPlayEvent(ctx context.Context, arg InsertPlayEventParams
 		&i.SessionVectorAtPlay,
 		&i.ScrobbledAt,
 		&i.Source,
-		&i.PickKind,
-		&i.DeviceClass,
 	)
 	return i, err
 }
@@ -261,7 +214,7 @@ func (q *Queries) InsertSkipEvent(ctx context.Context, arg InsertSkipEventParams
 }

 const listRecentSessionTracks = `-- name: ListRecentSessionTracks :many
-SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version FROM tracks t
+SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at FROM tracks t
 JOIN play_events pe ON pe.track_id = t.id
 WHERE pe.session_id = $1
  AND pe.started_at < $2
@@ -303,8 +256,6 @@ func (q *Queries) ListRecentSessionTracks(ctx context.Context, arg ListRecentSes
 			&i.Genre,
 			&i.AddedAt,
 			&i.UpdatedAt,
-			&i.TagSource,
-			&i.TagSourcesVersion,
 		); err != nil {
 			return nil, err
 		}
@@ -340,7 +291,7 @@ SET ended_at = $2,
    completion_ratio = $4,
    was_skipped = $5
 WHERE id = $1
-RETURNING id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source, pick_kind, device_class
+RETURNING id, user_id, track_id, session_id, started_at, ended_at, duration_played_ms, completion_ratio, was_skipped, client_id, session_vector_at_play, scrobbled_at, source
 `

 type UpdatePlayEventEndedParams struct {
@@ -377,8 +328,6 @@ func (q *Queries) UpdatePlayEventEnded(ctx context.Context, arg UpdatePlayEventE
 		&i.SessionVectorAtPlay,
 		&i.ScrobbledAt,
 		&i.Source,
-		&i.PickKind,
-		&i.DeviceClass,
 	)
 	return i, err
 }
@@ -14,7 +14,7 @@ import (
 const listUserHistory = `-- name: ListUserHistory :many
 SELECT pe.id           AS event_id,
       pe.started_at,
-       t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version,
+       t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at,
       albums.title    AS album_title,
       artists.name    AS artist_name
  FROM play_events pe
@@ -77,8 +77,6 @@ func (q *Queries) ListUserHistory(ctx context.Context, arg ListUserHistoryParams
 			&i.Track.Genre,
 			&i.Track.AddedAt,
 			&i.Track.UpdatedAt,
-			&i.Track.TagSource,
-			&i.Track.TagSourcesVersion,
 			&i.AlbumTitle,
 			&i.ArtistName,
 		); err != nil {
@@ -259,7 +259,7 @@ func (q *Queries) ListLikedTrackIDs(ctx context.Context, userID pgtype.UUID) ([]
 }

 const listLikedTrackRows = `-- name: ListLikedTrackRows :many
-SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version FROM tracks t
+SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at FROM tracks t
 JOIN general_likes l ON l.track_id = t.id
 WHERE l.user_id = $1
 ORDER BY l.liked_at DESC
@@ -297,8 +297,6 @@ func (q *Queries) ListLikedTrackRows(ctx context.Context, arg ListLikedTrackRows
 			&i.Genre,
 			&i.AddedAt,
 			&i.UpdatedAt,
-			&i.TagSource,
-			&i.TagSourcesVersion,
 		); err != nil {
 			return nil, err
 		}
@@ -383,8 +383,6 @@ type PlayEvent struct {
 	SessionVectorAtPlay []byte
 	ScrobbledAt         pgtype.Timestamptz
 	Source              *string
-	PickKind            *string
-	DeviceClass         *string
 }

 type PlaySession struct {
@@ -435,29 +433,6 @@ type PlaylistTrack struct {
 	AlbumTitle  string
 	DurationSec int32
 	AddedAt     pgtype.Timestamptz
-	PickKind    *string
-}
-
-type RecommendationTuningAudit struct {
-	ID        int64
-	ChangedAt pgtype.Timestamptz
-	Scope     string
-	Action    string
-	Changes   []byte
-}
-
-type RecommendationWeightProfile struct {
-	Profile           string
-	BaseWeight        float64
-	LikeBoost         float64
-	RecencyWeight     float64
-	SkipPenalty       float64
-	JitterMagnitude   float64
-	ContextWeight     float64
-	SimilarityWeight  float64
-	TasteWeight       float64
-	UpdatedAt         pgtype.Timestamptz
-	ContextTimeWeight float64
 }

 type RegistrationSetting struct {
@@ -534,21 +509,6 @@ type SystemPlaylistRun struct {
 	LastError   *string
 }

-type TagProviderSetting struct {
-	ProviderID   string
-	Enabled      bool
-	ApiKey       *string
-	DisplayOrder int32
-	CreatedAt    pgtype.Timestamptz
-	UpdatedAt    pgtype.Timestamptz
-}
-
-type TagSourcesMetum struct {
-	ID                          bool
-	CurrentVersion              int32
-	LastRegisteredProvidersHash string
-}
-
 type TasteProfileArtist struct {
 	UserID    pgtype.UUID
 	ArtistID  pgtype.UUID
@@ -556,20 +516,6 @@ type TasteProfileArtist struct {
 	UpdatedAt pgtype.Timestamptz
 }

-type TasteProfileEra struct {
-	UserID    pgtype.UUID
-	Era       string
-	Weight    float64
-	UpdatedAt pgtype.Timestamptz
-}
-
-type TasteProfileMood struct {
-	UserID    pgtype.UUID
-	Mood      string
-	Weight    float64
-	UpdatedAt pgtype.Timestamptz
-}
-
 type TasteProfileTag struct {
 	UserID    pgtype.UUID
 	Tag       string
@@ -577,36 +523,22 @@ type TasteProfileTag struct {
 	UpdatedAt pgtype.Timestamptz
 }

-type TasteTuning struct {
-	Singleton          bool
-	HalfLifeDays       float64
-	EngagementHardSkip float64
-	EngagementNeutral  float64
-	EngagementFull     float64
-	UpdatedAt          pgtype.Timestamptz
-	EnrichedTagScale   float64
-	EraScale           float64
-	MoodScale          float64
-}
-
 type Track struct {
-	ID                pgtype.UUID
-	Title             string
-	AlbumID           pgtype.UUID
-	ArtistID          pgtype.UUID
-	TrackNumber       *int32
-	DiscNumber        *int32
-	DurationMs        int32
-	FilePath          string
-	FileSize          int64
-	FileFormat        string
-	Bitrate           *int32
-	Mbid              *string
-	Genre             *string
-	AddedAt           pgtype.Timestamptz
-	UpdatedAt         pgtype.Timestamptz
-	TagSource         *string
-	TagSourcesVersion int32
+	ID          pgtype.UUID
+	Title       string
+	AlbumID     pgtype.UUID
+	ArtistID    pgtype.UUID
+	TrackNumber *int32
+	DiscNumber  *int32
+	DurationMs  int32
+	FilePath    string
+	FileSize    int64
+	FileFormat  string
+	Bitrate     *int32
+	Mbid        *string
+	Genre       *string
+	AddedAt     pgtype.Timestamptz
+	UpdatedAt   pgtype.Timestamptz
 }

 type TrackSimilarity struct {
@@ -617,12 +549,6 @@ type TrackSimilarity struct {
 	FetchedAt pgtype.Timestamptz
 }

-type TrackTag struct {
-	TrackID pgtype.UUID
-	Tag     string
-	Weight  float64
-}
-
 type User struct {
 	ID                  pgtype.UUID
 	Username            string
@@ -12,7 +12,7 @@ import (
 )

 const appendPlaylistTrack = `-- name: AppendPlaylistTrack :one
-INSERT INTO playlist_tracks (playlist_id, position, track_id, title, artist_name, album_title, duration_sec, pick_kind)
+INSERT INTO playlist_tracks (playlist_id, position, track_id, title, artist_name, album_title, duration_sec)
 SELECT
    $1::uuid,
    COALESCE((SELECT MAX(position) + 1 FROM playlist_tracks WHERE playlist_id = $1::uuid), 0),
@@ -20,27 +20,24 @@ SELECT
    t.title,
    artists.name,
    albums.title,
-    (t.duration_ms / 1000)::integer,
-    $2::text
+    (t.duration_ms / 1000)::integer
 FROM tracks t
 JOIN albums  ON albums.id  = t.album_id
 JOIN artists ON artists.id = t.artist_id
-WHERE t.id = $3::uuid
-RETURNING playlist_id, position, track_id, title, artist_name, album_title, duration_sec, added_at, pick_kind
+WHERE t.id = $2::uuid
+RETURNING playlist_id, position, track_id, title, artist_name, album_title, duration_sec, added_at
 `

 type AppendPlaylistTrackParams struct {
 	PlaylistID pgtype.UUID
-	PickKind   *string
 	TrackID    pgtype.UUID
 }

 // Inserts at the next available position. Snapshot fields are copied
 // from the tracks/albums/artists join at insert time. tracks.duration_ms
-// is converted to seconds for the snapshot. pick_kind is NULL for manual
-// playlists; the For You builder stamps 'taste'/'fresh' (#1249).
+// is converted to seconds for the snapshot.
 func (q *Queries) AppendPlaylistTrack(ctx context.Context, arg AppendPlaylistTrackParams) (PlaylistTrack, error) {
-	row := q.db.QueryRow(ctx, appendPlaylistTrack, arg.PlaylistID, arg.PickKind, arg.TrackID)
+	row := q.db.QueryRow(ctx, appendPlaylistTrack, arg.PlaylistID, arg.TrackID)
 	var i PlaylistTrack
 	err := row.Scan(
 		&i.PlaylistID,
@@ -51,7 +48,6 @@ func (q *Queries) AppendPlaylistTrack(ctx context.Context, arg AppendPlaylistTra
 		&i.AlbumTitle,
 		&i.DurationSec,
 		&i.AddedAt,
-		&i.PickKind,
 	)
 	return i, err
 }
@@ -261,7 +257,7 @@ func (q *Queries) ListAllPlaylistTracksForCollage(ctx context.Context, arg ListA
 }

 const listPlaylistTracks = `-- name: ListPlaylistTracks :many
-SELECT pt.playlist_id, pt.position, pt.track_id, pt.title, pt.artist_name, pt.album_title, pt.duration_sec, pt.added_at, pt.pick_kind,
+SELECT pt.playlist_id, pt.position, pt.track_id, pt.title, pt.artist_name, pt.album_title, pt.duration_sec, pt.added_at,
       t.id           AS live_track_id,
       albums.id      AS album_id,
       artists.id     AS artist_id
@@ -282,7 +278,6 @@ type ListPlaylistTracksRow struct {
 	AlbumTitle  string
 	DurationSec int32
 	AddedAt     pgtype.Timestamptz
-	PickKind    *string
 	LiveTrackID pgtype.UUID
 	AlbumID     pgtype.UUID
 	ArtistID    pgtype.UUID
@@ -310,7 +305,6 @@ func (q *Queries) ListPlaylistTracks(ctx context.Context, playlistID pgtype.UUID
 			&i.AlbumTitle,
 			&i.DurationSec,
 			&i.AddedAt,
-			&i.PickKind,
 			&i.LiveTrackID,
 			&i.AlbumID,
 			&i.ArtistID,
@@ -11,110 +11,6 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 )

-const getLatestPlayDeviceClassForUser = `-- name: GetLatestPlayDeviceClassForUser :one
-SELECT device_class
-FROM play_events
-WHERE user_id = $1
-ORDER BY started_at DESC
-LIMIT 1
-`
-
-// The device_class of the user's most recent play (#1551), used as the
-// "current device" for radio context conditioning. NULL when the latest play
-// predates device capture or came from a client that didn't send one.
-func (q *Queries) GetLatestPlayDeviceClassForUser(ctx context.Context, userID pgtype.UUID) (*string, error) {
-	row := q.db.QueryRow(ctx, getLatestPlayDeviceClassForUser, userID)
-	var device_class *string
-	err := row.Scan(&device_class)
-	return device_class, err
-}
-
-const listArtistContextPlayCountsForUser = `-- name: ListArtistContextPlayCountsForUser :many
-WITH tz AS (
-    SELECT COALESCE(NULLIF(u.timezone, ''), 'UTC') AS zone
-    FROM users u WHERE u.id = $1
-),
-now_cell AS (
-    SELECT
-        CASE
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 5  THEN 3
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 12 THEN 0
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 17 THEN 1
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 22 THEN 2
-            ELSE 3
-        END AS daypart,
-        (EXTRACT(isodow FROM now() AT TIME ZONE tz.zone) >= 6) AS is_weekend
-    FROM tz
-),
-plays AS (
-    SELECT t.artist_id,
-           pe.device_class,
-           CASE
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 5  THEN 3
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 12 THEN 0
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 17 THEN 1
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 22 THEN 2
-               ELSE 3
-           END AS daypart,
-           (EXTRACT(isodow FROM pe.started_at AT TIME ZONE tz.zone) >= 6) AS is_weekend
-    FROM play_events pe
-    JOIN tracks t ON t.id = pe.track_id
-    CROSS JOIN tz
-    WHERE pe.user_id = $1
-      AND pe.was_skipped = false
-      AND pe.started_at > now() - interval '365 days'
-)
-SELECT p.artist_id,
-       count(*) AS total_plays,
-       count(*) FILTER (
-           WHERE p.daypart = (SELECT daypart FROM now_cell)
-             AND p.is_weekend = (SELECT is_weekend FROM now_cell)
-             AND ($2::text = '' OR p.device_class = $2::text)
-       ) AS cell_plays
-FROM plays p
-GROUP BY p.artist_id
-`
-
-type ListArtistContextPlayCountsForUserParams struct {
-	ID      pgtype.UUID
-	Column2 string
-}
-
-type ListArtistContextPlayCountsForUserRow struct {
-	ArtistID   pgtype.UUID
-	TotalPlays int64
-	CellPlays  int64
-}
-
-// Per-artist completed-play counts split by whether each play falls in the
-// CURRENT context cell, in the user's local timezone (#1531). The cell is
-// daypart × weekday-type, optionally narrowed by device class (#1551): when
-// $2 (the current device) is ”, the device dimension is ignored (identical to
-// the time-only #1531 behaviour, used by the daily mixes which have no device);
-// when $2 is set (radio), a play only counts in the cell if its device_class
-// matches. Feeds the context-affinity scoring term. Skips excluded; a 365-day
-// window bounds cost. Daypart buckets: night [22,5) morning [5,12)
-// afternoon [12,17) evening [17,22). Weekend = ISO days 6–7 (Sat/Sun).
-func (q *Queries) ListArtistContextPlayCountsForUser(ctx context.Context, arg ListArtistContextPlayCountsForUserParams) ([]ListArtistContextPlayCountsForUserRow, error) {
-	rows, err := q.db.Query(ctx, listArtistContextPlayCountsForUser, arg.ID, arg.Column2)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []ListArtistContextPlayCountsForUserRow
-	for rows.Next() {
-		var i ListArtistContextPlayCountsForUserRow
-		if err := rows.Scan(&i.ArtistID, &i.TotalPlays, &i.CellPlays); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const listLastPlayedArtistsForUser = `-- name: ListLastPlayedArtistsForUser :many
 WITH user_plays AS (
    SELECT t.artist_id, max(pe.started_at) AS last_started
@@ -208,7 +104,7 @@ WITH plays AS (
    WHERE user_id = $2 AND was_skipped = false
    GROUP BY track_id
 )
-SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version,
+SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at,
       albums.title AS album_title,
       artists.name AS artist_name
 FROM plays p
@@ -265,8 +161,6 @@ func (q *Queries) ListMostPlayedTracksForArtist(ctx context.Context, arg ListMos
 			&i.Track.Genre,
 			&i.Track.AddedAt,
 			&i.Track.UpdatedAt,
-			&i.Track.TagSource,
-			&i.Track.TagSourcesVersion,
 			&i.AlbumTitle,
 			&i.ArtistName,
 		); err != nil {
@@ -287,7 +181,7 @@ WITH plays AS (
    WHERE user_id = $1 AND was_skipped = false
    GROUP BY track_id
 )
-SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version,
+SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at,
       albums.title AS album_title,
       artists.name AS artist_name
 FROM plays p
@@ -346,8 +240,6 @@ func (q *Queries) ListMostPlayedTracksForUser(ctx context.Context, arg ListMostP
 			&i.Track.Genre,
 			&i.Track.AddedAt,
 			&i.Track.UpdatedAt,
-			&i.Track.TagSource,
-			&i.Track.TagSourcesVersion,
 			&i.AlbumTitle,
 			&i.ArtistName,
 		); err != nil {
@@ -685,14 +577,12 @@ func (q *Queries) ListRediscoverArtistsForUser(ctx context.Context, arg ListRedi

 const loadRadioCandidates = `-- name: LoadRadioCandidates :many
 SELECT
-    t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version,
+    t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at,
    (l.user_id IS NOT NULL)::bool AS is_liked,
    pe.last_played_at::timestamptz AS last_played_at,
    pe.play_count,
-    pe.skip_count,
-    al.release_date AS release_date
+    pe.skip_count
 FROM tracks t
-JOIN albums al ON al.id = t.album_id
 LEFT JOIN general_likes l ON l.user_id = $1 AND l.track_id = t.id
 LEFT JOIN LATERAL (
    SELECT
@@ -726,7 +616,6 @@ type LoadRadioCandidatesRow struct {
 	LastPlayedAt pgtype.Timestamptz
 	PlayCount    int64
 	SkipCount    int64
-	ReleaseDate  pgtype.Date
 }

 // Returns all tracks except the seed and any played by the user within
@@ -761,13 +650,10 @@ func (q *Queries) LoadRadioCandidates(ctx context.Context, arg LoadRadioCandidat
 			&i.Track.Genre,
 			&i.Track.AddedAt,
 			&i.Track.UpdatedAt,
-			&i.Track.TagSource,
-			&i.Track.TagSourcesVersion,
 			&i.IsLiked,
 			&i.LastPlayedAt,
 			&i.PlayCount,
 			&i.SkipCount,
-			&i.ReleaseDate,
 		); err != nil {
 			return nil, err
 		}
@@ -862,22 +748,6 @@ taste_overlap AS (
    ORDER BY tpa.weight DESC, t.id
    LIMIT $10
 ),
-coplay_artists AS (
-    -- Household co-play (#1533): tracks by artists co-played across the
-    -- instance with the seed's artist (source='user_cooccurrence', built by
-    -- the coplay worker). Mirrors similar_artists but from local co-occurrence
-    -- instead of ListenBrainz; empty on single-user servers. Same 0.5 damp as
-    -- similar_artists since it's artist-level.
-    SELECT t.id AS track_id, asim.score * 0.5 AS sim_score
-    FROM artist_similarity asim
-    JOIN tracks t ON t.artist_id = asim.artist_b_id
-    JOIN seed_artist sa ON asim.artist_a_id = sa.artist_id
-    WHERE asim.source = 'user_cooccurrence'
-      AND t.id NOT IN (SELECT id FROM excluded_ids)
-      AND t.id <> $2
-    ORDER BY asim.score DESC, random()
-    LIMIT $11
-),
 random_fill AS (
    SELECT t.id AS track_id, 0.0::float8 AS sim_score
    FROM tracks t
@@ -889,18 +759,16 @@ random_fill AS (
          UNION SELECT track_id FROM tag_overlap
          UNION SELECT track_id FROM likes_overlap
          UNION SELECT track_id FROM taste_overlap
-          UNION SELECT track_id FROM coplay_artists
      )
    ORDER BY random()
    LIMIT $9
 )
 SELECT
-    t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version,
+    t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at,
    (l.user_id IS NOT NULL)::bool AS is_liked,
    pe.last_played_at::timestamptz AS last_played_at,
    pe.play_count,
    pe.skip_count,
-    al.release_date AS release_date,
    COALESCE(max(u.sim_score), 0.0) AS similarity_score
 FROM (
    SELECT track_id, sim_score FROM lb_similar
@@ -908,11 +776,9 @@ FROM (
    UNION ALL SELECT track_id, sim_score FROM tag_overlap
    UNION ALL SELECT track_id, sim_score FROM likes_overlap
    UNION ALL SELECT track_id, sim_score FROM taste_overlap
-    UNION ALL SELECT track_id, sim_score FROM coplay_artists
    UNION ALL SELECT track_id, sim_score FROM random_fill
 ) u
 JOIN tracks t ON t.id = u.track_id
-JOIN albums al ON al.id = t.album_id
 LEFT JOIN general_likes l ON l.user_id = $1 AND l.track_id = t.id
 LEFT JOIN LATERAL (
    SELECT max(started_at) AS last_played_at,
@@ -924,8 +790,7 @@ LEFT JOIN LATERAL (
 GROUP BY t.id, t.title, t.album_id, t.artist_id, t.duration_ms, t.file_path,
         t.file_format, t.file_size, t.bitrate, t.track_number, t.disc_number,
         t.mbid, t.genre, t.added_at, t.updated_at,
-         l.user_id, pe.last_played_at, pe.play_count, pe.skip_count,
-         al.release_date
+         l.user_id, pe.last_played_at, pe.play_count, pe.skip_count
 `

 type LoadRadioCandidatesV2Params struct {
@@ -939,7 +804,6 @@ type LoadRadioCandidatesV2Params struct {
 	Limit_4 int32
 	Limit_5 int32
 	Limit_6 int32
-	Limit_7 int32
 }

 type LoadRadioCandidatesV2Row struct {
@@ -948,7 +812,6 @@ type LoadRadioCandidatesV2Row struct {
 	LastPlayedAt    pgtype.Timestamptz
 	PlayCount       int64
 	SkipCount       int64
-	ReleaseDate     pgtype.Date
 	SimilarityScore interface{}
 }

@@ -960,9 +823,7 @@ type LoadRadioCandidatesV2Row struct {
 //	$10 taste_overlap K (#796 phase 2b — tracks by the user's top
 //	positively-weighted taste-profile artists, so taste-relevant tracks
 //	enter the pool even when the similarity/random arms miss them; scored
-//	in Go via TasteMatch, so sim_score here is 0 pool-inclusion),
-//	$11 coplay_artists K (#1533 — tracks by artists co-played across the
-//	instance with the seed's artist; source='user_cooccurrence').
+//	in Go via TasteMatch, so sim_score here is 0 pool-inclusion).
 //
 // Returns same shape as LoadRadioCandidates plus similarity_score column.
 func (q *Queries) LoadRadioCandidatesV2(ctx context.Context, arg LoadRadioCandidatesV2Params) ([]LoadRadioCandidatesV2Row, error) {
@@ -977,7 +838,6 @@ func (q *Queries) LoadRadioCandidatesV2(ctx context.Context, arg LoadRadioCandid
 		arg.Limit_4,
 		arg.Limit_5,
 		arg.Limit_6,
-		arg.Limit_7,
 	)
 	if err != nil {
 		return nil, err
@@ -1002,13 +862,10 @@ func (q *Queries) LoadRadioCandidatesV2(ctx context.Context, arg LoadRadioCandid
 			&i.Track.Genre,
 			&i.Track.AddedAt,
 			&i.Track.UpdatedAt,
-			&i.Track.TagSource,
-			&i.Track.TagSourcesVersion,
 			&i.IsLiked,
 			&i.LastPlayedAt,
 			&i.PlayCount,
 			&i.SkipCount,
-			&i.ReleaseDate,
 			&i.SimilarityScore,
 		); err != nil {
 			return nil, err
@@ -12,17 +12,19 @@ import (
 )

 const recommendationSourceMetricsForUser = `-- name: RecommendationSourceMetricsForUser :many
+
 SELECT
    pe.source,
-    pe.pick_kind,
    count(*)::bigint AS plays,
    count(*) FILTER (WHERE pe.was_skipped)::bigint AS skips,
-    count(pe.completion_ratio)::bigint AS completion_n,
-    COALESCE(avg(pe.completion_ratio), 0)::float8 AS avg_completion
+    COALESCE(
+        avg(pe.completion_ratio) FILTER (WHERE pe.completion_ratio IS NOT NULL),
+        0)::float8 AS avg_completion
 FROM play_events pe
 WHERE pe.user_id = $1
+  AND pe.source IS NOT NULL
  AND pe.started_at > now() - ($2::float8 * INTERVAL '1 day')
-GROUP BY pe.source, pe.pick_kind
+GROUP BY pe.source
 ORDER BY plays DESC
 `

@@ -33,17 +35,18 @@ type RecommendationSourceMetricsForUserParams struct {

 type RecommendationSourceMetricsForUserRow struct {
 	Source        *string
-	PickKind      *string
 	Plays         int64
 	Skips         int64
-	CompletionN   int64
 	AvgCompletion float64
 }

+// Recommendation observability (#796 phase 4). Per-source play outcomes so the
+// operator can see whether each recommendation surface is landing and tune the
+// taste weights. Source is stamped on play_events when a play is launched from
+// a system-playlist surface ('for_you' | 'discover' | the discovery mixes);
+// NULL for library / radio / user-playlist plays, which are excluded here.
 // $1 user_id, $2 window_days. plays/skips are counts; avg_completion is the
-// mean completion ratio over the completion_n plays that recorded one.
-// pick_kind splits For You plays into taste/fresh/unattributed (#1249);
-// it is NULL for every other source, so those still group to one row.
+// mean completion ratio over plays that recorded one (0 when none did).
 func (q *Queries) RecommendationSourceMetricsForUser(ctx context.Context, arg RecommendationSourceMetricsForUserParams) ([]RecommendationSourceMetricsForUserRow, error) {
 	rows, err := q.db.Query(ctx, recommendationSourceMetricsForUser, arg.UserID, arg.Column2)
 	if err != nil {
@@ -55,10 +58,8 @@ func (q *Queries) RecommendationSourceMetricsForUser(ctx context.Context, arg Re
 		var i RecommendationSourceMetricsForUserRow
 		if err := rows.Scan(
 			&i.Source,
-			&i.PickKind,
 			&i.Plays,
 			&i.Skips,
-			&i.CompletionN,
 			&i.AvgCompletion,
 		); err != nil {
 			return nil, err
@@ -70,83 +71,3 @@ func (q *Queries) RecommendationSourceMetricsForUser(ctx context.Context, arg Re
 	}
 	return items, nil
 }
-
-const recommendationWeeklyTrends = `-- name: RecommendationWeeklyTrends :many
-
-SELECT
-    date_trunc('week', pe.started_at)::date AS week_start,
-    pe.source,
-    count(*)::bigint AS plays,
-    count(*) FILTER (WHERE pe.was_skipped)::bigint AS skips,
-    count(pe.completion_ratio)::bigint AS completion_n,
-    COALESCE(avg(pe.completion_ratio), 0)::float8 AS avg_completion,
-    count(*) FILTER (WHERE tpa.artist_id IS NOT NULL)::bigint AS taste_hits
-FROM play_events pe
-JOIN tracks t ON t.id = pe.track_id
-LEFT JOIN taste_profile_artists tpa
-       ON tpa.user_id = pe.user_id
-      AND tpa.artist_id = t.artist_id
-      AND tpa.weight > 0
-WHERE pe.started_at > now() - ($1::int * INTERVAL '1 week')
-GROUP BY 1, 2
-ORDER BY 1, 2
-`
-
-type RecommendationWeeklyTrendsRow struct {
-	WeekStart     pgtype.Date
-	Source        *string
-	Plays         int64
-	Skips         int64
-	CompletionN   int64
-	AvgCompletion float64
-	TasteHits     int64
-}
-
-// Recommendation observability (#796 phase 4). Per-source play outcomes so the
-// operator can see whether each recommendation surface is landing and tune the
-// taste weights. Source is stamped on play_events when a play is launched from
-// a recommendation surface; NULL means the user picked the track manually —
-// those rows are INCLUDED here as the baseline control group the surfaces are
-// judged against (milestone #127: delta-vs-baseline is what makes the numbers
-// actionable). Raw source strings are bucketed into stable surface families in
-// the Go handler; completion_n is carried so family merges can weight
-// avg_completion correctly.
-// Weekly per-source outcome series for the tuning lab's trend view
-// (#1251). Aggregated across ALL users: the tuning knobs are global,
-// so judging a knob turn needs global outcomes — rows carry rates
-// only, no track or user identity. NULL-source (manual) rows are
-// included as the baseline family.
-//
-// taste_hits counts plays whose track's artist has a positive weight
-// in that user's CURRENT taste profile — the "cheap recompute" option:
-// retroactive over the whole window, at the cost of drift (the profile
-// is today's, the play may be weeks old). Good enough to read whether
-// a surface is feeding taste-fitting tracks.
-// $1 window in weeks.
-func (q *Queries) RecommendationWeeklyTrends(ctx context.Context, weeks int32) ([]RecommendationWeeklyTrendsRow, error) {
-	rows, err := q.db.Query(ctx, recommendationWeeklyTrends, weeks)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []RecommendationWeeklyTrendsRow
-	for rows.Next() {
-		var i RecommendationWeeklyTrendsRow
-		if err := rows.Scan(
-			&i.WeekStart,
-			&i.Source,
-			&i.Plays,
-			&i.Skips,
-			&i.CompletionN,
-			&i.AvgCompletion,
-			&i.TasteHits,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
@@ -1,302 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: recommendation_tuning.sql
-
-package dbq
-
-import (
-	"context"
-)
-
-const getTasteTuning = `-- name: GetTasteTuning :one
-SELECT singleton, half_life_days, engagement_hard_skip, engagement_neutral, engagement_full, updated_at, enriched_tag_scale, era_scale, mood_scale FROM taste_tuning WHERE singleton = true
-`
-
-func (q *Queries) GetTasteTuning(ctx context.Context) (TasteTuning, error) {
-	row := q.db.QueryRow(ctx, getTasteTuning)
-	var i TasteTuning
-	err := row.Scan(
-		&i.Singleton,
-		&i.HalfLifeDays,
-		&i.EngagementHardSkip,
-		&i.EngagementNeutral,
-		&i.EngagementFull,
-		&i.UpdatedAt,
-		&i.EnrichedTagScale,
-		&i.EraScale,
-		&i.MoodScale,
-	)
-	return i, err
-}
-
-const insertTuningAudit = `-- name: InsertTuningAudit :exec
-INSERT INTO recommendation_tuning_audit (scope, action, changes)
-VALUES ($1, $2, $3)
-`
-
-type InsertTuningAuditParams struct {
-	Scope   string
-	Action  string
-	Changes []byte
-}
-
-// changes is a jsonb array of {field, old, new} objects.
-func (q *Queries) InsertTuningAudit(ctx context.Context, arg InsertTuningAuditParams) error {
-	_, err := q.db.Exec(ctx, insertTuningAudit, arg.Scope, arg.Action, arg.Changes)
-	return err
-}
-
-const listTuningAudit = `-- name: ListTuningAudit :many
-SELECT id, changed_at, scope, action, changes
-  FROM recommendation_tuning_audit
- ORDER BY changed_at DESC, id DESC
- LIMIT $1
-`
-
-// Newest first; consumed by the metrics trend view (#1251) to annotate
-// knob turns on the timeline.
-func (q *Queries) ListTuningAudit(ctx context.Context, limit int32) ([]RecommendationTuningAudit, error) {
-	rows, err := q.db.Query(ctx, listTuningAudit, limit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []RecommendationTuningAudit
-	for rows.Next() {
-		var i RecommendationTuningAudit
-		if err := rows.Scan(
-			&i.ID,
-			&i.ChangedAt,
-			&i.Scope,
-			&i.Action,
-			&i.Changes,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listWeightProfiles = `-- name: ListWeightProfiles :many
-SELECT profile, base_weight, like_boost, recency_weight, skip_penalty, jitter_magnitude, context_weight, similarity_weight, taste_weight, updated_at, context_time_weight FROM recommendation_weight_profiles ORDER BY profile
-`
-
-func (q *Queries) ListWeightProfiles(ctx context.Context) ([]RecommendationWeightProfile, error) {
-	rows, err := q.db.Query(ctx, listWeightProfiles)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []RecommendationWeightProfile
-	for rows.Next() {
-		var i RecommendationWeightProfile
-		if err := rows.Scan(
-			&i.Profile,
-			&i.BaseWeight,
-			&i.LikeBoost,
-			&i.RecencyWeight,
-			&i.SkipPenalty,
-			&i.JitterMagnitude,
-			&i.ContextWeight,
-			&i.SimilarityWeight,
-			&i.TasteWeight,
-			&i.UpdatedAt,
-			&i.ContextTimeWeight,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const updateTasteTuning = `-- name: UpdateTasteTuning :one
-UPDATE taste_tuning
-   SET half_life_days       = $1,
-       engagement_hard_skip = $2,
-       engagement_neutral   = $3,
-       engagement_full      = $4,
-       enriched_tag_scale   = $5,
-       era_scale            = $6,
-       mood_scale           = $7,
-       updated_at           = now()
- WHERE singleton = true
-RETURNING singleton, half_life_days, engagement_hard_skip, engagement_neutral, engagement_full, updated_at, enriched_tag_scale, era_scale, mood_scale
-`
-
-type UpdateTasteTuningParams struct {
-	HalfLifeDays       float64
-	EngagementHardSkip float64
-	EngagementNeutral  float64
-	EngagementFull     float64
-	EnrichedTagScale   float64
-	EraScale           float64
-	MoodScale          float64
-}
-
-func (q *Queries) UpdateTasteTuning(ctx context.Context, arg UpdateTasteTuningParams) (TasteTuning, error) {
-	row := q.db.QueryRow(ctx, updateTasteTuning,
-		arg.HalfLifeDays,
-		arg.EngagementHardSkip,
-		arg.EngagementNeutral,
-		arg.EngagementFull,
-		arg.EnrichedTagScale,
-		arg.EraScale,
-		arg.MoodScale,
-	)
-	var i TasteTuning
-	err := row.Scan(
-		&i.Singleton,
-		&i.HalfLifeDays,
-		&i.EngagementHardSkip,
-		&i.EngagementNeutral,
-		&i.EngagementFull,
-		&i.UpdatedAt,
-		&i.EnrichedTagScale,
-		&i.EraScale,
-		&i.MoodScale,
-	)
-	return i, err
-}
-
-const updateWeightProfile = `-- name: UpdateWeightProfile :one
-UPDATE recommendation_weight_profiles
-   SET base_weight         = $2,
-       like_boost          = $3,
-       recency_weight      = $4,
-       skip_penalty        = $5,
-       jitter_magnitude    = $6,
-       context_weight      = $7,
-       similarity_weight   = $8,
-       taste_weight        = $9,
-       context_time_weight = $10,
-       updated_at          = now()
- WHERE profile = $1
-RETURNING profile, base_weight, like_boost, recency_weight, skip_penalty, jitter_magnitude, context_weight, similarity_weight, taste_weight, updated_at, context_time_weight
-`
-
-type UpdateWeightProfileParams struct {
-	Profile           string
-	BaseWeight        float64
-	LikeBoost         float64
-	RecencyWeight     float64
-	SkipPenalty       float64
-	JitterMagnitude   float64
-	ContextWeight     float64
-	SimilarityWeight  float64
-	TasteWeight       float64
-	ContextTimeWeight float64
-}
-
-func (q *Queries) UpdateWeightProfile(ctx context.Context, arg UpdateWeightProfileParams) (RecommendationWeightProfile, error) {
-	row := q.db.QueryRow(ctx, updateWeightProfile,
-		arg.Profile,
-		arg.BaseWeight,
-		arg.LikeBoost,
-		arg.RecencyWeight,
-		arg.SkipPenalty,
-		arg.JitterMagnitude,
-		arg.ContextWeight,
-		arg.SimilarityWeight,
-		arg.TasteWeight,
-		arg.ContextTimeWeight,
-	)
-	var i RecommendationWeightProfile
-	err := row.Scan(
-		&i.Profile,
-		&i.BaseWeight,
-		&i.LikeBoost,
-		&i.RecencyWeight,
-		&i.SkipPenalty,
-		&i.JitterMagnitude,
-		&i.ContextWeight,
-		&i.SimilarityWeight,
-		&i.TasteWeight,
-		&i.UpdatedAt,
-		&i.ContextTimeWeight,
-	)
-	return i, err
-}
-
-const upsertTasteTuningDefaults = `-- name: UpsertTasteTuningDefaults :exec
-INSERT INTO taste_tuning (
-    singleton, half_life_days, engagement_hard_skip,
-    engagement_neutral, engagement_full, enriched_tag_scale, era_scale,
-    mood_scale
-) VALUES (true, $1, $2, $3, $4, $5, $6, $7)
-ON CONFLICT (singleton) DO NOTHING
-`
-
-type UpsertTasteTuningDefaultsParams struct {
-	HalfLifeDays       float64
-	EngagementHardSkip float64
-	EngagementNeutral  float64
-	EngagementFull     float64
-	EnrichedTagScale   float64
-	EraScale           float64
-	MoodScale          float64
-}
-
-func (q *Queries) UpsertTasteTuningDefaults(ctx context.Context, arg UpsertTasteTuningDefaultsParams) error {
-	_, err := q.db.Exec(ctx, upsertTasteTuningDefaults,
-		arg.HalfLifeDays,
-		arg.EngagementHardSkip,
-		arg.EngagementNeutral,
-		arg.EngagementFull,
-		arg.EnrichedTagScale,
-		arg.EraScale,
-		arg.MoodScale,
-	)
-	return err
-}
-
-const upsertWeightProfileDefaults = `-- name: UpsertWeightProfileDefaults :exec
-
-INSERT INTO recommendation_weight_profiles (
-    profile, base_weight, like_boost, recency_weight, skip_penalty,
-    jitter_magnitude, context_weight, similarity_weight, taste_weight,
-    context_time_weight
-) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
-ON CONFLICT (profile) DO NOTHING
-`
-
-type UpsertWeightProfileDefaultsParams struct {
-	Profile           string
-	BaseWeight        float64
-	LikeBoost         float64
-	RecencyWeight     float64
-	SkipPenalty       float64
-	JitterMagnitude   float64
-	ContextWeight     float64
-	SimilarityWeight  float64
-	TasteWeight       float64
-	ContextTimeWeight float64
-}
-
-// Recommendation tuning lab queries (#1250). Seeding happens via the
-// recsettings boot reconcile; shipped defaults live in Go only.
-// Boot reconcile: insert the shipped defaults for a profile if the row
-// doesn't exist yet. Never overwrites operator-tuned values.
-func (q *Queries) UpsertWeightProfileDefaults(ctx context.Context, arg UpsertWeightProfileDefaultsParams) error {
-	_, err := q.db.Exec(ctx, upsertWeightProfileDefaults,
-		arg.Profile,
-		arg.BaseWeight,
-		arg.LikeBoost,
-		arg.RecencyWeight,
-		arg.SkipPenalty,
-		arg.JitterMagnitude,
-		arg.ContextWeight,
-		arg.SimilarityWeight,
-		arg.TasteWeight,
-		arg.ContextTimeWeight,
-	)
-	return err
-}
@@ -27,20 +27,12 @@ play_counts AS (
      FROM play_events
     WHERE user_id = $1 AND was_skipped = false
     GROUP BY track_id
-),
-skip_counts AS (
-    SELECT track_id, COUNT(*) AS c
-      FROM play_events
-     WHERE user_id = $1 AND was_skipped = true
-     GROUP BY track_id
 )
 SELECT t.id, t.album_id, t.artist_id
  FROM tracks t
  JOIN affinity_artists aa ON aa.artist_id = t.artist_id
  LEFT JOIN play_counts pc ON pc.track_id = t.id
-  LEFT JOIN skip_counts sc ON sc.track_id = t.id
 WHERE COALESCE(pc.c, 0) <= 2
-   AND COALESCE(sc.c, 0) < 2
   AND NOT EXISTS (
       SELECT 1 FROM lidarr_quarantine q
        WHERE q.user_id = $1 AND q.track_id = t.id
@@ -68,11 +60,6 @@ type ListDeepCutsTracksRow struct {
 // gives per-play variety on top.
 // #419 Deep Cuts: low-play tracks (<=2 plays) from artists the user
 // has liked OR played heavily (>=5 non-skip plays across the artist).
-// Tracks the user has skipped twice or more don't qualify (#1257):
-// eligibility used to count only unskipped plays, so the most actively
-// rejected tracks read as "barely heard" and kept being re-offered.
-// Threshold 2 so a single accidental skip doesn't banish a track;
-// passive-signal only (no dislike UI, rule #101).
 // $1 user_id, $2 date string.
 func (q *Queries) ListDeepCutsTracks(ctx context.Context, arg ListDeepCutsTracksParams) ([]ListDeepCutsTracksRow, error) {
 	rows, err := q.db.Query(ctx, listDeepCutsTracks, arg.UserID, arg.Column2)
@@ -95,49 +82,31 @@ func (q *Queries) ListDeepCutsTracks(ctx context.Context, arg ListDeepCutsTracks
 }

 const listFirstListensTracks = `-- name: ListFirstListensTracks :many
-WITH attempted AS (
-    SELECT DISTINCT pe.track_id
-      FROM play_events pe
-     WHERE pe.user_id = $1 AND pe.duration_played_ms >= 30000
+WITH heard_albums AS (
+    SELECT DISTINCT t.album_id
+      FROM play_events pe JOIN tracks t ON t.id = pe.track_id
+     WHERE pe.user_id = $1
 ),
-album_attempts AS (
-    SELECT t.album_id,
-           COUNT(a.track_id) AS attempted_count,
-           COUNT(*) AS track_count
-      FROM tracks t
-      LEFT JOIN attempted a ON a.track_id = t.id
-     GROUP BY t.album_id
-),
-attempted_artists AS (
+played_artists AS (
    SELECT DISTINCT t.artist_id
-      FROM attempted a JOIN tracks t ON t.id = a.track_id
-),
-albums_tiered AS (
-    SELECT aa.album_id,
-           CASE
-             WHEN aa.attempted_count = 0 THEN 1
-             WHEN aa.attempted_count::float / GREATEST(aa.track_count, 1) <= 0.25 THEN 2
-           END AS tier
-      FROM album_attempts aa
+      FROM play_events pe JOIN tracks t ON t.id = pe.track_id
+     WHERE pe.user_id = $1
 )
-SELECT t.id, t.album_id, t.artist_id, alt.tier::int AS tier
+SELECT t.id, t.album_id, t.artist_id
  FROM tracks t
  JOIN albums al ON al.id = t.album_id
-  JOIN albums_tiered alt ON alt.album_id = al.id
- WHERE alt.tier IS NOT NULL
-   AND NOT EXISTS (SELECT 1 FROM attempted a WHERE a.track_id = t.id)
+ WHERE NOT EXISTS (SELECT 1 FROM heard_albums h WHERE h.album_id = al.id)
   AND NOT EXISTS (
       SELECT 1 FROM lidarr_quarantine q
        WHERE q.user_id = $1 AND q.track_id = t.id
   )
 ORDER BY
-   alt.tier,
   (CASE
      WHEN EXISTS (
        SELECT 1 FROM general_likes_artists gla
         WHERE gla.user_id = $1 AND gla.artist_id = al.artist_id
      ) THEN 0
-      WHEN al.artist_id IN (SELECT artist_id FROM attempted_artists) THEN 1
+      WHEN al.artist_id IN (SELECT artist_id FROM played_artists) THEN 1
      ELSE 2
    END),
   al.id, t.disc_number NULLS FIRST, t.track_number NULLS FIRST
@@ -148,25 +117,12 @@ type ListFirstListensTracksRow struct {
 	ID       pgtype.UUID
 	AlbumID  pgtype.UUID
 	ArtistID pgtype.UUID
-	Tier     int32
 }

-// #423 First Listens: songs the user has never heard or even
-// attempted. "Attempted" is track-level with a >=30s listen threshold
-// (#1268, operator decision 2026-07-03) — the old version disqualified
-// a whole album on ANY play_event, so a 2-second accidental brush
-// banished it permanently.
-//
-//	tier 1  the exact desire: albums with ZERO attempted tracks
-//	tier 2  step back: barely-attempted albums (<=25% of tracks
-//	        reached 30s) — brushed, never explored. The already-
-//	        attempted tracks themselves are excluded; they're not
-//	        first listens.
-//
-// Within each tier, affinity-ordered as before: liked artist, then
-// attempted-played artist (>=30s — skip-only contact isn't trust),
-// then the rest; album-coherent. The tier lands on
-// playlist_tracks.pick_kind via the producer. $1 user_id.
+// #423 First Listens: albums the user has never played any track of.
+// Tiered: liked-artist albums first, then played-artist albums, then
+// the rest — album-coherent within each tier. Not diversity-capped
+// (whole-album discovery). $1 user_id.
 func (q *Queries) ListFirstListensTracks(ctx context.Context, userID pgtype.UUID) ([]ListFirstListensTracksRow, error) {
 	rows, err := q.db.Query(ctx, listFirstListensTracks, userID)
 	if err != nil {
@@ -176,12 +132,7 @@ func (q *Queries) ListFirstListensTracks(ctx context.Context, userID pgtype.UUID
 	var items []ListFirstListensTracksRow
 	for rows.Next() {
 		var i ListFirstListensTracksRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.AlbumID,
-			&i.ArtistID,
-			&i.Tier,
-		); err != nil {
+		if err := rows.Scan(&i.ID, &i.AlbumID, &i.ArtistID); err != nil {
 			return nil, err
 		}
 		items = append(items, i)
@@ -193,76 +144,39 @@ func (q *Queries) ListFirstListensTracks(ctx context.Context, userID pgtype.UUID
 }

 const listNewForYouTracks = `-- name: ListNewForYouTracks :many
-WITH attempted AS (
-    SELECT DISTINCT pe.track_id
-      FROM play_events pe
-     WHERE pe.user_id = $1 AND pe.duration_played_ms >= 30000
-),
-consumed_albums AS (
-    SELECT DISTINCT t.album_id
-      FROM attempted a JOIN tracks t ON t.id = a.track_id
-),
-affinity_artists AS (
-    SELECT gla.artist_id FROM general_likes_artists gla WHERE gla.user_id = $1
+WITH affinity_artists AS (
+    SELECT artist_id FROM general_likes_artists WHERE user_id = $1
    UNION
    SELECT t.artist_id
-      FROM attempted a JOIN tracks t ON t.id = a.track_id
+      FROM play_events pe JOIN tracks t ON t.id = pe.track_id
+     WHERE pe.user_id = $1 AND pe.was_skipped = false
     GROUP BY t.artist_id
    HAVING COUNT(*) >= 3
-),
-albums_tiered AS (
-    SELECT al.id AS album_id, al.created_at,
-           CASE
-             WHEN al.created_at >= now() - interval '30 days'
-                  AND al.artist_id IN (SELECT artist_id FROM affinity_artists) THEN 1
-             WHEN al.artist_id IN (SELECT artist_id FROM affinity_artists) THEN 2
-             ELSE 3
-           END AS tier
-      FROM albums al
-     WHERE al.created_at >= now() - interval '90 days'
-       AND al.id NOT IN (SELECT album_id FROM consumed_albums)
 )
-SELECT t.id, t.album_id, t.artist_id, alt.tier::int AS tier
+SELECT t.id, t.album_id, t.artist_id
  FROM tracks t
-  JOIN albums_tiered alt ON alt.album_id = t.album_id
- WHERE NOT EXISTS (
+  JOIN albums al ON al.id = t.album_id
+  JOIN affinity_artists aa ON aa.artist_id = al.artist_id
+ WHERE al.created_at >= now() - interval '30 days'
+   AND NOT EXISTS (
       SELECT 1 FROM lidarr_quarantine q
        WHERE q.user_id = $1 AND q.track_id = t.id
   )
- ORDER BY alt.tier, alt.created_at DESC, t.album_id,
-          t.disc_number NULLS FIRST, t.track_number NULLS FIRST
- LIMIT 300
+ ORDER BY al.created_at DESC, t.disc_number NULLS FIRST, t.track_number NULLS FIRST
+ LIMIT 200
 `

 type ListNewForYouTracksRow struct {
 	ID       pgtype.UUID
 	AlbumID  pgtype.UUID
 	ArtistID pgtype.UUID
-	Tier     int32
 }

-// #421 New for you, tiered per project rule #131 (#1267). The old
-// single hard rule (added <30d AND direct affinity) had two failure
-// modes with one root: no notion of consumption — the album you
-// devoured in week one crowded the mix for three more weeks, and
-// after a quiet month nothing qualified at all.
-//
-// "Consumed" = any track attempted for >=30s (the First Listens
-// threshold, #1268): once you've meaningfully engaged, the album is
-// no longer news. Applies to every tier — played albums leave the
-// mix the next build.
-//
-//	tier 1  the exact desire: unconsumed albums added <30d by
-//	        direct-affinity artists (liked, or >=3 attempted plays)
-//	tier 2  step back a little: unconsumed affinity albums from the
-//	        wider 30-90d window — added while you weren't looking
-//	tier 3  step back more: any unconsumed album added <90d
-//	        regardless of affinity, newest first
-//
-// Album-coherent within tiers (newest album first, then disc/track);
-// the producer fills top-down and rotates within tier blocks. The
-// tier lands on playlist_tracks.pick_kind so metrics can price what
-// each step-back trades away. $1 user_id.
+// #421 New for you: tracks from albums added in the last 30 days
+// whose artist the user has liked OR played (>=3 non-skip). Album-
+// coherent (newest album first, then disc/track) — the producer does
+// NOT diversity-cap these; they're meant as whole-album discovery.
+// $1 user_id.
 func (q *Queries) ListNewForYouTracks(ctx context.Context, userID pgtype.UUID) ([]ListNewForYouTracksRow, error) {
 	rows, err := q.db.Query(ctx, listNewForYouTracks, userID)
 	if err != nil {
@@ -272,12 +186,7 @@ func (q *Queries) ListNewForYouTracks(ctx context.Context, userID pgtype.UUID) (
 	var items []ListNewForYouTracksRow
 	for rows.Next() {
 		var i ListNewForYouTracksRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.AlbumID,
-			&i.ArtistID,
-			&i.Tier,
-		); err != nil {
+		if err := rows.Scan(&i.ID, &i.AlbumID, &i.ArtistID); err != nil {
 			return nil, err
 		}
 		items = append(items, i)
@@ -294,10 +203,7 @@ WITH windowed AS (
      FROM play_events
     WHERE user_id = $1 AND was_skipped = false
       AND started_at < now() - interval '30 days'
-       AND LEAST(
-           ABS(EXTRACT(DOY FROM started_at) - EXTRACT(DOY FROM $2::date)),
-           365 - ABS(EXTRACT(DOY FROM started_at) - EXTRACT(DOY FROM $2::date))
-       ) <= 10
+       AND ABS(EXTRACT(DOY FROM started_at) - EXTRACT(DOY FROM now())) <= 10
     GROUP BY track_id
 )
 SELECT t.id, t.album_id, t.artist_id
@@ -329,13 +235,6 @@ type ListOnThisDayTracksRow struct {
 // and window ±7→±10 so it surfaces on a months-old library instead
 // of needing a full year of history; still skips cleanly (no rows →
 // no playlist) when there's no qualifying history yet.
-// Day-of-year distance is circular (#1256): plain ABS made Dec 28 vs
-// Jan 3 read as 359 days apart, silently gutting the window for ~3
-// weeks around every New Year — precisely when holiday nostalgia is
-// the point. LEAST(d, 365-d) wraps the boundary; leap-year drift of
-// ±1 is absorbed by the ±10 window. The build date ($2, already here
-// for the md5 rotation) anchors "today" instead of now() so the
-// window is testable and consistent with the mix's daily determinism.
 // $1 user_id, $2 date string.
 func (q *Queries) ListOnThisDayTracks(ctx context.Context, arg ListOnThisDayTracksParams) ([]ListOnThisDayTracksRow, error) {
 	rows, err := q.db.Query(ctx, listOnThisDayTracks, arg.UserID, arg.Column2)
@@ -363,32 +262,37 @@ WITH stats AS (
      FROM play_events pe
     WHERE pe.user_id = $1 AND pe.was_skipped = false
     GROUP BY pe.track_id
+),
+deep AS (
+    SELECT t.id, t.album_id, t.artist_id, s.c, 0 AS tier
+      FROM tracks t
+      JOIN stats s ON s.track_id = t.id
+     WHERE s.c >= 5
+       AND s.last_at <= now() - interval '6 months'
+       AND NOT EXISTS (
+           SELECT 1 FROM lidarr_quarantine q
+            WHERE q.user_id = $1 AND q.track_id = t.id
+       )
+),
+shallow AS (
+    SELECT t.id, t.album_id, t.artist_id, s.c, 1 AS tier
+      FROM tracks t
+      JOIN stats s ON s.track_id = t.id
+     WHERE s.c >= 5
+       AND s.last_at <= now() - interval '30 days'
+       AND NOT EXISTS (
+           SELECT 1 FROM lidarr_quarantine q
+            WHERE q.user_id = $1 AND q.track_id = t.id
+       )
 )
-SELECT t.id, t.album_id, t.artist_id
-  FROM tracks t
-  JOIN stats s ON s.track_id = t.id
- WHERE s.c >= 3
-   AND s.last_at <= now() - interval '30 days'
-   AND NOT EXISTS (
-       SELECT 1 FROM lidarr_quarantine q
-        WHERE q.user_id = $1 AND q.track_id = t.id
-   )
-   -- Declined-resurfacing cooldown (#1258): a skip on a
-   -- rediscover-sourced play is the user explicitly saying "I've moved
-   -- on" to the exact invitation this mix extends — such tracks sit
-   -- out ~90 days instead of re-qualifying the next day. Passive
-   -- signal only (rule #101).
-   AND NOT EXISTS (
-       SELECT 1 FROM play_events rp
-        WHERE rp.user_id = $1
-          AND rp.track_id = t.id
-          AND rp.source = 'rediscover'
-          AND rp.was_skipped = true
-          AND rp.started_at > now() - interval '90 days'
-   )
- ORDER BY (s.last_at <= now() - interval '6 months') DESC,
-          (s.c >= 5) DESC,
-          s.c DESC, t.id
+SELECT id, album_id, artist_id
+  FROM (
+    SELECT id, album_id, artist_id, c, tier FROM deep
+    UNION ALL
+    SELECT id, album_id, artist_id, c, tier FROM shallow
+     WHERE NOT EXISTS (SELECT 1 FROM deep)
+  ) u
+ ORDER BY tier, c DESC, id
 LIMIT 200
 `

@@ -398,17 +302,13 @@ type ListRediscoverTracksRow struct {
 	ArtistID pgtype.UUID
 }

-// #420 Rediscover: tracks the user played a lot but has drifted away
-// from. One blended pool (issue #1246: the old two-tier UNION was
-// all-or-nothing — a single ">=6 months cold" row suppressed the whole
-// ">=30 days" tier, which is how a one-song playlist shipped; the 6mo
-// tier was also a strict subset of the 30d tier). Eligibility is >=3
-// non-skip plays and >=30 days cold; the bar sits at 3 rather than 5
-// so a weeks-old library still fields a pool — on young histories the
-// >=5-play tracks are precisely the ones still in rotation. Ordering
-// prefers true rediscoveries (>=6 months cold), then strong affection
-// (>=5 plays), then raw play count; the producer's minimum floor
-// decides whether the pool is big enough to ship at all. $1 user_id.
+// #420 Rediscover: tracks the user played a lot (>=5 non-skip) but
+// has drifted away from. Tiered so a young library still gets a mix:
+//
+//	tier 0  not played in the last 6 months (true rediscovery)
+//	tier 1  (only if tier 0 empty) not played in the last 30 days
+//
+// Ordered by historical affection. $1 user_id.
 func (q *Queries) ListRediscoverTracks(ctx context.Context, userID pgtype.UUID) ([]ListRediscoverTracksRow, error) {
 	rows, err := q.db.Query(ctx, listRediscoverTracks, userID)
 	if err != nil {
@@ -290,13 +290,9 @@ func (q *Queries) ListPlaylistsByUserAndKind(ctx context.Context, arg ListPlayli
 }

 const pickSeedArtists = `-- name: PickSeedArtists :many
-WITH liked AS (
-    SELECT gla.artist_id FROM general_likes_artists gla WHERE gla.user_id = $1
-),
-recent7 AS (
+WITH plays AS (
    SELECT t.artist_id,
-           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count,
-           0 AS tier
+           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count
      FROM play_events pe
      JOIN tracks t ON t.id = pe.track_id
     WHERE pe.user_id = $1
@@ -304,80 +300,27 @@ recent7 AS (
       AND t.artist_id IS NOT NULL
     GROUP BY t.artist_id
 ),
-recent30 AS (
-    SELECT t.artist_id,
-           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count,
-           1 AS tier
-      FROM play_events pe
-      JOIN tracks t ON t.id = pe.track_id
-     WHERE pe.user_id = $1
-       AND pe.started_at > now() - INTERVAL '30 days'
-       AND t.artist_id IS NOT NULL
-     GROUP BY t.artist_id
-),
-alltime AS (
-    SELECT t.artist_id,
-           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count,
-           2 AS tier
-      FROM play_events pe
-      JOIN tracks t ON t.id = pe.track_id
-     WHERE pe.user_id = $1
-       AND t.artist_id IS NOT NULL
-     GROUP BY t.artist_id
-),
-likedonly AS (
-    SELECT l.artist_id, 0::bigint AS play_count, 3 AS tier
-      FROM liked l
-),
-chosen AS (
-    SELECT artist_id, play_count, tier FROM recent7
-    UNION ALL
-    SELECT artist_id, play_count, tier FROM recent30
-     WHERE NOT EXISTS (SELECT 1 FROM recent7)
-    UNION ALL
-    SELECT artist_id, play_count, tier FROM alltime
-     WHERE NOT EXISTS (SELECT 1 FROM recent7)
-       AND NOT EXISTS (SELECT 1 FROM recent30)
-    UNION ALL
-    SELECT artist_id, play_count, tier FROM likedonly
-     WHERE NOT EXISTS (SELECT 1 FROM recent7)
-       AND NOT EXISTS (SELECT 1 FROM recent30)
-       AND NOT EXISTS (SELECT 1 FROM alltime)
+liked AS (
+    SELECT artist_id FROM general_likes_artists WHERE user_id = $1
 )
-SELECT c.artist_id,
-       (c.play_count + CASE WHEN l.artist_id IS NOT NULL THEN 5 ELSE 0 END)::bigint AS score,
-       c.tier::int AS tier
-  FROM chosen c
-  LEFT JOIN liked l ON l.artist_id = c.artist_id
- ORDER BY score DESC, c.artist_id
- LIMIT 12
+SELECT p.artist_id,
+       (p.play_count + CASE WHEN l.artist_id IS NOT NULL THEN 5 ELSE 0 END)::bigint AS score
+  FROM plays p
+  LEFT JOIN liked l ON l.artist_id = p.artist_id
+ ORDER BY score DESC, p.artist_id
+ LIMIT 5
 `

 type PickSeedArtistsRow struct {
 	ArtistID pgtype.UUID
 	Score    int64
-	Tier     int32
 }

-// Top-12 most-engaged distinct artist candidates, tiered so the
-// "Songs like X" mixes never silently vanish (#1255): the old hard
-// 7-day window emptied the seed pool after a quiet week, and the
-// daily atomic-replace build then deleted every existing mix until
-// the user played something again. Same fallback shape as
-// PickTopPlayedTracksForUser (For You's seeds):
-//
-//	tier 0  engagement in the last 7 days
-//	tier 1  (only if tier 0 empty) last 30 days
-//	tier 2  (only if tiers 0+1 empty) all-time
-//	tier 3  (only if 0-2 empty) liked artists with no play history
-//
-// All returned rows share one tier; produceSeedMixes maps it onto the
-// rule-#131 pick-kind ladder and stamps the built tracks, so metrics
-// can compare mixes seeded from fresh vs stale engagement.
-// Score = unskipped-play count + 5 if user has liked the artist. The
-// Go-side picker (pickSeedArtistsForDay) shuffles the 12
-// daily-deterministically and takes songsLikeSeedCount (6) so the mix
-// set both rotates day-to-day and fills the dedicated Home row (#1491).
+// Top-5 most-engaged distinct artist candidates in the user's last 7
+// days. The Go-side picker (pickSeedArtistsForDay) shuffles these
+// daily-deterministically and takes the first 3 so the set of
+// "Songs like X" mixes rotates day-to-day.
+// Score = unskipped-play count + 5 if user has liked the artist.
 func (q *Queries) PickSeedArtists(ctx context.Context, userID pgtype.UUID) ([]PickSeedArtistsRow, error) {
 	rows, err := q.db.Query(ctx, pickSeedArtists, userID)
 	if err != nil {
@@ -387,7 +330,7 @@ func (q *Queries) PickSeedArtists(ctx context.Context, userID pgtype.UUID) ([]Pi
 	var items []PickSeedArtistsRow
 	for rows.Next() {
 		var i PickSeedArtistsRow
-		if err := rows.Scan(&i.ArtistID, &i.Score, &i.Tier); err != nil {
+		if err := rows.Scan(&i.ArtistID, &i.Score); err != nil {
 			return nil, err
 		}
 		items = append(items, i)
@@ -514,10 +457,10 @@ SELECT id
 //	tier 2  (only if tiers 0+1 empty) liked tracks
 //
 // Returns up to 5 ids; tie-break by track_id for determinism. The
-// Go-side picker (pickDailySeeds) draws the day's seeds from these.
-// Widened from a hard 7-day window, which made For-You disappear
-// after a week of not listening and never recover on a self-hosted
-// library with sparse history.
+// Go-side picker (pickForYouSeedForDay) rotates one per day via
+// userIDHash. Widened from a hard 7-day window, which made For-You
+// disappear after a week of not listening and never recover on a
+// self-hosted library with sparse history.
 func (q *Queries) PickTopPlayedTracksForUser(ctx context.Context, userID pgtype.UUID) ([]pgtype.UUID, error) {
 	rows, err := q.db.Query(ctx, pickTopPlayedTracksForUser, userID)
 	if err != nil {
@@ -1,157 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: tag_settings.sql
-
-package dbq
-
-import (
-	"context"
-)
-
-const bumpTagSourcesVersion = `-- name: BumpTagSourcesVersion :one
-UPDATE tag_sources_meta
-   SET current_version = current_version + 1
- WHERE id = true
-RETURNING current_version
-`
-
-// Increment + return the new version. Called only when the enabled set
-// changes (not on key edits).
-func (q *Queries) BumpTagSourcesVersion(ctx context.Context) (int32, error) {
-	row := q.db.QueryRow(ctx, bumpTagSourcesVersion)
-	var current_version int32
-	err := row.Scan(&current_version)
-	return current_version, err
-}
-
-const bumpTagVersionAndSetProvidersHash = `-- name: BumpTagVersionAndSetProvidersHash :one
-UPDATE tag_sources_meta
-   SET current_version = current_version + 1,
-       last_registered_providers_hash = $1
- WHERE id = true
-RETURNING current_version
-`
-
-// Atomically increment the version and store the new registered-provider
-// hash. Called at boot when the compiled-in provider set changed, so
-// 'none' rows become eligible for a retry through the new chain.
-func (q *Queries) BumpTagVersionAndSetProvidersHash(ctx context.Context, lastRegisteredProvidersHash string) (int32, error) {
-	row := q.db.QueryRow(ctx, bumpTagVersionAndSetProvidersHash, lastRegisteredProvidersHash)
-	var current_version int32
-	err := row.Scan(&current_version)
-	return current_version, err
-}
-
-const getCurrentTagSourcesVersion = `-- name: GetCurrentTagSourcesVersion :one
-SELECT current_version FROM tag_sources_meta WHERE id = true
-`
-
-func (q *Queries) GetCurrentTagSourcesVersion(ctx context.Context) (int32, error) {
-	row := q.db.QueryRow(ctx, getCurrentTagSourcesVersion)
-	var current_version int32
-	err := row.Scan(&current_version)
-	return current_version, err
-}
-
-const getTagProvidersHash = `-- name: GetTagProvidersHash :one
-SELECT last_registered_providers_hash
-  FROM tag_sources_meta
- WHERE id = true
-`
-
-func (q *Queries) GetTagProvidersHash(ctx context.Context) (string, error) {
-	row := q.db.QueryRow(ctx, getTagProvidersHash)
-	var last_registered_providers_hash string
-	err := row.Scan(&last_registered_providers_hash)
-	return last_registered_providers_hash, err
-}
-
-const listTagProviderSettings = `-- name: ListTagProviderSettings :many
-
-SELECT provider_id, enabled, api_key, display_order, created_at, updated_at
-  FROM tag_provider_settings
- ORDER BY display_order, provider_id
-`
-
-// Tag-enrichment provider settings queries (milestone #160, #1490 Step 2).
-// The tags.SettingsService consumes these — parallel to the cover-art
-// SettingsService (coverart_settings.sql). Keeping the two independent
-// means a new tag source is added without touching the art settings.
-// All rows, for boot reconciliation and the admin GET handler.
-func (q *Queries) ListTagProviderSettings(ctx context.Context) ([]TagProviderSetting, error) {
-	rows, err := q.db.Query(ctx, listTagProviderSettings)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []TagProviderSetting
-	for rows.Next() {
-		var i TagProviderSetting
-		if err := rows.Scan(
-			&i.ProviderID,
-			&i.Enabled,
-			&i.ApiKey,
-			&i.DisplayOrder,
-			&i.CreatedAt,
-			&i.UpdatedAt,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const updateTagProviderSettings = `-- name: UpdateTagProviderSettings :exec
-UPDATE tag_provider_settings
-   SET enabled    = COALESCE($2, enabled),
-       api_key    = CASE WHEN $3::boolean THEN $4 ELSE api_key END,
-       updated_at = now()
- WHERE provider_id = $1
-`
-
-type UpdateTagProviderSettingsParams struct {
-	ProviderID string
-	Enabled    bool
-	Column3    bool
-	ApiKey     *string
-}
-
-// Admin PATCH. $2 sets enabled. Pass FALSE for the $3 apiKeyChanged flag
-// to leave api_key untouched; TRUE with empty string clears it, TRUE with
-// a value sets it.
-func (q *Queries) UpdateTagProviderSettings(ctx context.Context, arg UpdateTagProviderSettingsParams) error {
-	_, err := q.db.Exec(ctx, updateTagProviderSettings,
-		arg.ProviderID,
-		arg.Enabled,
-		arg.Column3,
-		arg.ApiKey,
-	)
-	return err
-}
-
-const upsertTagProviderSettings = `-- name: UpsertTagProviderSettings :exec
-INSERT INTO tag_provider_settings (provider_id, enabled, display_order)
-VALUES ($1, $2, $3)
-ON CONFLICT (provider_id) DO UPDATE
-   SET display_order = EXCLUDED.display_order,
-       updated_at    = now()
-`
-
-type UpsertTagProviderSettingsParams struct {
-	ProviderID   string
-	Enabled      bool
-	DisplayOrder int32
-}
-
-// INSERT a default row for a newly-registered provider, or refresh an
-// existing row's display_order on boot. Does NOT overwrite enabled /
-// api_key on conflict — the operator's settings persist across restarts.
-func (q *Queries) UpsertTagProviderSettings(ctx context.Context, arg UpsertTagProviderSettingsParams) error {
-	_, err := q.db.Exec(ctx, upsertTagProviderSettings, arg.ProviderID, arg.Enabled, arg.DisplayOrder)
-	return err
-}
@@ -20,24 +20,6 @@ func (q *Queries) DeleteTasteProfileArtistsForUser(ctx context.Context, userID p
 	return err
 }

-const deleteTasteProfileErasForUser = `-- name: DeleteTasteProfileErasForUser :exec
-DELETE FROM taste_profile_eras WHERE user_id = $1
-`
-
-func (q *Queries) DeleteTasteProfileErasForUser(ctx context.Context, userID pgtype.UUID) error {
-	_, err := q.db.Exec(ctx, deleteTasteProfileErasForUser, userID)
-	return err
-}
-
-const deleteTasteProfileMoodsForUser = `-- name: DeleteTasteProfileMoodsForUser :exec
-DELETE FROM taste_profile_moods WHERE user_id = $1
-`
-
-func (q *Queries) DeleteTasteProfileMoodsForUser(ctx context.Context, userID pgtype.UUID) error {
-	_, err := q.db.Exec(ctx, deleteTasteProfileMoodsForUser, userID)
-	return err
-}
-
 const deleteTasteProfileTagsForUser = `-- name: DeleteTasteProfileTagsForUser :exec
 DELETE FROM taste_profile_tags WHERE user_id = $1
 `
@@ -63,38 +45,6 @@ func (q *Queries) InsertTasteProfileArtist(ctx context.Context, arg InsertTasteP
 	return err
 }

-const insertTasteProfileEra = `-- name: InsertTasteProfileEra :exec
-INSERT INTO taste_profile_eras (user_id, era, weight)
-VALUES ($1, $2, $3)
-`
-
-type InsertTasteProfileEraParams struct {
-	UserID pgtype.UUID
-	Era    string
-	Weight float64
-}
-
-func (q *Queries) InsertTasteProfileEra(ctx context.Context, arg InsertTasteProfileEraParams) error {
-	_, err := q.db.Exec(ctx, insertTasteProfileEra, arg.UserID, arg.Era, arg.Weight)
-	return err
-}
-
-const insertTasteProfileMood = `-- name: InsertTasteProfileMood :exec
-INSERT INTO taste_profile_moods (user_id, mood, weight)
-VALUES ($1, $2, $3)
-`
-
-type InsertTasteProfileMoodParams struct {
-	UserID pgtype.UUID
-	Mood   string
-	Weight float64
-}
-
-func (q *Queries) InsertTasteProfileMood(ctx context.Context, arg InsertTasteProfileMoodParams) error {
-	_, err := q.db.Exec(ctx, insertTasteProfileMood, arg.UserID, arg.Mood, arg.Weight)
-	return err
-}
-
 const insertTasteProfileTag = `-- name: InsertTasteProfileTag :exec
 INSERT INTO taste_profile_tags (user_id, tag, weight)
 VALUES ($1, $2, $3)
@@ -137,23 +87,19 @@ func (q *Queries) ListLikedArtistIDsForUser(ctx context.Context, userID pgtype.U
 }

 const listLikedTrackTasteInputsForUser = `-- name: ListLikedTrackTasteInputsForUser :many
-SELECT t.id AS track_id, t.artist_id, t.genre, a.release_date
+SELECT t.artist_id, t.genre
 FROM general_likes gl
 JOIN tracks t ON t.id = gl.track_id
-JOIN albums a ON a.id = t.album_id
 WHERE gl.user_id = $1
 `

 type ListLikedTrackTasteInputsForUserRow struct {
-	TrackID     pgtype.UUID
-	ArtistID    pgtype.UUID
-	Genre       *string
-	ReleaseDate pgtype.Date
+	ArtistID pgtype.UUID
+	Genre    *string
 }

-// (track_id, artist_id, genre, release_date) for each track the user has
-// explicitly liked. Feeds the track-like bonus into the liked track's artist,
-// tags, and era (#1530); track_id keys the enriched track_tags lookup (#1490).
+// (artist_id, genre) for each track the user has explicitly liked. Feeds the
+// track-like bonus into the liked track's artist and tags.
 func (q *Queries) ListLikedTrackTasteInputsForUser(ctx context.Context, userID pgtype.UUID) ([]ListLikedTrackTasteInputsForUserRow, error) {
 	rows, err := q.db.Query(ctx, listLikedTrackTasteInputsForUser, userID)
 	if err != nil {
@@ -163,12 +109,7 @@ func (q *Queries) ListLikedTrackTasteInputsForUser(ctx context.Context, userID p
 	var items []ListLikedTrackTasteInputsForUserRow
 	for rows.Next() {
 		var i ListLikedTrackTasteInputsForUserRow
-		if err := rows.Scan(
-			&i.TrackID,
-			&i.ArtistID,
-			&i.Genre,
-			&i.ReleaseDate,
-		); err != nil {
+		if err := rows.Scan(&i.ArtistID, &i.Genre); err != nil {
 			return nil, err
 		}
 		items = append(items, i)
@@ -182,10 +123,8 @@ func (q *Queries) ListLikedTrackTasteInputsForUser(ctx context.Context, userID p
 const listPlayEngagementInputsForUser = `-- name: ListPlayEngagementInputsForUser :many

 SELECT
-    t.id AS track_id,
    t.artist_id,
    t.genre,
-    a.release_date,
    LEAST(GREATEST(
        COALESCE(pe.completion_ratio,
                 pe.duration_played_ms::float8 / NULLIF(t.duration_ms, 0),
@@ -193,7 +132,6 @@ SELECT
    (EXTRACT(epoch FROM now() - pe.started_at) / 86400.0)::float8 AS age_days
 FROM play_events pe
 JOIN tracks t ON t.id = pe.track_id
-JOIN albums a ON a.id = t.album_id
 WHERE pe.user_id = $1
  AND pe.started_at > now() - ($2::float8 * INTERVAL '1 day')
  AND NOT EXISTS (
@@ -208,12 +146,10 @@ type ListPlayEngagementInputsForUserParams struct {
 }

 type ListPlayEngagementInputsForUserRow struct {
-	TrackID     pgtype.UUID
-	ArtistID    pgtype.UUID
-	Genre       *string
-	ReleaseDate pgtype.Date
-	Completion  float64
-	AgeDays     float64
+	ArtistID   pgtype.UUID
+	Genre      *string
+	Completion float64
+	AgeDays    float64
 }

 // Taste profile (#796 phase 1). The daily build computes signed artist/tag
@@ -222,8 +158,7 @@ type ListPlayEngagementInputsForUserRow struct {
 // One row per play in the decay-relevant window. completion is the play's
 // completion ratio (precomputed column when present, else duration_played /
 // track duration, clamped to [0,1]); age_days drives the time-decay. Genre
-// is split into tags in Go; release_date derives the decade for the era
-// facet (#1530). Quarantined tracks are excluded.
+// is split into tags in Go. Quarantined tracks are excluded.
 func (q *Queries) ListPlayEngagementInputsForUser(ctx context.Context, arg ListPlayEngagementInputsForUserParams) ([]ListPlayEngagementInputsForUserRow, error) {
 	rows, err := q.db.Query(ctx, listPlayEngagementInputsForUser, arg.UserID, arg.Column2)
 	if err != nil {
@@ -234,10 +169,8 @@ func (q *Queries) ListPlayEngagementInputsForUser(ctx context.Context, arg ListP
 	for rows.Next() {
 		var i ListPlayEngagementInputsForUserRow
 		if err := rows.Scan(
-			&i.TrackID,
 			&i.ArtistID,
 			&i.Genre,
-			&i.ReleaseDate,
 			&i.Completion,
 			&i.AgeDays,
 		); err != nil {
@@ -290,84 +223,6 @@ func (q *Queries) ListTasteProfileArtistsForUser(ctx context.Context, arg ListTa
 	return items, nil
 }

-const listTasteProfileErasForUser = `-- name: ListTasteProfileErasForUser :many
-SELECT era, weight
-FROM taste_profile_eras
-WHERE user_id = $1
-ORDER BY weight DESC
-LIMIT $2
-`
-
-type ListTasteProfileErasForUserParams struct {
-	UserID pgtype.UUID
-	Limit  int32
-}
-
-type ListTasteProfileErasForUserRow struct {
-	Era    string
-	Weight float64
-}
-
-// Top-weighted taste eras (#1530); consumed by the scorer's era term.
-func (q *Queries) ListTasteProfileErasForUser(ctx context.Context, arg ListTasteProfileErasForUserParams) ([]ListTasteProfileErasForUserRow, error) {
-	rows, err := q.db.Query(ctx, listTasteProfileErasForUser, arg.UserID, arg.Limit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []ListTasteProfileErasForUserRow
-	for rows.Next() {
-		var i ListTasteProfileErasForUserRow
-		if err := rows.Scan(&i.Era, &i.Weight); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listTasteProfileMoodsForUser = `-- name: ListTasteProfileMoodsForUser :many
-SELECT mood, weight
-FROM taste_profile_moods
-WHERE user_id = $1
-ORDER BY weight DESC
-LIMIT $2
-`
-
-type ListTasteProfileMoodsForUserParams struct {
-	UserID pgtype.UUID
-	Limit  int32
-}
-
-type ListTasteProfileMoodsForUserRow struct {
-	Mood   string
-	Weight float64
-}
-
-// Top-weighted taste moods (#1534); consumed by the scorer's mood term.
-func (q *Queries) ListTasteProfileMoodsForUser(ctx context.Context, arg ListTasteProfileMoodsForUserParams) ([]ListTasteProfileMoodsForUserRow, error) {
-	rows, err := q.db.Query(ctx, listTasteProfileMoodsForUser, arg.UserID, arg.Limit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []ListTasteProfileMoodsForUserRow
-	for rows.Next() {
-		var i ListTasteProfileMoodsForUserRow
-		if err := rows.Scan(&i.Mood, &i.Weight); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const listTasteProfileTagsForUser = `-- name: ListTasteProfileTagsForUser :many
 SELECT tag, weight
 FROM taste_profile_tags
@@ -1,222 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// versions:
-//   sqlc v1.31.1
-// source: track_tags.sql
-
-package dbq
-
-import (
-	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-const deleteTrackTags = `-- name: DeleteTrackTags :exec
-DELETE FROM track_tags WHERE track_id = $1
-`
-
-// Clear a track's cached tags before rewriting (atomic replace by the caller).
-func (q *Queries) DeleteTrackTags(ctx context.Context, trackID pgtype.UUID) error {
-	_, err := q.db.Exec(ctx, deleteTrackTags, trackID)
-	return err
-}
-
-const insertTrackTag = `-- name: InsertTrackTag :exec
-INSERT INTO track_tags (track_id, tag, weight)
-VALUES ($1, $2, $3)
-ON CONFLICT (track_id, tag)
-    DO UPDATE SET weight = GREATEST(track_tags.weight, EXCLUDED.weight)
-`
-
-type InsertTrackTagParams struct {
-	TrackID pgtype.UUID
-	Tag     string
-	Weight  float64
-}
-
-// Upsert one (track, tag); keep the stronger weight when two providers
-// agree on a tag with different folksonomy strengths.
-func (q *Queries) InsertTrackTag(ctx context.Context, arg InsertTrackTagParams) error {
-	_, err := q.db.Exec(ctx, insertTrackTag, arg.TrackID, arg.Tag, arg.Weight)
-	return err
-}
-
-const listLikedTrackTagsForUser = `-- name: ListLikedTrackTagsForUser :many
-SELECT tt.track_id, tt.tag, tt.weight
-  FROM track_tags tt
-  JOIN general_likes gl ON gl.track_id = tt.track_id
- WHERE gl.user_id = $1
-`
-
-// Enriched tags for the user's liked tracks — the like-bonus path in the
-// recompute mirrors the play path, so it needs the same tag lookup.
-func (q *Queries) ListLikedTrackTagsForUser(ctx context.Context, userID pgtype.UUID) ([]TrackTag, error) {
-	rows, err := q.db.Query(ctx, listLikedTrackTagsForUser, userID)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []TrackTag
-	for rows.Next() {
-		var i TrackTag
-		if err := rows.Scan(&i.TrackID, &i.Tag, &i.Weight); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listPlayedTrackTagsForUser = `-- name: ListPlayedTrackTagsForUser :many
-SELECT tt.track_id, tt.tag, tt.weight
-  FROM track_tags tt
- WHERE tt.track_id IN (
-       SELECT DISTINCT pe.track_id
-         FROM play_events pe
-        WHERE pe.user_id = $1
-          AND pe.was_skipped = false
-          AND pe.started_at > now() - make_interval(days => $2::int)
-   )
-`
-
-type ListPlayedTrackTagsForUserParams struct {
-	UserID  pgtype.UUID
-	Column2 int32
-}
-
-// The enriched tags for every track this user played inside the taste
-// window, so the recompute can union them into the tag facet alongside
-// ID3 genre. $1 = user_id, $2 = window_days. One row per (track, tag).
-func (q *Queries) ListPlayedTrackTagsForUser(ctx context.Context, arg ListPlayedTrackTagsForUserParams) ([]TrackTag, error) {
-	rows, err := q.db.Query(ctx, listPlayedTrackTagsForUser, arg.UserID, arg.Column2)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []TrackTag
-	for rows.Next() {
-		var i TrackTag
-		if err := rows.Scan(&i.TrackID, &i.Tag, &i.Weight); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listTrackTagsForTracks = `-- name: ListTrackTagsForTracks :many
-SELECT tt.track_id, tt.tag
-  FROM track_tags tt
- WHERE tt.track_id = ANY($1::uuid[])
-`
-
-type ListTrackTagsForTracksRow struct {
-	TrackID pgtype.UUID
-	Tag     string
-}
-
-// Enriched tags for a set of candidate tracks (#1534), so the scorer can
-// derive each candidate's mood buckets at scoring time. One row per (track,
-// tag); the caller filters to mood words via the internal/mood vocabulary.
-func (q *Queries) ListTrackTagsForTracks(ctx context.Context, dollar_1 []pgtype.UUID) ([]ListTrackTagsForTracksRow, error) {
-	rows, err := q.db.Query(ctx, listTrackTagsForTracks, dollar_1)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []ListTrackTagsForTracksRow
-	for rows.Next() {
-		var i ListTrackTagsForTracksRow
-		if err := rows.Scan(&i.TrackID, &i.Tag); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listTracksMissingTags = `-- name: ListTracksMissingTags :many
-
-SELECT t.id, t.mbid, t.title, a.name AS artist_name, a.mbid AS artist_mbid
-  FROM tracks t
-  JOIN artists a ON a.id = t.artist_id
- WHERE t.tag_source IS NULL
-    OR (t.tag_source = 'none' AND t.tag_sources_version < $1)
- ORDER BY t.id
- LIMIT $2
-`
-
-type ListTracksMissingTagsParams struct {
-	TagSourcesVersion int32
-	Limit             int32
-}
-
-type ListTracksMissingTagsRow struct {
-	ID         pgtype.UUID
-	Mbid       *string
-	Title      string
-	ArtistName string
-	ArtistMbid *string
-}
-
-// Track-tag enrichment queries (milestone #160, #1490). The tag enricher
-// drains ListTracksMissingTags, fetches from the provider chain, and
-// writes the merged top-K via DeleteTrackTags + InsertTrackTag, then
-// stamps SetTrackTagSource. Mirrors the coverart artist-enricher shape.
-// Tracks eligible for tag enrichment: never processed (tag_source NULL)
-// or previously settled 'none' under an older provider version. Returns
-// the fields the provider chain needs — recording MBID (nullable) for
-// keyed lookups, title + artist name for name-based fallback, and the
-// artist MBID (nullable) for MusicBrainz's artist-tag fallback (#1519).
-// $1 = current tag_sources_version, $2 = limit.
-func (q *Queries) ListTracksMissingTags(ctx context.Context, arg ListTracksMissingTagsParams) ([]ListTracksMissingTagsRow, error) {
-	rows, err := q.db.Query(ctx, listTracksMissingTags, arg.TagSourcesVersion, arg.Limit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []ListTracksMissingTagsRow
-	for rows.Next() {
-		var i ListTracksMissingTagsRow
-		if err := rows.Scan(
-			&i.ID,
-			&i.Mbid,
-			&i.Title,
-			&i.ArtistName,
-			&i.ArtistMbid,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const setTrackTagSource = `-- name: SetTrackTagSource :exec
-UPDATE tracks SET tag_source = $2, tag_sources_version = $3 WHERE id = $1
-`
-
-type SetTrackTagSourceParams struct {
-	ID                pgtype.UUID
-	TagSource         *string
-	TagSourcesVersion int32
-}
-
-// Stamp the enrichment outcome so the batch drainer skips settled rows.
-// $2 = 'lastfm' | 'musicbrainz' | 'mixed' | 'none', $3 = current version.
-func (q *Queries) SetTrackTagSource(ctx context.Context, arg SetTrackTagSourceParams) error {
-	_, err := q.db.Exec(ctx, setTrackTagSource, arg.ID, arg.TagSource, arg.TagSourcesVersion)
-	return err
-}
@@ -90,7 +90,7 @@ func (q *Queries) DeleteTrack(ctx context.Context, id pgtype.UUID) (DeleteTrackR
 }

 const getTrackByID = `-- name: GetTrackByID :one
-SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version FROM tracks WHERE id = $1
+SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at FROM tracks WHERE id = $1
 `

 func (q *Queries) GetTrackByID(ctx context.Context, id pgtype.UUID) (Track, error) {
@@ -112,14 +112,12 @@ func (q *Queries) GetTrackByID(ctx context.Context, id pgtype.UUID) (Track, erro
 		&i.Genre,
 		&i.AddedAt,
 		&i.UpdatedAt,
-		&i.TagSource,
-		&i.TagSourcesVersion,
 	)
 	return i, err
 }

 const getTrackByPath = `-- name: GetTrackByPath :one
-SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version FROM tracks WHERE file_path = $1
+SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at FROM tracks WHERE file_path = $1
 `

 func (q *Queries) GetTrackByPath(ctx context.Context, filePath string) (Track, error) {
@@ -141,14 +139,12 @@ func (q *Queries) GetTrackByPath(ctx context.Context, filePath string) (Track, e
 		&i.Genre,
 		&i.AddedAt,
 		&i.UpdatedAt,
-		&i.TagSource,
-		&i.TagSourcesVersion,
 	)
 	return i, err
 }

 const getTracksByIDs = `-- name: GetTracksByIDs :many
-SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version FROM tracks WHERE id = ANY($1::uuid[])
+SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at FROM tracks WHERE id = ANY($1::uuid[])
 `

 // Batched lookup used by /api/library/sync to hydrate upsert payloads
@@ -178,8 +174,6 @@ func (q *Queries) GetTracksByIDs(ctx context.Context, dollar_1 []pgtype.UUID) ([
 			&i.Genre,
 			&i.AddedAt,
 			&i.UpdatedAt,
-			&i.TagSource,
-			&i.TagSourcesVersion,
 		); err != nil {
 			return nil, err
 		}
@@ -192,7 +186,7 @@ func (q *Queries) GetTracksByIDs(ctx context.Context, dollar_1 []pgtype.UUID) ([
 }

 const listArtistTracksForUser = `-- name: ListArtistTracksForUser :many
-SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version,
+SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at,
       albums.title AS album_title,
       artists.name AS artist_name
 FROM tracks t
@@ -248,8 +242,6 @@ func (q *Queries) ListArtistTracksForUser(ctx context.Context, arg ListArtistTra
 			&i.Track.Genre,
 			&i.Track.AddedAt,
 			&i.Track.UpdatedAt,
-			&i.Track.TagSource,
-			&i.Track.TagSourcesVersion,
 			&i.AlbumTitle,
 			&i.ArtistName,
 		); err != nil {
@@ -264,7 +256,7 @@ func (q *Queries) ListArtistTracksForUser(ctx context.Context, arg ListArtistTra
 }

 const listRandomTracksForUser = `-- name: ListRandomTracksForUser :many
-SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at, t.tag_source, t.tag_sources_version,
+SELECT t.id, t.title, t.album_id, t.artist_id, t.track_number, t.disc_number, t.duration_ms, t.file_path, t.file_size, t.file_format, t.bitrate, t.mbid, t.genre, t.added_at, t.updated_at,
       albums.title AS album_title,
       artists.name AS artist_name
 FROM tracks t
@@ -317,8 +309,6 @@ func (q *Queries) ListRandomTracksForUser(ctx context.Context, arg ListRandomTra
 			&i.Track.Genre,
 			&i.Track.AddedAt,
 			&i.Track.UpdatedAt,
-			&i.Track.TagSource,
-			&i.Track.TagSourcesVersion,
 			&i.AlbumTitle,
 			&i.ArtistName,
 		); err != nil {
@@ -333,7 +323,7 @@ func (q *Queries) ListRandomTracksForUser(ctx context.Context, arg ListRandomTra
 }

 const listTracksByAlbum = `-- name: ListTracksByAlbum :many
-SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version FROM tracks
+SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at FROM tracks
 WHERE album_id = $1
  AND NOT EXISTS (
    SELECT 1 FROM lidarr_quarantine q
@@ -375,8 +365,6 @@ func (q *Queries) ListTracksByAlbum(ctx context.Context, arg ListTracksByAlbumPa
 			&i.Genre,
 			&i.AddedAt,
 			&i.UpdatedAt,
-			&i.TagSource,
-			&i.TagSourcesVersion,
 		); err != nil {
 			return nil, err
 		}
@@ -424,7 +412,7 @@ func (q *Queries) ListTracksMissingMbidWithPath(ctx context.Context, limit int32
 }

 const searchTracks = `-- name: SearchTracks :many
-SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version FROM tracks
+SELECT id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at FROM tracks
 WHERE title ILIKE '%' || $1::text || '%'
  AND NOT EXISTS (
    SELECT 1 FROM lidarr_quarantine q
@@ -473,8 +461,6 @@ func (q *Queries) SearchTracks(ctx context.Context, arg SearchTracksParams) ([]T
 			&i.Genre,
 			&i.AddedAt,
 			&i.UpdatedAt,
-			&i.TagSource,
-			&i.TagSourcesVersion,
 		); err != nil {
 			return nil, err
 		}
@@ -522,7 +508,7 @@ ON CONFLICT (file_path) DO UPDATE SET
    mbid = EXCLUDED.mbid,
    genre = EXCLUDED.genre,
    updated_at = now()
-RETURNING id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at, tag_source, tag_sources_version
+RETURNING id, title, album_id, artist_id, track_number, disc_number, duration_ms, file_path, file_size, file_format, bitrate, mbid, genre, added_at, updated_at
 `

 type UpsertTrackParams struct {
@@ -573,8 +559,6 @@ func (q *Queries) UpsertTrack(ctx context.Context, arg UpsertTrackParams) (Track
 		&i.Genre,
 		&i.AddedAt,
 		&i.UpdatedAt,
-		&i.TagSource,
-		&i.TagSourcesVersion,
 	)
 	return i, err
 }
@@ -1,2 +0,0 @@
-ALTER TABLE play_events DROP COLUMN pick_kind;
-ALTER TABLE playlist_tracks DROP COLUMN pick_kind;
@@ -1,34 +0,0 @@
-- For You exploration attribution (milestone #127 step 2, Scribe #1249).
--
-- For You is deliberately composed of two populations: a head of
-- top-scored similarity matches ("taste" picks) and a tail sampled from
-- deeper in the candidate ranking ("fresh" picks — the freshness
-- injection). Until now the metrics could only judge For You as one
-- blob, so a high skip rate couldn't be read as "the taste engine is
-- missing" vs "the freshness tax is too high".
--
-- Two denormalized columns, both nullable:
--
-- 1. playlist_tracks.pick_kind — stamped by the system-playlist builder
--    at snapshot build time. NULL for manual playlists and for system
--    variants that don't split (Discover, Songs like X, discovery
--    mixes). System snapshots are atomically replaced daily, so the
--    column never goes stale within a snapshot.
--
-- 2. play_events.pick_kind — stamped at play-ingestion time by looking
--    the track up in the user's CURRENT For You snapshot. Attribution
--    must be frozen at play time: For You rebuilds daily, so a 30-day
--    metrics window spans ~30 snapshots and a join-at-read against the
--    live snapshot would misattribute nearly everything. Plays that
--    predate this feature (or whose track already rotated out, e.g. a
--    late offline replay) stay NULL → reported as unattributed.
-
-ALTER TABLE playlist_tracks
-    ADD COLUMN pick_kind text
-    CONSTRAINT playlist_tracks_pick_kind_check
-        CHECK (pick_kind IN ('taste', 'fresh'));
-
-ALTER TABLE play_events
-    ADD COLUMN pick_kind text
-    CONSTRAINT play_events_pick_kind_check
-        CHECK (pick_kind IN ('taste', 'fresh'));
@@ -1,19 +0,0 @@
-- Rows stamped with the widened vocabulary must be cleared before the
-- narrow CHECK can be re-added; NULL reads as "unattributed", which is
-- the honest downgrade.
-UPDATE play_events SET pick_kind = NULL
-    WHERE pick_kind NOT IN ('taste', 'fresh');
-UPDATE playlist_tracks SET pick_kind = NULL
-    WHERE pick_kind NOT IN ('taste', 'fresh');
-
-ALTER TABLE play_events
-    DROP CONSTRAINT play_events_pick_kind_check;
-ALTER TABLE play_events
-    ADD CONSTRAINT play_events_pick_kind_check
-        CHECK (pick_kind IN ('taste', 'fresh'));
-
-ALTER TABLE playlist_tracks
-    DROP CONSTRAINT playlist_tracks_pick_kind_check;
-ALTER TABLE playlist_tracks
-    ADD CONSTRAINT playlist_tracks_pick_kind_check
-        CHECK (pick_kind IN ('taste', 'fresh'));
@@ -1,41 +0,0 @@
-- Provenance as standard (milestone #127, Scribe #1270).
--
-- #1249 introduced pick_kind as a For You one-off ('taste'/'fresh').
-- The mechanism — stamp WHY a track is in the snapshot at build time,
-- freeze it onto the play at ingestion, break it down in metrics — is
-- now the standard for every system mix, so the CHECK vocabulary
-- widens to cover:
--
--   taste / fresh          For You head vs freshness-injection tail
--   dormant / cross_user / random
--                          Discover's three candidate buckets — makes
--                          the 40/30/30 allocation measurable instead
--                          of a guess
--   tier1 / tier2 / tier3  the tiered-eligibility ladder (project rule
--                          #131): tier 1 pins the mix's exact desire,
--                          each higher tier steps back a little. Tier
--                          provenance is how we measure what the
--                          step-back trades away.
--
-- Postgres CHECK whitelists can't be altered in place: DROP + re-ADD
-- with the expanded list, in the same migration.
-
-ALTER TABLE playlist_tracks
-    DROP CONSTRAINT playlist_tracks_pick_kind_check;
-ALTER TABLE playlist_tracks
-    ADD CONSTRAINT playlist_tracks_pick_kind_check
-        CHECK (pick_kind IN (
-            'taste', 'fresh',
-            'dormant', 'cross_user', 'random',
-            'tier1', 'tier2', 'tier3'
-        ));
-
-ALTER TABLE play_events
-    DROP CONSTRAINT play_events_pick_kind_check;
-ALTER TABLE play_events
-    ADD CONSTRAINT play_events_pick_kind_check
-        CHECK (pick_kind IN (
-            'taste', 'fresh',
-            'dormant', 'cross_user', 'random',
-            'tier1', 'tier2', 'tier3'
-        ));
@@ -1,3 +0,0 @@
-DROP TABLE recommendation_tuning_audit;
-DROP TABLE taste_tuning;
-DROP TABLE recommendation_weight_profiles;
@@ -1,57 +0,0 @@
-- Recommendation tuning lab (milestone #127, Scribe #1250).
--
-- The scoring weights move out of YAML (radio profile) and out of the
-- systemMixWeights hard-code (daily_mix profile) into DB-backed
-- settings with live effect — the defaults-discovery lab (decision
-- #1247): the operator turns knobs here to FIND good values, which
-- then get baked into shipped defaults; end users and other operators
-- should never need this card.
--
-- Rows are seeded by the recsettings service's boot reconcile (the
-- coverart SettingsService pattern), not by this migration, so shipped
-- defaults live in exactly one place (Go).
-
-CREATE TABLE recommendation_weight_profiles (
-    profile           text PRIMARY KEY
-        CONSTRAINT recommendation_weight_profiles_profile_check
-        CHECK (profile IN ('radio', 'daily_mix')),
-    base_weight       double precision NOT NULL,
-    like_boost        double precision NOT NULL,
-    recency_weight    double precision NOT NULL,
-    skip_penalty      double precision NOT NULL,
-    jitter_magnitude  double precision NOT NULL,
-    context_weight    double precision NOT NULL,
-    similarity_weight double precision NOT NULL,
-    taste_weight      double precision NOT NULL,
-    updated_at        timestamptz NOT NULL DEFAULT now()
-);
-
-- Taste-profile build knobs: engagement half-life + the completion→
-- engagement curve points (taste.Config's tunable subset).
-CREATE TABLE taste_tuning (
-    singleton            boolean PRIMARY KEY DEFAULT true
-        CONSTRAINT taste_tuning_singleton_check CHECK (singleton),
-    half_life_days       double precision NOT NULL,
-    engagement_hard_skip double precision NOT NULL,
-    engagement_neutral   double precision NOT NULL,
-    engagement_full      double precision NOT NULL,
-    updated_at           timestamptz NOT NULL DEFAULT now()
-);
-
-- Every knob turn writes one audit row; the metrics trend view
-- (#1251) annotates these on its timeline so cause→effect is visible
-- after a change. changes is a jsonb array of {field, old, new}.
-CREATE TABLE recommendation_tuning_audit (
-    id         bigserial PRIMARY KEY,
-    changed_at timestamptz NOT NULL DEFAULT now(),
-    scope      text NOT NULL
-        CONSTRAINT recommendation_tuning_audit_scope_check
-        CHECK (scope IN ('radio', 'daily_mix', 'taste')),
-    action     text NOT NULL
-        CONSTRAINT recommendation_tuning_audit_action_check
-        CHECK (action IN ('update', 'reset')),
-    changes    jsonb NOT NULL
-);
-
-CREATE INDEX recommendation_tuning_audit_changed_at_idx
-    ON recommendation_tuning_audit (changed_at DESC);
@@ -1,27 +0,0 @@
-- Reverse 0041_discover_taste_unheard.up.sql.
--
-- Null out any rows stamped with the new value before shrinking the
-- CHECK back to the 0039 vocabulary, or the ADD CONSTRAINT would fail
-- on existing 'taste_unheard' rows (mirrors 0039's down).
-UPDATE play_events SET pick_kind = NULL WHERE pick_kind = 'taste_unheard';
-UPDATE playlist_tracks SET pick_kind = NULL WHERE pick_kind = 'taste_unheard';
-
-ALTER TABLE playlist_tracks
-    DROP CONSTRAINT playlist_tracks_pick_kind_check;
-ALTER TABLE playlist_tracks
-    ADD CONSTRAINT playlist_tracks_pick_kind_check
-        CHECK (pick_kind IN (
-            'taste', 'fresh',
-            'dormant', 'cross_user', 'random',
-            'tier1', 'tier2', 'tier3'
-        ));
-
-ALTER TABLE play_events
-    DROP CONSTRAINT play_events_pick_kind_check;
-ALTER TABLE play_events
-    ADD CONSTRAINT play_events_pick_kind_check
-        CHECK (pick_kind IN (
-            'taste', 'fresh',
-            'dormant', 'cross_user', 'random',
-            'tier1', 'tier2', 'tier3'
-        ));
@@ -1,32 +0,0 @@
-- Discover taste-targeted novelty bucket (milestone #127, Scribe #1252/#1488).
--
-- The 2-week metrics review found Discover beating the manual baseline on
-- skip rate — which for a discovery surface means it is playing it safe:
-- on a single-user server it is effectively dormant + crude-random, and
-- the per-user taste profile (n_tags, #796) went unused. This adds a
-- fourth Discover candidate bucket that ranks unheard tracks by the
-- user's taste-profile tag weights ("novelty that fits your vibe"), so
-- its picks need a new pick_kind provenance value.
--
-- Postgres CHECK whitelists can't be altered in place: DROP + re-ADD with
-- the expanded list, in the same migration (family rule — new CHECK-enum
-- value needs a same-change migration).
-ALTER TABLE playlist_tracks
-    DROP CONSTRAINT playlist_tracks_pick_kind_check;
-ALTER TABLE playlist_tracks
-    ADD CONSTRAINT playlist_tracks_pick_kind_check
-        CHECK (pick_kind IN (
-            'taste', 'fresh',
-            'dormant', 'cross_user', 'random', 'taste_unheard',
-            'tier1', 'tier2', 'tier3'
-        ));
-
-ALTER TABLE play_events
-    DROP CONSTRAINT play_events_pick_kind_check;
-ALTER TABLE play_events
-    ADD CONSTRAINT play_events_pick_kind_check
-        CHECK (pick_kind IN (
-            'taste', 'fresh',
-            'dormant', 'cross_user', 'random', 'taste_unheard',
-            'tier1', 'tier2', 'tier3'
-        ));
@@ -1,5 +0,0 @@
-- Reverse 0042_track_tags.up.sql.
-DROP INDEX IF EXISTS tracks_tag_source_idx;
-ALTER TABLE tracks DROP COLUMN IF EXISTS tag_sources_version;
-ALTER TABLE tracks DROP COLUMN IF EXISTS tag_source;
-DROP TABLE IF EXISTS track_tags;
@@ -1,26 +0,0 @@
-- Track-level folksonomy tags for taste enrichment (milestone #160, #1490).
--
-- A global (not per-user) cache of style/mood tags fetched from
-- MusicBrainz (keyless) + Last.fm (when a key is configured), keyed by
-- track. Feeds the taste recompute's tag facet alongside raw ID3 genre,
-- lifting resolution from coarse "Rock" to "post-punk / shoegaze /
-- melancholic". The enricher caps to the top-K tags per track at write
-- time so a heavily-tagged track can't dominate the profile. weight is a
-- normalized folksonomy strength in [0,1]. Mirrors the coverart
-- enricher's versioned source-tracking pattern.
-CREATE TABLE track_tags (
-    track_id uuid             NOT NULL REFERENCES tracks(id) ON DELETE CASCADE,
-    tag      text             NOT NULL,
-    weight   double precision NOT NULL DEFAULT 1,
-    PRIMARY KEY (track_id, tag)
-);
-CREATE INDEX track_tags_track_idx ON track_tags (track_id);
-
-- Enrichment bookkeeping (mirror artists.artist_art_source):
--   tag_source NULL                            → not yet processed (eligible)
--   tag_source 'lastfm' / 'musicbrainz' / 'mixed' → found, cached
--   tag_source 'none'                          → providers returned nothing
--   tag_sources_version                        → bump to re-process none/stale
-ALTER TABLE tracks ADD COLUMN tag_source text;
-ALTER TABLE tracks ADD COLUMN tag_sources_version integer NOT NULL DEFAULT 0;
-CREATE INDEX tracks_tag_source_idx ON tracks (tag_source, tag_sources_version);
@@ -1,3 +0,0 @@
-- Reverse 0043_tag_provider_settings.up.sql.
-DROP TABLE IF EXISTS tag_sources_meta;
-DROP TABLE IF EXISTS tag_provider_settings;
@@ -1,37 +0,0 @@
-- Tag-enrichment provider settings (milestone #160, #1490 Step 2).
--
-- Mirrors the cover-art provider-settings substrate (migration 0018) so
-- adding a new tag source later is "register a provider + it auto-upserts
-- a row here" — never a schema change. The tag enricher reads the enabled
-- set + api keys from tag_provider_settings and stamps the current version
-- from tag_sources_meta onto tracks.tag_sources_version (added in 0042).
--
-- current_version starts at 1 while tracks.tag_sources_version defaults to
-- 0 (migration 0042), so every existing track is "stale" relative to
-- current and gets enriched on the first pass after this migrates.
-
-CREATE TABLE tag_provider_settings (
-    provider_id   text PRIMARY KEY,
-    enabled       boolean     NOT NULL DEFAULT true,
-    api_key       text,
-    display_order int         NOT NULL DEFAULT 0,
-    created_at    timestamptz NOT NULL DEFAULT now(),
-    updated_at    timestamptz NOT NULL DEFAULT now()
-);
-
-CREATE TABLE tag_sources_meta (
-    id                              boolean PRIMARY KEY DEFAULT true,
-    current_version                 int     NOT NULL DEFAULT 1,
-    last_registered_providers_hash  text    NOT NULL DEFAULT '',
-    CONSTRAINT tag_sources_meta_singleton CHECK (id = true)
-);
-INSERT INTO tag_sources_meta (id, current_version) VALUES (true, 1);
-
-- Seed the v1 providers. MusicBrainz is the keyless always-on default;
-- Last.fm ships disabled and is opt-in once the operator supplies a key
-- (Step 4 Settings UI), per the no-coercive-settings rule (#26). The
-- SettingsService also upserts these at boot, so the seed is belt-and-
-- suspenders / documents the intended defaults.
-INSERT INTO tag_provider_settings (provider_id, enabled, display_order) VALUES
-    ('musicbrainz', true,  0),
-    ('lastfm',      false, 1);
@@ -1,2 +0,0 @@
-- Reverse 0044_taste_tuning_enriched_tag_scale.up.sql.
-ALTER TABLE taste_tuning DROP COLUMN IF EXISTS enriched_tag_scale;
@@ -1,6 +0,0 @@
-- Expose EnrichedTagScale in the tuning lab (#1520). Adds the enriched-tag
-- weight knob to the taste_tuning singleton so operators can dial how much
-- folksonomy tags (#1490) count vs raw ID3 genre. DEFAULT 0.5 backfills the
-- existing row and matches taste.DefaultConfig().EnrichedTagScale.
-ALTER TABLE taste_tuning
-    ADD COLUMN enriched_tag_scale double precision NOT NULL DEFAULT 0.5;
@@ -1,2 +0,0 @@
-ALTER TABLE taste_tuning DROP COLUMN IF EXISTS era_scale;
-DROP TABLE IF EXISTS taste_profile_eras;
@@ -1,26 +0,0 @@
-- 0045_taste_profile_eras.up.sql — era/decade taste facet (#1530,
-- milestone #160 Opt 2). A third taste facet alongside artists + tags:
-- signed weights over decade buckets ("1990s") derived from
-- albums.release_date, rebuilt daily by internal/taste next to the
-- artist/tag facets. Weight is a signed float — positive = drawn to
-- that era, negative = passively avoided; magnitude reflects decayed
-- engagement. Consumed by the recommendation scorer's taste match.
-- Mirrors taste_profile_tags: CASCADE on user delete, indexed by
-- (user_id, weight DESC) so "top eras" reads stay cheap.
-CREATE TABLE taste_profile_eras (
-    user_id    uuid             NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    era        text             NOT NULL,
-    weight     double precision NOT NULL,
-    updated_at timestamptz      NOT NULL DEFAULT now(),
-    PRIMARY KEY (user_id, era)
-);
-
-CREATE INDEX taste_profile_eras_user_weight_idx
-    ON taste_profile_eras (user_id, weight DESC);
-
-- Era-facet build knob, tunable in the lab (mirrors enriched_tag_scale,
-- #1520): scales how strongly a decade-play imprints on the profile.
-- DEFAULT 0.5 backfills the existing singleton and matches
-- taste.DefaultConfig().EraScale; 0 disables the era facet entirely.
-ALTER TABLE taste_tuning
-    ADD COLUMN era_scale double precision NOT NULL DEFAULT 0.5;
@@ -1 +0,0 @@
-ALTER TABLE recommendation_weight_profiles DROP COLUMN IF EXISTS context_time_weight;
@@ -1,12 +0,0 @@
-- 0046_context_time_weight.up.sql — time-of-day/weekday context conditioning
-- (#1531, milestone #160 Opt 3). Adds a per-profile scoring weight for the new
-- context-affinity term: how strongly a candidate is boosted when its artist's
-- play history concentrates in the current daypart × weekday-type cell (in the
-- user's local timezone). Mirrors the other ScoringWeights columns.
--
-- DEFAULT 1.0 backfills both existing profile rows to a modest on-value; the
-- Go ShippedRadioWeights/ShippedDailyMixWeights carry the same 1.0 so fresh
-- installs seed identically. Reconcile only seeds MISSING rows (ON CONFLICT DO
-- NOTHING), so existing rows rely on this DEFAULT until an operator resets.
-ALTER TABLE recommendation_weight_profiles
-    ADD COLUMN context_time_weight double precision NOT NULL DEFAULT 1.0;
@@ -1,2 +0,0 @@
-ALTER TABLE taste_tuning DROP COLUMN IF EXISTS mood_scale;
-DROP TABLE IF EXISTS taste_profile_moods;
@@ -1,25 +0,0 @@
-- 0047_taste_profile_moods.up.sql — mood taste facet (#1534, milestone #160
-- Opt 2b). A fourth taste facet alongside artists + tags + eras: signed weights
-- over canonical mood buckets (melancholic / energetic / chill / …) derived
-- from a track's enriched folksonomy tags (#1490) via the internal/mood
-- vocabulary, rebuilt daily. Weight is a signed float — positive = drawn to
-- that mood, negative = passively avoided. Coverage is partial (grows with tag
-- enrichment), so it's a supplement, not a foundation. Mirrors
-- taste_profile_tags: CASCADE on user delete, indexed by (user_id, weight DESC).
-CREATE TABLE taste_profile_moods (
-    user_id    uuid             NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    mood       text             NOT NULL,
-    weight     double precision NOT NULL,
-    updated_at timestamptz      NOT NULL DEFAULT now(),
-    PRIMARY KEY (user_id, mood)
-);
-
-CREATE INDEX taste_profile_moods_user_weight_idx
-    ON taste_profile_moods (user_id, weight DESC);
-
-- Mood-facet build knob, tunable in the lab (mirrors era_scale / enriched_tag_
-- scale): scales how strongly a mood-tagged play imprints on the profile.
-- DEFAULT 0.5 backfills the existing singleton and matches
-- taste.DefaultConfig().MoodScale; 0 disables the mood facet entirely.
-ALTER TABLE taste_tuning
-    ADD COLUMN mood_scale double precision NOT NULL DEFAULT 0.5;
@@ -1 +0,0 @@
-ALTER TABLE play_events DROP COLUMN IF EXISTS device_class;
@@ -1,9 +0,0 @@
-- 0048_play_events_device_class.up.sql — device-class context conditioning
-- (#1551, milestone #160 Opt 3b). Records which class of device a play came
-- from (mobile / web / …), sent by the client on play-start and normalized
-- server-side. Extends the #1531 time-of-day/weekday affinity cell to
-- (daypart × weekday × device) for the radio path. Nullable + no CHECK: values
-- are normalized in Go (avoids a CHECK-migration each time a client class is
-- added, rule #36), and historical rows stay NULL → excluded from the device
-- dimension (a graceful cold-start; the facet ramps as new plays land).
-ALTER TABLE play_events ADD COLUMN device_class text;
@@ -1,55 +0,0 @@
-- Household co-play similarity (#1533, milestone #160 Opt 5). Minstrel is a
-- single shared-library, multi-user server (no per-user library ACL), so the
-- "household" is the whole instance's user set. These queries recompute
-- artist–artist co-occurrence edges from play_events and store them in
-- artist_similarity under the pre-provisioned source = 'user_cooccurrence'
-- (whitelisted in the 0009 CHECK from day one). A periodic worker DELETEs then
-- re-INSERTs so edges that fall below threshold disappear. Single-user servers
-- produce no edges (the >= 2 co-player gate), so the arm is empty there.
-
-- name: DeleteArtistCoplayEdges :exec
-DELETE FROM artist_similarity WHERE source = 'user_cooccurrence';
-
-- name: InsertArtistCoplayEdges :exec
-- Two artists are "co-played" when the same users play both. score is the
-- Jaccard of their distinct-player sets — coplayers / (playersA + playersB −
-- coplayers) in (0,1] — which controls for globally-popular artists (an artist
-- everyone plays would otherwise co-occur with everything). Only pairs with
-- >= 2 distinct co-players AND Jaccard >= $1 (a floor that both prunes weak
-- edges and self-limits hub artists, whose large denominators drag their
-- Jaccard down) are kept. Completed plays only, 365-day window.
-WITH user_artists AS (
-    SELECT DISTINCT pe.user_id, t.artist_id
-    FROM play_events pe
-    JOIN tracks t ON t.id = pe.track_id
-    WHERE pe.was_skipped = false
-      AND pe.started_at > now() - interval '365 days'
-),
-artist_players AS (
-    SELECT artist_id, count(*)::float8 AS players
-    FROM user_artists
-    GROUP BY artist_id
-),
-pairs AS (
-    SELECT ua.artist_id AS a_id,
-           ub.artist_id AS b_id,
-           count(*)::float8 AS coplayers
-    FROM user_artists ua
-    JOIN user_artists ub
-      ON ua.user_id = ub.user_id AND ua.artist_id <> ub.artist_id
-    GROUP BY ua.artist_id, ub.artist_id
-    HAVING count(*) >= 2
-),
-scored AS (
-    SELECT p.a_id, p.b_id,
-           p.coplayers / (pa.players + pb.players - p.coplayers) AS score
-    FROM pairs p
-    JOIN artist_players pa ON pa.artist_id = p.a_id
-    JOIN artist_players pb ON pb.artist_id = p.b_id
-)
-INSERT INTO artist_similarity (artist_a_id, artist_b_id, score, source, fetched_at)
-SELECT a_id, b_id, score, 'user_cooccurrence', now()
-FROM scored
-WHERE score >= $1
-ON CONFLICT (artist_a_id, artist_b_id, source)
-DO UPDATE SET score = EXCLUDED.score, fetched_at = EXCLUDED.fetched_at;
@@ -102,37 +102,3 @@ SELECT t.id, t.album_id, t.artist_id
   )
 ORDER BY md5(t.id::text || $2::text)
 LIMIT 200;
-
-- name: ListTasteUnheardTracksForDiscover :many
-- Taste-targeted novelty: unheard tracks whose genres overlap the user's
-- taste-profile tags (taste_profile_tags, #796), ranked by summed tag
-- weight — "new to you, but your vibe" rather than the crude random arm.
-- Genres live inline on tracks.genre as a delimited string, split the
-- same way the radio tag_overlap arm does (regexp_split_to_table on
-- [;,]). Same exclusion filters as the other buckets. Returns nothing
-- when the user has no taste tags yet (cold start), so the caller
-- redistributes its slots to the other buckets. Stamped 'taste_unheard'.
-- $1 = user_id, $2 = date string for md5 tiebreak ordering.
-SELECT t.id, t.album_id, t.artist_id
-  FROM tracks t
-  JOIN LATERAL regexp_split_to_table(coalesce(t.genre, ''), '[;,]') AS g_split(g) ON true
-  JOIN taste_profile_tags nt ON nt.user_id = $1 AND trim(g_split.g) = nt.tag
- WHERE nt.weight > 0
-   AND trim(g_split.g) <> ''
-   AND NOT EXISTS (
-       SELECT 1 FROM play_events pe
-        WHERE pe.user_id = $1
-          AND pe.track_id = t.id
-          AND pe.was_skipped = false
-   )
-   AND NOT EXISTS (
-       SELECT 1 FROM general_likes gl
-        WHERE gl.user_id = $1 AND gl.track_id = t.id
-   )
-   AND NOT EXISTS (
-       SELECT 1 FROM lidarr_quarantine q
-        WHERE q.user_id = $1 AND q.track_id = t.id
-   )
- GROUP BY t.id, t.album_id, t.artist_id
- ORDER BY SUM(nt.weight) DESC, md5(t.id::text || $2::text)
- LIMIT 120;
@@ -24,34 +24,11 @@ ORDER BY started_at DESC
 LIMIT 1;

 -- name: InsertPlayEvent :one
-- pick_kind is non-NULL only for system-playlist plays whose track was
-- found (with a stamped kind) in the user's live snapshot for that
-- variant at ingestion time (#1249, generalized in #1270).
 INSERT INTO play_events (
-    user_id, track_id, session_id, started_at, client_id, source, pick_kind,
-    device_class
-) VALUES ($1, $2, $3, $4, $5, $6, sqlc.narg(pick_kind)::text,
-    sqlc.narg(device_class)::text)
+    user_id, track_id, session_id, started_at, client_id, source
+) VALUES ($1, $2, $3, $4, $5, $6)
 RETURNING *;

-- name: GetSystemPickKindForTrack :one
-- Looks a track up in the user's CURRENT snapshot of the given system
-- variant and returns its pick_kind. Used at play-ingestion time to
-- freeze provenance onto the play_event — snapshots rebuild daily, so
-- attribution can't be reconstructed at read time (#1249/#1270). No
-- row = track not in today's snapshot (caller stores NULL); a row with
-- NULL pick_kind = the variant doesn't stamp (yet). songs_like_artist
-- is non-singleton (up to 3 mixes/user); a track in two of them takes
-- whichever LIMIT 1 hits — acceptable, tier stamps there describe the
-- same eligibility ladder.
-SELECT pt.pick_kind
-FROM playlist_tracks pt
-JOIN playlists p ON p.id = pt.playlist_id
-WHERE p.user_id = $1
-  AND p.system_variant = $2
-  AND pt.track_id = $3
-LIMIT 1;
-
 -- name: UpdatePlayEventEnded :one
 -- Closes a play_event by id with the given ended_at, duration, and skip flag.
 -- completion_ratio is computed from duration_played_ms and the track duration
@@ -68,9 +68,8 @@ ORDER BY pt.position;
 -- name: AppendPlaylistTrack :one
 -- Inserts at the next available position. Snapshot fields are copied
 -- from the tracks/albums/artists join at insert time. tracks.duration_ms
-- is converted to seconds for the snapshot. pick_kind is NULL for manual
-- playlists; the For You builder stamps 'taste'/'fresh' (#1249).
-INSERT INTO playlist_tracks (playlist_id, position, track_id, title, artist_name, album_title, duration_sec, pick_kind)
+-- is converted to seconds for the snapshot.
+INSERT INTO playlist_tracks (playlist_id, position, track_id, title, artist_name, album_title, duration_sec)
 SELECT
    sqlc.arg(playlist_id)::uuid,
    COALESCE((SELECT MAX(position) + 1 FROM playlist_tracks WHERE playlist_id = sqlc.arg(playlist_id)::uuid), 0),
@@ -78,8 +77,7 @@ SELECT
    t.title,
    artists.name,
    albums.title,
-    (t.duration_ms / 1000)::integer,
-    sqlc.narg(pick_kind)::text
+    (t.duration_ms / 1000)::integer
 FROM tracks t
 JOIN albums  ON albums.id  = t.album_id
 JOIN artists ON artists.id = t.artist_id
@@ -10,10 +10,8 @@ SELECT
    (l.user_id IS NOT NULL)::bool AS is_liked,
    pe.last_played_at::timestamptz AS last_played_at,
    pe.play_count,
-    pe.skip_count,
-    al.release_date AS release_date
+    pe.skip_count
 FROM tracks t
-JOIN albums al ON al.id = t.album_id
 LEFT JOIN general_likes l ON l.user_id = $1 AND l.track_id = t.id
 LEFT JOIN LATERAL (
    SELECT
@@ -42,9 +40,7 @@ WHERE t.id <> $2
 --   $10 taste_overlap K (#796 phase 2b — tracks by the user's top
 --   positively-weighted taste-profile artists, so taste-relevant tracks
 --   enter the pool even when the similarity/random arms miss them; scored
--   in Go via TasteMatch, so sim_score here is 0 pool-inclusion),
--   $11 coplay_artists K (#1533 — tracks by artists co-played across the
--   instance with the seed's artist; source='user_cooccurrence').
+--   in Go via TasteMatch, so sim_score here is 0 pool-inclusion).
 -- Returns same shape as LoadRadioCandidates plus similarity_score column.

 WITH
@@ -128,22 +124,6 @@ taste_overlap AS (
    ORDER BY tpa.weight DESC, t.id
    LIMIT $10
 ),
-coplay_artists AS (
-    -- Household co-play (#1533): tracks by artists co-played across the
-    -- instance with the seed's artist (source='user_cooccurrence', built by
-    -- the coplay worker). Mirrors similar_artists but from local co-occurrence
-    -- instead of ListenBrainz; empty on single-user servers. Same 0.5 damp as
-    -- similar_artists since it's artist-level.
-    SELECT t.id AS track_id, asim.score * 0.5 AS sim_score
-    FROM artist_similarity asim
-    JOIN tracks t ON t.artist_id = asim.artist_b_id
-    JOIN seed_artist sa ON asim.artist_a_id = sa.artist_id
-    WHERE asim.source = 'user_cooccurrence'
-      AND t.id NOT IN (SELECT id FROM excluded_ids)
-      AND t.id <> $2
-    ORDER BY asim.score DESC, random()
-    LIMIT $11
-),
 random_fill AS (
    SELECT t.id AS track_id, 0.0::float8 AS sim_score
    FROM tracks t
@@ -155,7 +135,6 @@ random_fill AS (
          UNION SELECT track_id FROM tag_overlap
          UNION SELECT track_id FROM likes_overlap
          UNION SELECT track_id FROM taste_overlap
-          UNION SELECT track_id FROM coplay_artists
      )
    ORDER BY random()
    LIMIT $9
@@ -166,7 +145,6 @@ SELECT
    pe.last_played_at::timestamptz AS last_played_at,
    pe.play_count,
    pe.skip_count,
-    al.release_date AS release_date,
    COALESCE(max(u.sim_score), 0.0) AS similarity_score
 FROM (
    SELECT track_id, sim_score FROM lb_similar
@@ -174,11 +152,9 @@ FROM (
    UNION ALL SELECT track_id, sim_score FROM tag_overlap
    UNION ALL SELECT track_id, sim_score FROM likes_overlap
    UNION ALL SELECT track_id, sim_score FROM taste_overlap
-    UNION ALL SELECT track_id, sim_score FROM coplay_artists
    UNION ALL SELECT track_id, sim_score FROM random_fill
 ) u
 JOIN tracks t ON t.id = u.track_id
-JOIN albums al ON al.id = t.album_id
 LEFT JOIN general_likes l ON l.user_id = $1 AND l.track_id = t.id
 LEFT JOIN LATERAL (
    SELECT max(started_at) AS last_played_at,
@@ -190,72 +166,7 @@ LEFT JOIN LATERAL (
 GROUP BY t.id, t.title, t.album_id, t.artist_id, t.duration_ms, t.file_path,
         t.file_format, t.file_size, t.bitrate, t.track_number, t.disc_number,
         t.mbid, t.genre, t.added_at, t.updated_at,
-         l.user_id, pe.last_played_at, pe.play_count, pe.skip_count,
-         al.release_date;
-
-- name: ListArtistContextPlayCountsForUser :many
-- Per-artist completed-play counts split by whether each play falls in the
-- CURRENT context cell, in the user's local timezone (#1531). The cell is
-- daypart × weekday-type, optionally narrowed by device class (#1551): when
-- $2 (the current device) is '', the device dimension is ignored (identical to
-- the time-only #1531 behaviour, used by the daily mixes which have no device);
-- when $2 is set (radio), a play only counts in the cell if its device_class
-- matches. Feeds the context-affinity scoring term. Skips excluded; a 365-day
-- window bounds cost. Daypart buckets: night [22,5) morning [5,12)
-- afternoon [12,17) evening [17,22). Weekend = ISO days 6–7 (Sat/Sun).
-WITH tz AS (
-    SELECT COALESCE(NULLIF(u.timezone, ''), 'UTC') AS zone
-    FROM users u WHERE u.id = $1
-),
-now_cell AS (
-    SELECT
-        CASE
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 5  THEN 3
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 12 THEN 0
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 17 THEN 1
-            WHEN EXTRACT(hour FROM now() AT TIME ZONE tz.zone) < 22 THEN 2
-            ELSE 3
-        END AS daypart,
-        (EXTRACT(isodow FROM now() AT TIME ZONE tz.zone) >= 6) AS is_weekend
-    FROM tz
-),
-plays AS (
-    SELECT t.artist_id,
-           pe.device_class,
-           CASE
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 5  THEN 3
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 12 THEN 0
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 17 THEN 1
-               WHEN EXTRACT(hour FROM pe.started_at AT TIME ZONE tz.zone) < 22 THEN 2
-               ELSE 3
-           END AS daypart,
-           (EXTRACT(isodow FROM pe.started_at AT TIME ZONE tz.zone) >= 6) AS is_weekend
-    FROM play_events pe
-    JOIN tracks t ON t.id = pe.track_id
-    CROSS JOIN tz
-    WHERE pe.user_id = $1
-      AND pe.was_skipped = false
-      AND pe.started_at > now() - interval '365 days'
-)
-SELECT p.artist_id,
-       count(*) AS total_plays,
-       count(*) FILTER (
-           WHERE p.daypart = (SELECT daypart FROM now_cell)
-             AND p.is_weekend = (SELECT is_weekend FROM now_cell)
-             AND ($2::text = '' OR p.device_class = $2::text)
-       ) AS cell_plays
-FROM plays p
-GROUP BY p.artist_id;
-
-- name: GetLatestPlayDeviceClassForUser :one
-- The device_class of the user's most recent play (#1551), used as the
-- "current device" for radio context conditioning. NULL when the latest play
-- predates device capture or came from a client that didn't send one.
-SELECT device_class
-FROM play_events
-WHERE user_id = $1
-ORDER BY started_at DESC
-LIMIT 1;
+         l.user_id, pe.last_played_at, pe.play_count, pe.skip_count;

 -- name: SuggestArtistsForUser :many
 -- M5c: per-user artist suggestions ranked by signal x similarity. The
@@ -1,58 +1,22 @@
 -- Recommendation observability (#796 phase 4). Per-source play outcomes so the
 -- operator can see whether each recommendation surface is landing and tune the
 -- taste weights. Source is stamped on play_events when a play is launched from
-- a recommendation surface; NULL means the user picked the track manually —
-- those rows are INCLUDED here as the baseline control group the surfaces are
-- judged against (milestone #127: delta-vs-baseline is what makes the numbers
-- actionable). Raw source strings are bucketed into stable surface families in
-- the Go handler; completion_n is carried so family merges can weight
-- avg_completion correctly.
-
-- name: RecommendationWeeklyTrends :many
-- Weekly per-source outcome series for the tuning lab's trend view
-- (#1251). Aggregated across ALL users: the tuning knobs are global,
-- so judging a knob turn needs global outcomes — rows carry rates
-- only, no track or user identity. NULL-source (manual) rows are
-- included as the baseline family.
--
-- taste_hits counts plays whose track's artist has a positive weight
-- in that user's CURRENT taste profile — the "cheap recompute" option:
-- retroactive over the whole window, at the cost of drift (the profile
-- is today's, the play may be weeks old). Good enough to read whether
-- a surface is feeding taste-fitting tracks.
-- $1 window in weeks.
-SELECT
-    date_trunc('week', pe.started_at)::date AS week_start,
-    pe.source,
-    count(*)::bigint AS plays,
-    count(*) FILTER (WHERE pe.was_skipped)::bigint AS skips,
-    count(pe.completion_ratio)::bigint AS completion_n,
-    COALESCE(avg(pe.completion_ratio), 0)::float8 AS avg_completion,
-    count(*) FILTER (WHERE tpa.artist_id IS NOT NULL)::bigint AS taste_hits
-FROM play_events pe
-JOIN tracks t ON t.id = pe.track_id
-LEFT JOIN taste_profile_artists tpa
-       ON tpa.user_id = pe.user_id
-      AND tpa.artist_id = t.artist_id
-      AND tpa.weight > 0
-WHERE pe.started_at > now() - (sqlc.arg(weeks)::int * INTERVAL '1 week')
-GROUP BY 1, 2
-ORDER BY 1, 2;
+-- a system-playlist surface ('for_you' | 'discover' | the discovery mixes);
+-- NULL for library / radio / user-playlist plays, which are excluded here.

 -- name: RecommendationSourceMetricsForUser :many
 -- $1 user_id, $2 window_days. plays/skips are counts; avg_completion is the
-- mean completion ratio over the completion_n plays that recorded one.
-- pick_kind splits For You plays into taste/fresh/unattributed (#1249);
-- it is NULL for every other source, so those still group to one row.
+-- mean completion ratio over plays that recorded one (0 when none did).
 SELECT
    pe.source,
-    pe.pick_kind,
    count(*)::bigint AS plays,
    count(*) FILTER (WHERE pe.was_skipped)::bigint AS skips,
-    count(pe.completion_ratio)::bigint AS completion_n,
-    COALESCE(avg(pe.completion_ratio), 0)::float8 AS avg_completion
+    COALESCE(
+        avg(pe.completion_ratio) FILTER (WHERE pe.completion_ratio IS NOT NULL),
+        0)::float8 AS avg_completion
 FROM play_events pe
 WHERE pe.user_id = $1
+  AND pe.source IS NOT NULL
  AND pe.started_at > now() - ($2::float8 * INTERVAL '1 day')
-GROUP BY pe.source, pe.pick_kind
+GROUP BY pe.source
 ORDER BY plays DESC;
@@ -1,67 +0,0 @@
-- Recommendation tuning lab queries (#1250). Seeding happens via the
-- recsettings boot reconcile; shipped defaults live in Go only.
-
-- name: UpsertWeightProfileDefaults :exec
-- Boot reconcile: insert the shipped defaults for a profile if the row
-- doesn't exist yet. Never overwrites operator-tuned values.
-INSERT INTO recommendation_weight_profiles (
-    profile, base_weight, like_boost, recency_weight, skip_penalty,
-    jitter_magnitude, context_weight, similarity_weight, taste_weight,
-    context_time_weight
-) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
-ON CONFLICT (profile) DO NOTHING;
-
-- name: ListWeightProfiles :many
-SELECT * FROM recommendation_weight_profiles ORDER BY profile;
-
-- name: UpdateWeightProfile :one
-UPDATE recommendation_weight_profiles
-   SET base_weight         = $2,
-       like_boost          = $3,
-       recency_weight      = $4,
-       skip_penalty        = $5,
-       jitter_magnitude    = $6,
-       context_weight      = $7,
-       similarity_weight   = $8,
-       taste_weight        = $9,
-       context_time_weight = $10,
-       updated_at          = now()
- WHERE profile = $1
-RETURNING *;
-
-- name: UpsertTasteTuningDefaults :exec
-INSERT INTO taste_tuning (
-    singleton, half_life_days, engagement_hard_skip,
-    engagement_neutral, engagement_full, enriched_tag_scale, era_scale,
-    mood_scale
-) VALUES (true, $1, $2, $3, $4, $5, $6, $7)
-ON CONFLICT (singleton) DO NOTHING;
-
-- name: GetTasteTuning :one
-SELECT * FROM taste_tuning WHERE singleton = true;
-
-- name: UpdateTasteTuning :one
-UPDATE taste_tuning
-   SET half_life_days       = $1,
-       engagement_hard_skip = $2,
-       engagement_neutral   = $3,
-       engagement_full      = $4,
-       enriched_tag_scale   = $5,
-       era_scale            = $6,
-       mood_scale           = $7,
-       updated_at           = now()
- WHERE singleton = true
-RETURNING *;
-
-- name: InsertTuningAudit :exec
-- changes is a jsonb array of {field, old, new} objects.
-INSERT INTO recommendation_tuning_audit (scope, action, changes)
-VALUES ($1, $2, $3);
-
-- name: ListTuningAudit :many
-- Newest first; consumed by the metrics trend view (#1251) to annotate
-- knob turns on the timeline.
-SELECT id, changed_at, scope, action, changes
-  FROM recommendation_tuning_audit
- ORDER BY changed_at DESC, id DESC
- LIMIT $1;
@@ -8,11 +8,6 @@
 -- name: ListDeepCutsTracks :many
 -- #419 Deep Cuts: low-play tracks (<=2 plays) from artists the user
 -- has liked OR played heavily (>=5 non-skip plays across the artist).
-- Tracks the user has skipped twice or more don't qualify (#1257):
-- eligibility used to count only unskipped plays, so the most actively
-- rejected tracks read as "barely heard" and kept being re-offered.
-- Threshold 2 so a single accidental skip doesn't banish a track;
-- passive-signal only (no dislike UI, rule #101).
 -- $1 user_id, $2 date string.
 WITH affinity_artists AS (
    SELECT artist_id FROM general_likes_artists WHERE user_id = $1
@@ -28,20 +23,12 @@ play_counts AS (
      FROM play_events
     WHERE user_id = $1 AND was_skipped = false
     GROUP BY track_id
-),
-skip_counts AS (
-    SELECT track_id, COUNT(*) AS c
-      FROM play_events
-     WHERE user_id = $1 AND was_skipped = true
-     GROUP BY track_id
 )
 SELECT t.id, t.album_id, t.artist_id
  FROM tracks t
  JOIN affinity_artists aa ON aa.artist_id = t.artist_id
  LEFT JOIN play_counts pc ON pc.track_id = t.id
-  LEFT JOIN skip_counts sc ON sc.track_id = t.id
 WHERE COALESCE(pc.c, 0) <= 2
-   AND COALESCE(sc.c, 0) < 2
   AND NOT EXISTS (
       SELECT 1 FROM lidarr_quarantine q
        WHERE q.user_id = $1 AND q.track_id = t.id
@@ -50,112 +37,75 @@ SELECT t.id, t.album_id, t.artist_id
 LIMIT 200;

 -- name: ListRediscoverTracks :many
-- #420 Rediscover: tracks the user played a lot but has drifted away
-- from. One blended pool (issue #1246: the old two-tier UNION was
-- all-or-nothing — a single ">=6 months cold" row suppressed the whole
-- ">=30 days" tier, which is how a one-song playlist shipped; the 6mo
-- tier was also a strict subset of the 30d tier). Eligibility is >=3
-- non-skip plays and >=30 days cold; the bar sits at 3 rather than 5
-- so a weeks-old library still fields a pool — on young histories the
-- >=5-play tracks are precisely the ones still in rotation. Ordering
-- prefers true rediscoveries (>=6 months cold), then strong affection
-- (>=5 plays), then raw play count; the producer's minimum floor
-- decides whether the pool is big enough to ship at all. $1 user_id.
+-- #420 Rediscover: tracks the user played a lot (>=5 non-skip) but
+-- has drifted away from. Tiered so a young library still gets a mix:
+--   tier 0  not played in the last 6 months (true rediscovery)
+--   tier 1  (only if tier 0 empty) not played in the last 30 days
+-- Ordered by historical affection. $1 user_id.
 WITH stats AS (
    SELECT pe.track_id, COUNT(*) AS c, MAX(pe.started_at) AS last_at
      FROM play_events pe
     WHERE pe.user_id = $1 AND pe.was_skipped = false
     GROUP BY pe.track_id
+),
+deep AS (
+    SELECT t.id, t.album_id, t.artist_id, s.c, 0 AS tier
+      FROM tracks t
+      JOIN stats s ON s.track_id = t.id
+     WHERE s.c >= 5
+       AND s.last_at <= now() - interval '6 months'
+       AND NOT EXISTS (
+           SELECT 1 FROM lidarr_quarantine q
+            WHERE q.user_id = $1 AND q.track_id = t.id
+       )
+),
+shallow AS (
+    SELECT t.id, t.album_id, t.artist_id, s.c, 1 AS tier
+      FROM tracks t
+      JOIN stats s ON s.track_id = t.id
+     WHERE s.c >= 5
+       AND s.last_at <= now() - interval '30 days'
+       AND NOT EXISTS (
+           SELECT 1 FROM lidarr_quarantine q
+            WHERE q.user_id = $1 AND q.track_id = t.id
+       )
 )
-SELECT t.id, t.album_id, t.artist_id
-  FROM tracks t
-  JOIN stats s ON s.track_id = t.id
- WHERE s.c >= 3
-   AND s.last_at <= now() - interval '30 days'
-   AND NOT EXISTS (
-       SELECT 1 FROM lidarr_quarantine q
-        WHERE q.user_id = $1 AND q.track_id = t.id
-   )
-   -- Declined-resurfacing cooldown (#1258): a skip on a
-   -- rediscover-sourced play is the user explicitly saying "I've moved
-   -- on" to the exact invitation this mix extends — such tracks sit
-   -- out ~90 days instead of re-qualifying the next day. Passive
-   -- signal only (rule #101).
-   AND NOT EXISTS (
-       SELECT 1 FROM play_events rp
-        WHERE rp.user_id = $1
-          AND rp.track_id = t.id
-          AND rp.source = 'rediscover'
-          AND rp.was_skipped = true
-          AND rp.started_at > now() - interval '90 days'
-   )
- ORDER BY (s.last_at <= now() - interval '6 months') DESC,
-          (s.c >= 5) DESC,
-          s.c DESC, t.id
+SELECT id, album_id, artist_id
+  FROM (
+    SELECT id, album_id, artist_id, c, tier FROM deep
+    UNION ALL
+    SELECT id, album_id, artist_id, c, tier FROM shallow
+     WHERE NOT EXISTS (SELECT 1 FROM deep)
+  ) u
+ ORDER BY tier, c DESC, id
 LIMIT 200;

 -- name: ListNewForYouTracks :many
-- #421 New for you, tiered per project rule #131 (#1267). The old
-- single hard rule (added <30d AND direct affinity) had two failure
-- modes with one root: no notion of consumption — the album you
-- devoured in week one crowded the mix for three more weeks, and
-- after a quiet month nothing qualified at all.
--
-- "Consumed" = any track attempted for >=30s (the First Listens
-- threshold, #1268): once you've meaningfully engaged, the album is
-- no longer news. Applies to every tier — played albums leave the
-- mix the next build.
--
--   tier 1  the exact desire: unconsumed albums added <30d by
--           direct-affinity artists (liked, or >=3 attempted plays)
--   tier 2  step back a little: unconsumed affinity albums from the
--           wider 30-90d window — added while you weren't looking
--   tier 3  step back more: any unconsumed album added <90d
--           regardless of affinity, newest first
--
-- Album-coherent within tiers (newest album first, then disc/track);
-- the producer fills top-down and rotates within tier blocks. The
-- tier lands on playlist_tracks.pick_kind so metrics can price what
-- each step-back trades away. $1 user_id.
-WITH attempted AS (
-    SELECT DISTINCT pe.track_id
-      FROM play_events pe
-     WHERE pe.user_id = $1 AND pe.duration_played_ms >= 30000
-),
-consumed_albums AS (
-    SELECT DISTINCT t.album_id
-      FROM attempted a JOIN tracks t ON t.id = a.track_id
-),
-affinity_artists AS (
-    SELECT gla.artist_id FROM general_likes_artists gla WHERE gla.user_id = $1
+-- #421 New for you: tracks from albums added in the last 30 days
+-- whose artist the user has liked OR played (>=3 non-skip). Album-
+-- coherent (newest album first, then disc/track) — the producer does
+-- NOT diversity-cap these; they're meant as whole-album discovery.
+-- $1 user_id.
+WITH affinity_artists AS (
+    SELECT artist_id FROM general_likes_artists WHERE user_id = $1
    UNION
    SELECT t.artist_id
-      FROM attempted a JOIN tracks t ON t.id = a.track_id
+      FROM play_events pe JOIN tracks t ON t.id = pe.track_id
+     WHERE pe.user_id = $1 AND pe.was_skipped = false
     GROUP BY t.artist_id
    HAVING COUNT(*) >= 3
-),
-albums_tiered AS (
-    SELECT al.id AS album_id, al.created_at,
-           CASE
-             WHEN al.created_at >= now() - interval '30 days'
-                  AND al.artist_id IN (SELECT artist_id FROM affinity_artists) THEN 1
-             WHEN al.artist_id IN (SELECT artist_id FROM affinity_artists) THEN 2
-             ELSE 3
-           END AS tier
-      FROM albums al
-     WHERE al.created_at >= now() - interval '90 days'
-       AND al.id NOT IN (SELECT album_id FROM consumed_albums)
 )
-SELECT t.id, t.album_id, t.artist_id, alt.tier::int AS tier
+SELECT t.id, t.album_id, t.artist_id
  FROM tracks t
-  JOIN albums_tiered alt ON alt.album_id = t.album_id
- WHERE NOT EXISTS (
+  JOIN albums al ON al.id = t.album_id
+  JOIN affinity_artists aa ON aa.artist_id = al.artist_id
+ WHERE al.created_at >= now() - interval '30 days'
+   AND NOT EXISTS (
       SELECT 1 FROM lidarr_quarantine q
        WHERE q.user_id = $1 AND q.track_id = t.id
   )
- ORDER BY alt.tier, alt.created_at DESC, t.album_id,
-          t.disc_number NULLS FIRST, t.track_number NULLS FIRST
- LIMIT 300;
+ ORDER BY al.created_at DESC, t.disc_number NULLS FIRST, t.track_number NULLS FIRST
+ LIMIT 200;

 -- name: ListOnThisDayTracks :many
 -- #422 On This Day: tracks the user played around this calendar date
@@ -165,23 +115,13 @@ SELECT t.id, t.album_id, t.artist_id, alt.tier::int AS tier
 -- and window ±7→±10 so it surfaces on a months-old library instead
 -- of needing a full year of history; still skips cleanly (no rows →
 -- no playlist) when there's no qualifying history yet.
-- Day-of-year distance is circular (#1256): plain ABS made Dec 28 vs
-- Jan 3 read as 359 days apart, silently gutting the window for ~3
-- weeks around every New Year — precisely when holiday nostalgia is
-- the point. LEAST(d, 365-d) wraps the boundary; leap-year drift of
-- ±1 is absorbed by the ±10 window. The build date ($2, already here
-- for the md5 rotation) anchors "today" instead of now() so the
-- window is testable and consistent with the mix's daily determinism.
 -- $1 user_id, $2 date string.
 WITH windowed AS (
    SELECT track_id, COUNT(*) AS c
      FROM play_events
     WHERE user_id = $1 AND was_skipped = false
       AND started_at < now() - interval '30 days'
-       AND LEAST(
-           ABS(EXTRACT(DOY FROM started_at) - EXTRACT(DOY FROM $2::date)),
-           365 - ABS(EXTRACT(DOY FROM started_at) - EXTRACT(DOY FROM $2::date))
-       ) <= 10
+       AND ABS(EXTRACT(DOY FROM started_at) - EXTRACT(DOY FROM now())) <= 10
     GROUP BY track_id
 )
 SELECT t.id, t.album_id, t.artist_id
@@ -195,65 +135,35 @@ SELECT t.id, t.album_id, t.artist_id
 LIMIT 200;

 -- name: ListFirstListensTracks :many
-- #423 First Listens: songs the user has never heard or even
-- attempted. "Attempted" is track-level with a >=30s listen threshold
-- (#1268, operator decision 2026-07-03) — the old version disqualified
-- a whole album on ANY play_event, so a 2-second accidental brush
-- banished it permanently.
--
--   tier 1  the exact desire: albums with ZERO attempted tracks
--   tier 2  step back: barely-attempted albums (<=25% of tracks
--           reached 30s) — brushed, never explored. The already-
--           attempted tracks themselves are excluded; they're not
--           first listens.
--
-- Within each tier, affinity-ordered as before: liked artist, then
-- attempted-played artist (>=30s — skip-only contact isn't trust),
-- then the rest; album-coherent. The tier lands on
-- playlist_tracks.pick_kind via the producer. $1 user_id.
-WITH attempted AS (
-    SELECT DISTINCT pe.track_id
-      FROM play_events pe
-     WHERE pe.user_id = $1 AND pe.duration_played_ms >= 30000
+-- #423 First Listens: albums the user has never played any track of.
+-- Tiered: liked-artist albums first, then played-artist albums, then
+-- the rest — album-coherent within each tier. Not diversity-capped
+-- (whole-album discovery). $1 user_id.
+WITH heard_albums AS (
+    SELECT DISTINCT t.album_id
+      FROM play_events pe JOIN tracks t ON t.id = pe.track_id
+     WHERE pe.user_id = $1
 ),
-album_attempts AS (
-    SELECT t.album_id,
-           COUNT(a.track_id) AS attempted_count,
-           COUNT(*) AS track_count
-      FROM tracks t
-      LEFT JOIN attempted a ON a.track_id = t.id
-     GROUP BY t.album_id
-),
-attempted_artists AS (
+played_artists AS (
    SELECT DISTINCT t.artist_id
-      FROM attempted a JOIN tracks t ON t.id = a.track_id
-),
-albums_tiered AS (
-    SELECT aa.album_id,
-           CASE
-             WHEN aa.attempted_count = 0 THEN 1
-             WHEN aa.attempted_count::float / GREATEST(aa.track_count, 1) <= 0.25 THEN 2
-           END AS tier
-      FROM album_attempts aa
+      FROM play_events pe JOIN tracks t ON t.id = pe.track_id
+     WHERE pe.user_id = $1
 )
-SELECT t.id, t.album_id, t.artist_id, alt.tier::int AS tier
+SELECT t.id, t.album_id, t.artist_id
  FROM tracks t
  JOIN albums al ON al.id = t.album_id
-  JOIN albums_tiered alt ON alt.album_id = al.id
- WHERE alt.tier IS NOT NULL
-   AND NOT EXISTS (SELECT 1 FROM attempted a WHERE a.track_id = t.id)
+ WHERE NOT EXISTS (SELECT 1 FROM heard_albums h WHERE h.album_id = al.id)
   AND NOT EXISTS (
       SELECT 1 FROM lidarr_quarantine q
        WHERE q.user_id = $1 AND q.track_id = t.id
   )
 ORDER BY
-   alt.tier,
   (CASE
      WHEN EXISTS (
        SELECT 1 FROM general_likes_artists gla
         WHERE gla.user_id = $1 AND gla.artist_id = al.artist_id
      ) THEN 0
-      WHEN al.artist_id IN (SELECT artist_id FROM attempted_artists) THEN 1
+      WHEN al.artist_id IN (SELECT artist_id FROM played_artists) THEN 1
      ELSE 2
    END),
   al.id, t.disc_number NULLS FIRST, t.track_number NULLS FIRST
@@ -47,30 +47,14 @@ UPDATE system_playlist_runs
 UPDATE system_playlist_runs SET in_flight = false WHERE in_flight = true;

 -- name: PickSeedArtists :many
-- Top-12 most-engaged distinct artist candidates, tiered so the
-- "Songs like X" mixes never silently vanish (#1255): the old hard
-- 7-day window emptied the seed pool after a quiet week, and the
-- daily atomic-replace build then deleted every existing mix until
-- the user played something again. Same fallback shape as
-- PickTopPlayedTracksForUser (For You's seeds):
--   tier 0  engagement in the last 7 days
--   tier 1  (only if tier 0 empty) last 30 days
--   tier 2  (only if tiers 0+1 empty) all-time
--   tier 3  (only if 0-2 empty) liked artists with no play history
-- All returned rows share one tier; produceSeedMixes maps it onto the
-- rule-#131 pick-kind ladder and stamps the built tracks, so metrics
-- can compare mixes seeded from fresh vs stale engagement.
-- Score = unskipped-play count + 5 if user has liked the artist. The
-- Go-side picker (pickSeedArtistsForDay) shuffles the 12
-- daily-deterministically and takes songsLikeSeedCount (6) so the mix
-- set both rotates day-to-day and fills the dedicated Home row (#1491).
-WITH liked AS (
-    SELECT gla.artist_id FROM general_likes_artists gla WHERE gla.user_id = $1
-),
-recent7 AS (
+-- Top-5 most-engaged distinct artist candidates in the user's last 7
+-- days. The Go-side picker (pickSeedArtistsForDay) shuffles these
+-- daily-deterministically and takes the first 3 so the set of
+-- "Songs like X" mixes rotates day-to-day.
+-- Score = unskipped-play count + 5 if user has liked the artist.
+WITH plays AS (
    SELECT t.artist_id,
-           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count,
-           0 AS tier
+           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count
      FROM play_events pe
      JOIN tracks t ON t.id = pe.track_id
     WHERE pe.user_id = $1
@@ -78,53 +62,15 @@ recent7 AS (
       AND t.artist_id IS NOT NULL
     GROUP BY t.artist_id
 ),
-recent30 AS (
-    SELECT t.artist_id,
-           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count,
-           1 AS tier
-      FROM play_events pe
-      JOIN tracks t ON t.id = pe.track_id
-     WHERE pe.user_id = $1
-       AND pe.started_at > now() - INTERVAL '30 days'
-       AND t.artist_id IS NOT NULL
-     GROUP BY t.artist_id
-),
-alltime AS (
-    SELECT t.artist_id,
-           COUNT(*) FILTER (WHERE pe.was_skipped = false) AS play_count,
-           2 AS tier
-      FROM play_events pe
-      JOIN tracks t ON t.id = pe.track_id
-     WHERE pe.user_id = $1
-       AND t.artist_id IS NOT NULL
-     GROUP BY t.artist_id
-),
-likedonly AS (
-    SELECT l.artist_id, 0::bigint AS play_count, 3 AS tier
-      FROM liked l
-),
-chosen AS (
-    SELECT artist_id, play_count, tier FROM recent7
-    UNION ALL
-    SELECT artist_id, play_count, tier FROM recent30
-     WHERE NOT EXISTS (SELECT 1 FROM recent7)
-    UNION ALL
-    SELECT artist_id, play_count, tier FROM alltime
-     WHERE NOT EXISTS (SELECT 1 FROM recent7)
-       AND NOT EXISTS (SELECT 1 FROM recent30)
-    UNION ALL
-    SELECT artist_id, play_count, tier FROM likedonly
-     WHERE NOT EXISTS (SELECT 1 FROM recent7)
-       AND NOT EXISTS (SELECT 1 FROM recent30)
-       AND NOT EXISTS (SELECT 1 FROM alltime)
+liked AS (
+    SELECT artist_id FROM general_likes_artists WHERE user_id = $1
 )
-SELECT c.artist_id,
-       (c.play_count + CASE WHEN l.artist_id IS NOT NULL THEN 5 ELSE 0 END)::bigint AS score,
-       c.tier::int AS tier
-  FROM chosen c
-  LEFT JOIN liked l ON l.artist_id = c.artist_id
- ORDER BY score DESC, c.artist_id
- LIMIT 12;
+SELECT p.artist_id,
+       (p.play_count + CASE WHEN l.artist_id IS NOT NULL THEN 5 ELSE 0 END)::bigint AS score
+  FROM plays p
+  LEFT JOIN liked l ON l.artist_id = p.artist_id
+ ORDER BY score DESC, p.artist_id
+ LIMIT 5;

 -- name: PickTopPlayedTracksForUser :many
 -- For-You candidate seeds, tiered so For-You never silently vanishes:
@@ -132,10 +78,10 @@ SELECT c.artist_id,
 --   tier 1  (only if tier 0 empty) all-time top non-skip plays
 --   tier 2  (only if tiers 0+1 empty) liked tracks
 -- Returns up to 5 ids; tie-break by track_id for determinism. The
-- Go-side picker (pickDailySeeds) draws the day's seeds from these.
-- Widened from a hard 7-day window, which made For-You disappear
-- after a week of not listening and never recover on a self-hosted
-- library with sparse history.
+-- Go-side picker (pickForYouSeedForDay) rotates one per day via
+-- userIDHash. Widened from a hard 7-day window, which made For-You
+-- disappear after a week of not listening and never recover on a
+-- self-hosted library with sparse history.
 WITH recent AS (
    SELECT t.id, COUNT(*) AS c, 0 AS tier
      FROM play_events pe
@@ -1,56 +0,0 @@
-- Tag-enrichment provider settings queries (milestone #160, #1490 Step 2).
-- The tags.SettingsService consumes these — parallel to the cover-art
-- SettingsService (coverart_settings.sql). Keeping the two independent
-- means a new tag source is added without touching the art settings.
-
-- name: ListTagProviderSettings :many
-- All rows, for boot reconciliation and the admin GET handler.
-SELECT provider_id, enabled, api_key, display_order, created_at, updated_at
-  FROM tag_provider_settings
- ORDER BY display_order, provider_id;
-
-- name: UpsertTagProviderSettings :exec
-- INSERT a default row for a newly-registered provider, or refresh an
-- existing row's display_order on boot. Does NOT overwrite enabled /
-- api_key on conflict — the operator's settings persist across restarts.
-INSERT INTO tag_provider_settings (provider_id, enabled, display_order)
-VALUES ($1, $2, $3)
-ON CONFLICT (provider_id) DO UPDATE
-   SET display_order = EXCLUDED.display_order,
-       updated_at    = now();
-
-- name: UpdateTagProviderSettings :exec
-- Admin PATCH. $2 sets enabled. Pass FALSE for the $3 apiKeyChanged flag
-- to leave api_key untouched; TRUE with empty string clears it, TRUE with
-- a value sets it.
-UPDATE tag_provider_settings
-   SET enabled    = COALESCE($2, enabled),
-       api_key    = CASE WHEN $3::boolean THEN $4 ELSE api_key END,
-       updated_at = now()
- WHERE provider_id = $1;
-
-- name: GetCurrentTagSourcesVersion :one
-SELECT current_version FROM tag_sources_meta WHERE id = true;
-
-- name: BumpTagSourcesVersion :one
-- Increment + return the new version. Called only when the enabled set
-- changes (not on key edits).
-UPDATE tag_sources_meta
-   SET current_version = current_version + 1
- WHERE id = true
-RETURNING current_version;
-
-- name: GetTagProvidersHash :one
-SELECT last_registered_providers_hash
-  FROM tag_sources_meta
- WHERE id = true;
-
-- name: BumpTagVersionAndSetProvidersHash :one
-- Atomically increment the version and store the new registered-provider
-- hash. Called at boot when the compiled-in provider set changed, so
-- 'none' rows become eligible for a retry through the new chain.
-UPDATE tag_sources_meta
-   SET current_version = current_version + 1,
-       last_registered_providers_hash = $1
- WHERE id = true
-RETURNING current_version;
@@ -6,13 +6,10 @@
 -- One row per play in the decay-relevant window. completion is the play's
 -- completion ratio (precomputed column when present, else duration_played /
 -- track duration, clamped to [0,1]); age_days drives the time-decay. Genre
-- is split into tags in Go; release_date derives the decade for the era
-- facet (#1530). Quarantined tracks are excluded.
+-- is split into tags in Go. Quarantined tracks are excluded.
 SELECT
-    t.id AS track_id,
    t.artist_id,
    t.genre,
-    a.release_date,
    LEAST(GREATEST(
        COALESCE(pe.completion_ratio,
                 pe.duration_played_ms::float8 / NULLIF(t.duration_ms, 0),
@@ -20,7 +17,6 @@ SELECT
    (EXTRACT(epoch FROM now() - pe.started_at) / 86400.0)::float8 AS age_days
 FROM play_events pe
 JOIN tracks t ON t.id = pe.track_id
-JOIN albums a ON a.id = t.album_id
 WHERE pe.user_id = $1
  AND pe.started_at > now() - ($2::float8 * INTERVAL '1 day')
  AND NOT EXISTS (
@@ -29,13 +25,11 @@ WHERE pe.user_id = $1
  );

 -- name: ListLikedTrackTasteInputsForUser :many
-- (track_id, artist_id, genre, release_date) for each track the user has
-- explicitly liked. Feeds the track-like bonus into the liked track's artist,
-- tags, and era (#1530); track_id keys the enriched track_tags lookup (#1490).
-SELECT t.id AS track_id, t.artist_id, t.genre, a.release_date
+-- (artist_id, genre) for each track the user has explicitly liked. Feeds the
+-- track-like bonus into the liked track's artist and tags.
+SELECT t.artist_id, t.genre
 FROM general_likes gl
 JOIN tracks t ON t.id = gl.track_id
-JOIN albums a ON a.id = t.album_id
 WHERE gl.user_id = $1;

 -- name: ListLikedArtistIDsForUser :many
@@ -70,33 +64,3 @@ FROM taste_profile_tags
 WHERE user_id = $1
 ORDER BY weight DESC
 LIMIT $2;
-
-- name: DeleteTasteProfileErasForUser :exec
-DELETE FROM taste_profile_eras WHERE user_id = $1;
-
-- name: InsertTasteProfileEra :exec
-INSERT INTO taste_profile_eras (user_id, era, weight)
-VALUES ($1, $2, $3);
-
-- name: ListTasteProfileErasForUser :many
-- Top-weighted taste eras (#1530); consumed by the scorer's era term.
-SELECT era, weight
-FROM taste_profile_eras
-WHERE user_id = $1
-ORDER BY weight DESC
-LIMIT $2;
-
-- name: DeleteTasteProfileMoodsForUser :exec
-DELETE FROM taste_profile_moods WHERE user_id = $1;
-
-- name: InsertTasteProfileMood :exec
-INSERT INTO taste_profile_moods (user_id, mood, weight)
-VALUES ($1, $2, $3);
-
-- name: ListTasteProfileMoodsForUser :many
-- Top-weighted taste moods (#1534); consumed by the scorer's mood term.
-SELECT mood, weight
-FROM taste_profile_moods
-WHERE user_id = $1
-ORDER BY weight DESC
-LIMIT $2;
@@ -1,66 +0,0 @@
-- Track-tag enrichment queries (milestone #160, #1490). The tag enricher
-- drains ListTracksMissingTags, fetches from the provider chain, and
-- writes the merged top-K via DeleteTrackTags + InsertTrackTag, then
-- stamps SetTrackTagSource. Mirrors the coverart artist-enricher shape.
-
-- name: ListTracksMissingTags :many
-- Tracks eligible for tag enrichment: never processed (tag_source NULL)
-- or previously settled 'none' under an older provider version. Returns
-- the fields the provider chain needs — recording MBID (nullable) for
-- keyed lookups, title + artist name for name-based fallback, and the
-- artist MBID (nullable) for MusicBrainz's artist-tag fallback (#1519).
-- $1 = current tag_sources_version, $2 = limit.
-SELECT t.id, t.mbid, t.title, a.name AS artist_name, a.mbid AS artist_mbid
-  FROM tracks t
-  JOIN artists a ON a.id = t.artist_id
- WHERE t.tag_source IS NULL
-    OR (t.tag_source = 'none' AND t.tag_sources_version < $1)
- ORDER BY t.id
- LIMIT $2;
-
-- name: DeleteTrackTags :exec
-- Clear a track's cached tags before rewriting (atomic replace by the caller).
-DELETE FROM track_tags WHERE track_id = $1;
-
-- name: InsertTrackTag :exec
-- Upsert one (track, tag); keep the stronger weight when two providers
-- agree on a tag with different folksonomy strengths.
-INSERT INTO track_tags (track_id, tag, weight)
-VALUES ($1, $2, $3)
-ON CONFLICT (track_id, tag)
-    DO UPDATE SET weight = GREATEST(track_tags.weight, EXCLUDED.weight);
-
-- name: SetTrackTagSource :exec
-- Stamp the enrichment outcome so the batch drainer skips settled rows.
-- $2 = 'lastfm' | 'musicbrainz' | 'mixed' | 'none', $3 = current version.
-UPDATE tracks SET tag_source = $2, tag_sources_version = $3 WHERE id = $1;
-
-- name: ListPlayedTrackTagsForUser :many
-- The enriched tags for every track this user played inside the taste
-- window, so the recompute can union them into the tag facet alongside
-- ID3 genre. $1 = user_id, $2 = window_days. One row per (track, tag).
-SELECT tt.track_id, tt.tag, tt.weight
-  FROM track_tags tt
- WHERE tt.track_id IN (
-       SELECT DISTINCT pe.track_id
-         FROM play_events pe
-        WHERE pe.user_id = $1
-          AND pe.was_skipped = false
-          AND pe.started_at > now() - make_interval(days => $2::int)
-   );
-
-- name: ListLikedTrackTagsForUser :many
-- Enriched tags for the user's liked tracks — the like-bonus path in the
-- recompute mirrors the play path, so it needs the same tag lookup.
-SELECT tt.track_id, tt.tag, tt.weight
-  FROM track_tags tt
-  JOIN general_likes gl ON gl.track_id = tt.track_id
- WHERE gl.user_id = $1;
-
-- name: ListTrackTagsForTracks :many
-- Enriched tags for a set of candidate tracks (#1534), so the scorer can
-- derive each candidate's mood buckets at scoring time. One row per (track,
-- tag); the caller filters to mood words via the internal/mood vocabulary.
-SELECT tt.track_id, tt.tag
-  FROM track_tags tt
- WHERE tt.track_id = ANY($1::uuid[]);
@@ -62,15 +62,6 @@ var dataTables = []string{
 	// (never recreates the singleton, seeded once by 0018); ResetDB
 	// resets its counter via UPDATE below instead.
 	"cover_art_provider_settings",
-	// Same reasoning for the tag-enrichment settings (#1490): truncate the
-	// per-provider rows (reconcile re-seeds registered ones), and reset the
-	// tag_sources_meta counter via UPDATE below rather than truncating it.
-	"tag_provider_settings",
-	// recsettings.New reconciles shipped defaults on every construction
-	// (#1250), so truncating gives each test pristine tuning values.
-	"recommendation_weight_profiles",
-	"taste_tuning",
-	"recommendation_tuning_audit",
 	"tracks",
 	"albums",
 	"artists",
@@ -102,12 +93,4 @@ func ResetDB(t *testing.T, pool *pgxpool.Pool) {
 	); err != nil {
 		t.Fatalf("dbtest.ResetDB reset cover-art version: %v", err)
 	}
-	// Same for the tag-sources counter (#1490) — clears cross-test version
-	// accumulation that would spuriously report version_bumped on a
-	// key-only change.
-	if _, err := pool.Exec(ctx,
-		"UPDATE tag_sources_meta SET current_version = 1, last_registered_providers_hash = ''",
-	); err != nil {
-		t.Fatalf("dbtest.ResetDB reset tag-sources version: %v", err)
-	}
 }
@@ -1,58 +0,0 @@
-// Package mood maps folksonomy tags (from the track_tags cache, #1490) to a
-// small set of canonical mood buckets (#1534, milestone #160 Opt 2b). Both the
-// taste-profile builder and the recommendation scorer classify a track's tags
-// through Of() so a track's mood is derived the same way on both sides.
-//
-// The vocabulary is intentionally narrow: only words that clearly denote mood
-// (not genre). A track with no mood-word tags contributes nothing — the mood
-// facet is a supplement whose coverage grows with folksonomy enrichment
-// (thin on MusicBrainz-only, richer once Last.fm is keyed).
-package mood
-
-import "strings"
-
-// vocab maps a lowercased folksonomy tag to its canonical mood bucket. Several
-// synonyms collapse to one bucket so "sad" / "melancholy" / "melancholic" all
-// score the same dimension.
-var vocab = map[string]string{
-	// melancholic
-	"melancholic": "melancholic", "melancholy": "melancholic", "sad": "melancholic",
-	"sombre": "melancholic", "somber": "melancholic", "wistful": "melancholic",
-	"bittersweet": "melancholic", "mournful": "melancholic",
-	// energetic
-	"energetic": "energetic", "energy": "energetic", "upbeat": "energetic",
-	"uplifting": "energetic", "party": "energetic", "anthemic": "energetic",
-	// chill
-	"chill": "chill", "chillout": "chill", "chilled": "chill", "mellow": "chill",
-	"relaxing": "chill", "relaxed": "chill", "calm": "chill", "laid-back": "chill",
-	"laidback": "chill", "soothing": "chill",
-	// aggressive
-	"aggressive": "aggressive", "angry": "aggressive", "intense": "aggressive",
-	"heavy": "aggressive", "brutal": "aggressive",
-	// dark
-	"dark": "dark", "moody": "dark", "brooding": "dark", "haunting": "dark", "eerie": "dark",
-	// dreamy
-	"dreamy": "dreamy", "ethereal": "dreamy", "atmospheric": "dreamy",
-	"ambient": "dreamy", "hypnotic": "dreamy",
-	// happy
-	"happy": "happy", "cheerful": "happy", "feel good": "happy", "feel-good": "happy",
-	"feelgood": "happy", "joyful": "happy", "fun": "happy",
-	// romantic
-	"romantic": "romantic", "sensual": "romantic", "sexy": "romantic", "sentimental": "romantic",
-}
-
-// Of returns the distinct canonical mood buckets present in tags, lowercasing +
-// trimming each tag before lookup. Returns nil when no tag maps to a mood, so
-// callers get no mood signal for a track with only genre/descriptive tags.
-func Of(tags []string) []string {
-	var out []string
-	seen := make(map[string]bool)
-	for _, t := range tags {
-		key := strings.ToLower(strings.TrimSpace(t))
-		if m, ok := vocab[key]; ok && !seen[m] {
-			seen[m] = true
-			out = append(out, m)
-		}
-	}
-	return out
-}
@@ -1,43 +0,0 @@
-package mood
-
-import (
-	"sort"
-	"testing"
-)
-
-func TestOf(t *testing.T) {
-	cases := []struct {
-		name string
-		in   []string
-		want []string
-	}{
-		{"synonyms collapse", []string{"sad", "melancholy", "melancholic"}, []string{"melancholic"}},
-		{"case + whitespace", []string{" CHILL ", "Mellow"}, []string{"chill"}},
-		{"multiple buckets", []string{"energetic", "dark"}, []string{"dark", "energetic"}},
-		{"genre-only → none", []string{"rock", "shoegaze", "post-punk"}, nil},
-		{"empty", nil, nil},
-	}
-	for _, c := range cases {
-		got := Of(c.in)
-		sort.Strings(got)
-		want := append([]string(nil), c.want...)
-		sort.Strings(want)
-		if len(got) != len(want) {
-			t.Errorf("%s: Of(%v) = %v, want %v", c.name, c.in, got, want)
-			continue
-		}
-		for i := range got {
-			if got[i] != want[i] {
-				t.Errorf("%s: Of(%v) = %v, want %v", c.name, c.in, got, want)
-				break
-			}
-		}
-	}
-}
-
-func TestOf_Dedupes(t *testing.T) {
-	// Three tags mapping to the same bucket yield one entry.
-	if got := Of([]string{"chill", "mellow", "relaxed"}); len(got) != 1 || got[0] != "chill" {
-		t.Errorf("Of dedupe = %v, want [chill]", got)
-	}
-}
@@ -65,16 +65,7 @@ func (w *Writer) RecordPlayStarted(
 	clientID string,
 	at time.Time,
 ) (StartedResult, error) {
-	return w.RecordPlayStartedWithSource(ctx, userID, trackID, clientID, "", "", at)
-}
-
-// strPtrOrNil maps an empty string to a NULL text column (nullable pointer),
-// mirroring the clientID/source nil-on-empty pattern used above.
-func strPtrOrNil(s string) *string {
-	if s == "" {
-		return nil
-	}
-	return &s
+	return w.RecordPlayStartedWithSource(ctx, userID, trackID, clientID, "", at)
 }

 // systemPlaylistSources are the play_events.source values that count
@@ -106,36 +97,6 @@ var systemPlaylistSources = map[string]bool{
 	"songs_like_artist": true,
 }

-// lookupSystemPickKind resolves a system-playlist play's pick_kind
-// (taste/fresh, Discover's bucket, or a rule-#131 tier) from the user's
-// live snapshot of that variant at ingestion time. Attribution must be
-// frozen now — snapshots rebuild daily, so it can't be reconstructed at
-// metrics-read time (#1249, generalized in #1270). Source strings
-// double as system_variant values (see systemPlaylistSources). Returns
-// nil (unattributed) when the track isn't in the current snapshot —
-// plays predating the feature, or an offline replay arriving after the
-// track rotated out — and when the variant doesn't stamp yet. Real DB
-// errors propagate and fail the caller's transaction.
-func lookupSystemPickKind(
-	ctx context.Context,
-	q *dbq.Queries,
-	userID, trackID pgtype.UUID,
-	variant string,
-) (*string, error) {
-	kind, err := q.GetSystemPickKindForTrack(ctx, dbq.GetSystemPickKindForTrackParams{
-		UserID:        userID,
-		SystemVariant: &variant,
-		TrackID:       trackID,
-	})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return kind, nil
-}
-
 // RecordPlayStartedWithSource is RecordPlayStarted plus a `source`
 // tag identifying which surface the play came from. When source is a
 // known system-playlist kind the track is appended to that user's
@@ -145,7 +106,7 @@ func lookupSystemPickKind(
 func (w *Writer) RecordPlayStartedWithSource(
 	ctx context.Context,
 	userID, trackID pgtype.UUID,
-	clientID, source, deviceClass string,
+	clientID, source string,
 	at time.Time,
 ) (StartedResult, error) {
 	var out StartedResult
@@ -166,22 +127,13 @@ func (w *Writer) RecordPlayStartedWithSource(
 		if source != "" {
 			sourcePtr = &source
 		}
-		var pickKind *string
-		if systemPlaylistSources[source] {
-			pickKind, err = lookupSystemPickKind(ctx, q, userID, trackID, source)
-			if err != nil {
-				return err
-			}
-		}
 		ev, err := q.InsertPlayEvent(ctx, dbq.InsertPlayEventParams{
-			UserID:      userID,
-			TrackID:     trackID,
-			SessionID:   sessionID,
-			StartedAt:   pgtype.Timestamptz{Time: at, Valid: true},
-			ClientID:    clientIDPtr,
-			Source:      sourcePtr,
-			PickKind:    pickKind,
-			DeviceClass: strPtrOrNil(deviceClass),
+			UserID:    userID,
+			TrackID:   trackID,
+			SessionID: sessionID,
+			StartedAt: pgtype.Timestamptz{Time: at, Valid: true},
+			ClientID:  clientIDPtr,
+			Source:    sourcePtr,
 		})
 		if err != nil {
 			return err
@@ -399,7 +351,7 @@ func (w *Writer) RecordSyntheticCompletedPlay(
 func (w *Writer) RecordOfflinePlay(
 	ctx context.Context,
 	userID, trackID pgtype.UUID,
-	clientID, source, deviceClass string,
+	clientID, source string,
 	at time.Time,
 	durationPlayedMs int32,
 ) error {
@@ -443,22 +395,13 @@ func (w *Writer) RecordOfflinePlay(
 		if source != "" {
 			sourcePtr = &source
 		}
-		var pickKind *string
-		if systemPlaylistSources[source] {
-			pickKind, err = lookupSystemPickKind(ctx, q, userID, trackID, source)
-			if err != nil {
-				return err
-			}
-		}
 		ev, err := q.InsertPlayEvent(ctx, dbq.InsertPlayEventParams{
-			UserID:      userID,
-			TrackID:     trackID,
-			SessionID:   sessionID,
-			StartedAt:   pgtype.Timestamptz{Time: at, Valid: true},
-			ClientID:    clientIDPtr,
-			Source:      sourcePtr,
-			PickKind:    pickKind,
-			DeviceClass: strPtrOrNil(deviceClass),
+			UserID:    userID,
+			TrackID:   trackID,
+			SessionID: sessionID,
+			StartedAt: pgtype.Timestamptz{Time: at, Valid: true},
+			ClientID:  clientIDPtr,
+			Source:    sourcePtr,
 		})
 		if err != nil {
 			return err
@@ -226,10 +226,10 @@ func TestRecordOfflinePlay_DedupsByUserTrackStartedAt(t *testing.T) {
 	f := newFixture(t, 200_000)
 	ctx := context.Background()
 	at := time.Now().UTC()
-	if err := f.w.RecordOfflinePlay(ctx, f.user, f.track, "c", "", "", at, 120_000); err != nil {
+	if err := f.w.RecordOfflinePlay(ctx, f.user, f.track, "c", "", at, 120_000); err != nil {
 		t.Fatalf("first offline: %v", err)
 	}
-	if err := f.w.RecordOfflinePlay(ctx, f.user, f.track, "c", "", "", at, 120_000); err != nil {
+	if err := f.w.RecordOfflinePlay(ctx, f.user, f.track, "c", "", at, 120_000); err != nil {
 		t.Fatalf("replay offline: %v", err)
 	}
 	var count int
@@ -444,7 +444,7 @@ func TestRecordPlayStartedWithSource_AppendsRotation(t *testing.T) {
 	f := newFixture(t, 200_000)
 	now := time.Now().UTC()
 	if _, err := f.w.RecordPlayStartedWithSource(
-		context.Background(), f.user, f.track, "c", "for_you", "", now,
+		context.Background(), f.user, f.track, "c", "for_you", now,
 	); err != nil {
 		t.Fatalf("RecordPlayStartedWithSource: %v", err)
 	}
@@ -460,7 +460,7 @@ func TestRecordPlayStartedWithSource_AppendsRotation(t *testing.T) {

 	// Re-playing the same track stays a set (no duplicate append).
 	if _, err := f.w.RecordPlayStartedWithSource(
-		context.Background(), f.user, f.track, "c", "for_you", "", now.Add(time.Minute),
+		context.Background(), f.user, f.track, "c", "for_you", now.Add(time.Minute),
 	); err != nil {
 		t.Fatalf("RecordPlayStartedWithSource 2: %v", err)
 	}
@@ -488,123 +488,3 @@ func TestRecordPlayStarted_NoRotationWithoutSource(t *testing.T) {
 		t.Errorf("expected no rotation row for a source-less play")
 	}
 }
-
-// seedSystemSnapshot creates a system playlist of the given variant
-// containing the fixture track with the given pick_kind, mimicking
-// what the builder persists (#1249, generalized #1270).
-func seedSystemSnapshot(t *testing.T, f fixture, variant, pickKind string) {
-	t.Helper()
-	pl, err := f.q.CreateSystemPlaylist(context.Background(), dbq.CreateSystemPlaylistParams{
-		UserID: f.user, Name: variant, SystemVariant: &variant,
-	})
-	if err != nil {
-		t.Fatalf("CreateSystemPlaylist: %v", err)
-	}
-	if _, err := f.q.AppendPlaylistTrack(context.Background(), dbq.AppendPlaylistTrackParams{
-		PlaylistID: pl.ID, TrackID: f.track, PickKind: &pickKind,
-	}); err != nil {
-		t.Fatalf("AppendPlaylistTrack: %v", err)
-	}
-}
-
-func TestRecordPlayStartedWithSource_StampsForYouPickKind(t *testing.T) {
-	f := newFixture(t, 200_000)
-	seedSystemSnapshot(t, f, "for_you", "fresh")
-	res, err := f.w.RecordPlayStartedWithSource(
-		context.Background(), f.user, f.track, "c", "for_you", "", time.Now().UTC(),
-	)
-	if err != nil {
-		t.Fatalf("RecordPlayStartedWithSource: %v", err)
-	}
-	got, err := f.q.GetPlayEventByID(context.Background(), res.PlayEventID)
-	if err != nil {
-		t.Fatalf("get: %v", err)
-	}
-	if got.PickKind == nil || *got.PickKind != "fresh" {
-		t.Errorf("pick_kind = %v, want fresh (frozen from live snapshot)", got.PickKind)
-	}
-}
-
-func TestRecordPlayStartedWithSource_NoSnapshotMatch_PickKindNull(t *testing.T) {
-	// A for_you play whose track isn't in the current snapshot (rotated
-	// out, or no snapshot exists) stays unattributed rather than guessing.
-	f := newFixture(t, 200_000)
-	res, err := f.w.RecordPlayStartedWithSource(
-		context.Background(), f.user, f.track, "c", "for_you", "", time.Now().UTC(),
-	)
-	if err != nil {
-		t.Fatalf("RecordPlayStartedWithSource: %v", err)
-	}
-	got, err := f.q.GetPlayEventByID(context.Background(), res.PlayEventID)
-	if err != nil {
-		t.Fatalf("get: %v", err)
-	}
-	if got.PickKind != nil {
-		t.Errorf("pick_kind = %q, want NULL (track not in snapshot)", *got.PickKind)
-	}
-}
-
-func TestRecordPlayStartedWithSource_CrossVariant_PickKindNull(t *testing.T) {
-	// Attribution is variant-scoped: even with a For You snapshot
-	// containing the track, a play from a different surface must not
-	// pick up For You's stamp — it reads its OWN variant's snapshot,
-	// which here doesn't exist.
-	f := newFixture(t, 200_000)
-	seedSystemSnapshot(t, f, "for_you", "taste")
-	res, err := f.w.RecordPlayStartedWithSource(
-		context.Background(), f.user, f.track, "c", "discover", "", time.Now().UTC(),
-	)
-	if err != nil {
-		t.Fatalf("RecordPlayStartedWithSource: %v", err)
-	}
-	got, err := f.q.GetPlayEventByID(context.Background(), res.PlayEventID)
-	if err != nil {
-		t.Fatalf("get: %v", err)
-	}
-	if got.PickKind != nil {
-		t.Errorf("pick_kind = %q, want NULL for a cross-variant play", *got.PickKind)
-	}
-}
-
-func TestRecordPlayStartedWithSource_StampsDiscoverBucket(t *testing.T) {
-	// Discover stamps its candidate bucket (#1270); a discover play whose
-	// track is in the live snapshot freezes that bucket onto the play.
-	f := newFixture(t, 200_000)
-	seedSystemSnapshot(t, f, "discover", "dormant")
-	res, err := f.w.RecordPlayStartedWithSource(
-		context.Background(), f.user, f.track, "c", "discover", "", time.Now().UTC(),
-	)
-	if err != nil {
-		t.Fatalf("RecordPlayStartedWithSource: %v", err)
-	}
-	got, err := f.q.GetPlayEventByID(context.Background(), res.PlayEventID)
-	if err != nil {
-		t.Fatalf("get: %v", err)
-	}
-	if got.PickKind == nil || *got.PickKind != "dormant" {
-		t.Errorf("pick_kind = %v, want dormant (frozen from live snapshot)", got.PickKind)
-	}
-}
-
-func TestRecordOfflinePlay_StampsForYouPickKind(t *testing.T) {
-	// The offline replay path threads source the same way; a replayed
-	// for_you play whose track is still in the snapshot gets attributed.
-	f := newFixture(t, 200_000)
-	seedSystemSnapshot(t, f, "for_you", "taste")
-	at := time.Now().UTC().Add(-time.Hour)
-	if err := f.w.RecordOfflinePlay(
-		context.Background(), f.user, f.track, "c", "for_you", "", at, 180_000,
-	); err != nil {
-		t.Fatalf("RecordOfflinePlay: %v", err)
-	}
-	var pickKind *string
-	if err := f.pool.QueryRow(context.Background(),
-		`SELECT pick_kind FROM play_events WHERE user_id = $1 AND track_id = $2`,
-		f.user, f.track,
-	).Scan(&pickKind); err != nil {
-		t.Fatalf("select: %v", err)
-	}
-	if pickKind == nil || *pickKind != "taste" {
-		t.Errorf("pick_kind = %v, want taste", pickKind)
-	}
-}
@@ -10,39 +10,26 @@ import (
 )

 const (
-	discoverTotalSlots = 100
-	// Bucket allocation, pushed toward *targeted* novelty (Scribe #1488):
-	// the taste-matched-unheard arm gets the plurality, dormant stays a
-	// familiar anchor, and the crude random arm is trimmed to a
-	// serendipity sliver. On a single-user server cross_user is empty and
-	// its slots redistribute, so taste_unheard becomes the dominant real
-	// arm — Discover actually discovers instead of re-warming known artists.
-	discoverTasteUnheardSlots  = 35
-	discoverDormantSlots       = 30
-	discoverCrossUserSlots     = 20
-	discoverRandomSlots        = 15
+	discoverTotalSlots         = 100
+	discoverDormantSlots       = 40
+	discoverCrossUserSlots     = 30
+	discoverRandomSlots        = 30
 	discoverMaxTracksPerAlbum  = 2
 	discoverMaxTracksPerArtist = 3
 )

 // discoverTrack is the common shape used by the bucket allocator. The
 // three sqlc-generated row types collapse into this internal struct so
-// downstream functions don't need to be generic over them. PickKind is
-// the originating bucket (taste_unheard/dormant/cross_user/random,
-// #1270/#1488), stamped in the row adapters so it survives the
-// interleave — bucket identity is what makes the slot allocation
-// measurable in the metrics.
+// downstream functions don't need to be generic over them.
 type discoverTrack struct {
 	ID       pgtype.UUID
 	AlbumID  pgtype.UUID
 	ArtistID pgtype.UUID
-	PickKind string
 }

 // buildDiscoverCandidates assembles the Discover playlist track list.
-// Pulls from four buckets (taste_unheard / dormant / cross_user /
-// random), applies per-album/per-artist caps, then redistributes any
-// deficit equally across the remaining buckets.
+// Pulls from three buckets, applies per-album/per-artist caps, then
+// redistributes any deficit equally across the remaining buckets.
 //
 // Returns up to discoverTotalSlots track IDs in the order they should
 // appear in the playlist (round-robin interleaved across buckets).
@@ -52,57 +39,6 @@ type discoverTrack struct {
 // the redistribution algorithm rolls the deficit into the surviving
 // buckets so one broken bucket can't silently kill the whole playlist.
 func buildDiscoverCandidates(ctx context.Context, q *dbq.Queries, logger *slog.Logger, userID pgtype.UUID, dateStr string) ([]rankedCandidate, error) {
-	pools := loadDiscoverPools(ctx, q, logger, userID, dateStr)
-
-	// Allocate slots with redistribution. Order fixes both the allocation
-	// index mapping and (below) the interleave/dedup priority.
-	allocations := redistributeSlots([]bucketRequest{
-		{want: discoverTasteUnheardSlots, available: len(pools.taste)},
-		{want: discoverDormantSlots, available: len(pools.dormant)},
-		{want: discoverCrossUserSlots, available: len(pools.crossUser)},
-		{want: discoverRandomSlots, available: len(pools.random)},
-	})
-
-	// Round-robin interleave so the playlist doesn't front-load one
-	// flavour. taste_unheard leads so a track shared with another bucket
-	// keeps the taste stamp — the targeted-novelty arm stays measurable.
-	out := interleaveBuckets(
-		pools.taste[:allocations[0]],
-		pools.dormant[:allocations[1]],
-		pools.crossUser[:allocations[2]],
-		pools.random[:allocations[3]],
-	)
-
-	// Convert to rankedCandidate (the type insertSystemPlaylist accepts).
-	// Score is unused for Discover — the daily-deterministic md5 ordering
-	// already gave us the ranking.
-	ranked := make([]rankedCandidate, 0, len(out))
-	for _, t := range out {
-		ranked = append(ranked, rankedCandidate{TrackID: t.ID, PickKind: t.PickKind})
-	}
-	return ranked, nil
-}
-
-// discoverPools holds the four Discover candidate buckets after adapting
-// + per-album/per-artist capping. Bucket query failures degrade to an
-// empty pool (logged) so one broken bucket can't kill the whole playlist;
-// the slot redistribution rolls its deficit into the survivors.
-type discoverPools struct {
-	taste     []discoverTrack
-	dormant   []discoverTrack
-	crossUser []discoverTrack
-	random    []discoverTrack
-}
-
-func loadDiscoverPools(ctx context.Context, q *dbq.Queries, logger *slog.Logger, userID pgtype.UUID, dateStr string) discoverPools {
-	tasteRows, err := q.ListTasteUnheardTracksForDiscover(ctx, dbq.ListTasteUnheardTracksForDiscoverParams{
-		UserID: userID, Column2: dateStr,
-	})
-	if err != nil {
-		logger.Warn("discover: taste-unheard bucket failed; continuing with empty pool",
-			"user_id", uuidStringPL(userID), "err", err)
-		tasteRows = nil
-	}
 	dormantRows, err := q.ListDormantArtistTracksForDiscover(ctx, dbq.ListDormantArtistTracksForDiscoverParams{
 		UserID: userID, Column2: dateStr,
 	})
@@ -127,32 +63,43 @@ func loadDiscoverPools(ctx context.Context, q *dbq.Queries, logger *slog.Logger,
 			"user_id", uuidStringPL(userID), "err", err)
 		randomRows = nil
 	}
-	return discoverPools{
-		taste:     capByAlbumAndArtist(tasteUnheardRowsToTracks(tasteRows)),
-		dormant:   capByAlbumAndArtist(dormantRowsToTracks(dormantRows)),
-		crossUser: capByAlbumAndArtist(crossUserRowsToTracks(crossUserRows)),
-		random:    capByAlbumAndArtist(randomRowsToTracks(randomRows)),
-	}
-}

-func tasteUnheardRowsToTracks(rows []dbq.ListTasteUnheardTracksForDiscoverRow) []discoverTrack {
-	out := make([]discoverTrack, len(rows))
-	for i, r := range rows {
-		out[i] = discoverTrack{
-			ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID,
-			PickKind: pickKindTasteUnheard,
-		}
+	// Adapt sqlc-generated rows into the internal struct, then apply
+	// per-album / per-artist caps.
+	dormantPool := capByAlbumAndArtist(dormantRowsToTracks(dormantRows))
+	crossUserPool := capByAlbumAndArtist(crossUserRowsToTracks(crossUserRows))
+	randomPool := capByAlbumAndArtist(randomRowsToTracks(randomRows))
+
+	// Allocate slots with redistribution.
+	allocations := redistributeSlots([]bucketRequest{
+		{want: discoverDormantSlots, available: len(dormantPool)},
+		{want: discoverCrossUserSlots, available: len(crossUserPool)},
+		{want: discoverRandomSlots, available: len(randomPool)},
+	})
+
+	// Take the head of each bucket's capped pool.
+	dormantTake := dormantPool[:allocations[0]]
+	crossUserTake := crossUserPool[:allocations[1]]
+	randomTake := randomPool[:allocations[2]]
+
+	// Round-robin interleave so the playlist doesn't front-load one
+	// flavour.
+	out := interleaveBuckets(dormantTake, crossUserTake, randomTake)
+
+	// Convert to rankedCandidate (the type insertSystemPlaylist accepts).
+	// Score is unused for Discover — the daily-deterministic md5 ordering
+	// already gave us the ranking.
+	ranked := make([]rankedCandidate, 0, len(out))
+	for _, t := range out {
+		ranked = append(ranked, rankedCandidate{TrackID: t.ID})
 	}
-	return out
+	return ranked, nil
 }

 func dormantRowsToTracks(rows []dbq.ListDormantArtistTracksForDiscoverRow) []discoverTrack {
 	out := make([]discoverTrack, len(rows))
 	for i, r := range rows {
-		out[i] = discoverTrack{
-			ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID,
-			PickKind: pickKindDormant,
-		}
+		out[i] = discoverTrack{ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID}
 	}
 	return out
 }
@@ -160,10 +107,7 @@ func dormantRowsToTracks(rows []dbq.ListDormantArtistTracksForDiscoverRow) []dis
 func crossUserRowsToTracks(rows []dbq.ListCrossUserLikedTracksForDiscoverRow) []discoverTrack {
 	out := make([]discoverTrack, len(rows))
 	for i, r := range rows {
-		out[i] = discoverTrack{
-			ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID,
-			PickKind: pickKindCrossUser,
-		}
+		out[i] = discoverTrack{ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID}
 	}
 	return out
 }
@@ -171,10 +115,7 @@ func crossUserRowsToTracks(rows []dbq.ListCrossUserLikedTracksForDiscoverRow) []
 func randomRowsToTracks(rows []dbq.ListRandomUnheardTracksForDiscoverRow) []discoverTrack {
 	out := make([]discoverTrack, len(rows))
 	for i, r := range rows {
-		out[i] = discoverTrack{
-			ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID,
-			PickKind: pickKindRandom,
-		}
+		out[i] = discoverTrack{ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID}
 	}
 	return out
 }
@@ -161,27 +161,3 @@ func TestInterleaveBuckets_DedupsAcrossBuckets(t *testing.T) {
 		}
 	}
 }
-
-func TestInterleaveBuckets_PreservesBucketPickKind(t *testing.T) {
-	// Bucket provenance (#1270) is stamped on discoverTrack before the
-	// interleave and must survive it — including dedup, where a track in
-	// two buckets keeps the stamp of the bucket it was taken from.
-	dormant := []discoverTrack{
-		{ID: uuidN(1), PickKind: pickKindDormant},
-		{ID: uuidN(2), PickKind: pickKindDormant},
-	}
-	random := []discoverTrack{
-		{ID: uuidN(1), PickKind: pickKindRandom}, // shared with dormant
-		{ID: uuidN(3), PickKind: pickKindRandom},
-	}
-	got := interleaveBuckets(dormant, nil, random)
-	if len(got) != 3 {
-		t.Fatalf("len = %d, want 3", len(got))
-	}
-	want := map[byte]string{1: pickKindDormant, 2: pickKindDormant, 3: pickKindRandom}
-	for _, tr := range got {
-		if w := want[tr.ID.Bytes[15]]; tr.PickKind != w {
-			t.Errorf("track %d pick_kind = %q, want %q", tr.ID.Bytes[15], tr.PickKind, w)
-		}
-	}
-}
@@ -99,7 +99,7 @@ func TestPickHeadAndTail_SmallPool(t *testing.T) {
 		makeCand(2, 11, 101, 0.9),
 		makeCand(3, 12, 102, 0.8),
 	}
-	got := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", time.Now(), 5, 2)
+	got := pickHeadAndTail(in, testUserID, "2026-05-07", time.Now(), 5, 2)
 	if len(got) != 3 {
 		t.Errorf("len = %d, want 3 (pool too small for head/tail split)", len(got))
 	}
@@ -112,7 +112,7 @@ func TestPickHeadAndTail_ExactlyTotal(t *testing.T) {
 	for i := 0; i < 7; i++ {
 		in = append(in, makeCand(i+1, i+1, i+1, float64(7-i)))
 	}
-	got := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", time.Now(), 5, 2)
+	got := pickHeadAndTail(in, testUserID, "2026-05-07", time.Now(), 5, 2)
 	if len(got) != 7 {
 		t.Errorf("len = %d, want 7 (pool == total)", len(got))
 	}
@@ -126,7 +126,7 @@ func TestPickHeadAndTail_HeadAndTailSplit(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		in = append(in, makeCand(i+1, i+1, i+1, float64(100-i)))
 	}
-	got := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", time.Now(), 20, 5)
+	got := pickHeadAndTail(in, testUserID, "2026-05-07", time.Now(), 20, 5)
 	if len(got) != 25 {
 		t.Errorf("len = %d, want 25 (20 head + 5 tail)", len(got))
 	}
@@ -139,8 +139,8 @@ func TestPickHeadAndTail_Determinism(t *testing.T) {
 		in = append(in, makeCand(i+1, i+1, i+1, float64(100-i)))
 	}
 	now := time.Now()
-	got1 := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", now, 20, 5)
-	got2 := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", now, 20, 5)
+	got1 := pickHeadAndTail(in, testUserID, "2026-05-07", now, 20, 5)
+	got2 := pickHeadAndTail(in, testUserID, "2026-05-07", now, 20, 5)
 	if len(got1) != len(got2) {
 		t.Fatalf("len mismatch: %d vs %d", len(got1), len(got2))
 	}
@@ -161,8 +161,8 @@ func TestPickHeadAndTail_HeadStable_TailVariesAcrossDays(t *testing.T) {
 		in = append(in, makeCand(i+1, i+1, i+1, float64(100-i)))
 	}
 	now := time.Now()
-	day1 := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", now, 20, 5)
-	day2 := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-08", now, 20, 5)
+	day1 := pickHeadAndTail(in, testUserID, "2026-05-07", now, 20, 5)
+	day2 := pickHeadAndTail(in, testUserID, "2026-05-08", now, 20, 5)
 	if len(day1) != 25 || len(day2) != 25 {
 		t.Fatalf("len mismatch: day1=%d day2=%d", len(day1), len(day2))
 	}
@@ -205,7 +205,7 @@ func TestPickHeadAndTail_TailFromBeyond2xHeadN(t *testing.T) {
 		sim := float64(50 - i)
 		in = append(in, makeCand(i+1, i+1, i+1, sim))
 	}
-	got := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", time.Now(), 5, 3)
+	got := pickHeadAndTail(in, testUserID, "2026-05-07", time.Now(), 5, 3)
 	if len(got) != 8 {
 		t.Fatalf("len = %d, want 8 (5 head + 3 tail)", len(got))
 	}
@@ -243,190 +243,3 @@ func TestPickTopN_DiversityCap(t *testing.T) {
 		t.Errorf("len = %d, want 3 (artist 100 capped at 3)", len(got))
 	}
 }
-
-func TestPickHeadAndTail_MarksPickKinds(t *testing.T) {
-	// 100-deep pool with headN=20, tailN=5: the 20 head entries are the
-	// taste picks, the 5 tail entries the freshness injection (#1249).
-	in := make([]recommendation.Candidate, 0, 100)
-	for i := 0; i < 100; i++ {
-		in = append(in, makeCand(i+1, i+1, i+1, float64(100-i)))
-	}
-	got := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", time.Now(), 20, 5)
-	if len(got) != 25 {
-		t.Fatalf("len = %d, want 25", len(got))
-	}
-	for i := 0; i < 20; i++ {
-		if got[i].PickKind != pickKindTaste {
-			t.Errorf("head[%d].PickKind = %q, want %q", i, got[i].PickKind, pickKindTaste)
-		}
-	}
-	for i := 20; i < 25; i++ {
-		if got[i].PickKind != pickKindFresh {
-			t.Errorf("tail[%d].PickKind = %q, want %q", i-20, got[i].PickKind, pickKindFresh)
-		}
-	}
-}
-
-func TestPickHeadAndTail_SmallPoolAllTaste(t *testing.T) {
-	// The small-pool fallback is pure top-N-by-score — that IS the taste
-	// mechanism, so nothing on this path is an exploration pick.
-	in := []recommendation.Candidate{
-		makeCand(1, 10, 100, 1.0),
-		makeCand(2, 11, 101, 0.9),
-		makeCand(3, 12, 102, 0.8),
-	}
-	got := pickHeadAndTail(in, nil, 1, testUserID, "2026-05-07", time.Now(), 5, 2)
-	for i, rc := range got {
-		if rc.PickKind != pickKindTaste {
-			t.Errorf("got[%d].PickKind = %q, want %q (fallback is all taste)",
-				i, rc.PickKind, pickKindTaste)
-		}
-	}
-}
-
-func TestPickTopN_NoPickKind(t *testing.T) {
-	// Songs-like-X and the discovery mixes don't split; their rows must
-	// persist pick_kind NULL (empty string here).
-	in := []recommendation.Candidate{makeCand(1, 10, 100, 1.0)}
-	got := pickTopN(in, testUserID, "2026-05-07", time.Now(), 25)
-	if len(got) != 1 || got[0].PickKind != "" {
-		t.Errorf("pickTopN PickKind = %q, want empty (persists as NULL)", got[0].PickKind)
-	}
-}
-
-func TestHeadQuotas(t *testing.T) {
-	cases := []struct {
-		seeds, headN int
-		want         []int
-	}{
-		{1, 50, []int{50}},
-		{2, 50, []int{30, 20}},
-		{3, 50, []int{25, 15, 10}},
-		{3, 7, []int{4, 2, 1}}, // rounding remainder → primary seed
-	}
-	for _, c := range cases {
-		got := headQuotas(c.seeds, c.headN)
-		if len(got) != len(c.want) {
-			t.Fatalf("headQuotas(%d, %d) len = %d, want %d", c.seeds, c.headN, len(got), len(c.want))
-		}
-		sum := 0
-		for i := range got {
-			sum += got[i]
-			if got[i] != c.want[i] {
-				t.Errorf("headQuotas(%d, %d)[%d] = %d, want %d", c.seeds, c.headN, i, got[i], c.want[i])
-			}
-		}
-		if sum != c.headN {
-			t.Errorf("headQuotas(%d, %d) sums to %d, want %d", c.seeds, c.headN, sum, c.headN)
-		}
-	}
-}
-
-func TestPickQuotaHead_BlendsSeeds(t *testing.T) {
-	// Seed 0's neighborhood out-scores everything (#1269): without
-	// quotas the head would be all seed-0. With headN=10 and quotas
-	// [5,3,2], the walk takes the best 5 from seed 0, then seeds 1 and
-	// 2 get their guaranteed slots from deeper ranks.
-	in := make([]recommendation.Candidate, 0, 30)
-	seedOf := map[pgtype.UUID]int{}
-	for i := 0; i < 30; i++ {
-		c := makeCand(i+1, i+1, i+1, float64(30-i))
-		si := 0
-		if i >= 20 && i < 25 {
-			si = 1
-		} else if i >= 25 {
-			si = 2
-		}
-		seedOf[c.Track.ID] = si
-		in = append(in, c)
-	}
-	// Input is already score-descending and cap-free.
-	head := pickQuotaHead(in, seedOf, 3, 10)
-	if len(head) != 10 {
-		t.Fatalf("head len = %d, want 10", len(head))
-	}
-	want := []byte{1, 2, 3, 4, 5, 21, 22, 23, 26, 27}
-	for i, w := range want {
-		if head[i].Track.ID.Bytes[15] != w {
-			t.Errorf("head[%d] = track %d, want %d", i, head[i].Track.ID.Bytes[15], w)
-		}
-	}
-}
-
-func TestPickQuotaHead_ThinSeedSpillsBestFirst(t *testing.T) {
-	// Seed 1 has a single candidate; its unfilled quota goes to the
-	// best remaining candidates regardless of seed.
-	in := make([]recommendation.Candidate, 0, 12)
-	seedOf := map[pgtype.UUID]int{}
-	for i := 0; i < 12; i++ {
-		c := makeCand(i+1, i+1, i+1, float64(12-i))
-		si := 0
-		if i == 11 {
-			si = 1 // the worst-ranked candidate is seed 1's only one
-		}
-		seedOf[c.Track.ID] = si
-		in = append(in, c)
-	}
-	head := pickQuotaHead(in, seedOf, 2, 10)
-	if len(head) != 10 {
-		t.Fatalf("head len = %d, want 10", len(head))
-	}
-	// Quotas [6,4]: seed 0 fills 6 (tracks 1-6), seed 1 fills 1
-	// (track 12), spill tops up with tracks 7-9.
-	got := map[byte]bool{}
-	for _, c := range head {
-		got[c.Track.ID.Bytes[15]] = true
-	}
-	for _, w := range []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 12} {
-		if !got[w] {
-			t.Errorf("head missing track %d (spill should fill best-first)", w)
-		}
-	}
-}
-
-func TestPickWeightedTail_PrefersEarlyRanks(t *testing.T) {
-	// The fresh tail's sample is rank-weighted (#1269): across many
-	// days, the mean selected rank must sit well below the uniform
-	// draw's ~99.5 for a 200-deep pool.
-	pool := make([]recommendation.Candidate, 0, 200)
-	for i := 0; i < 200; i++ {
-		c := makeCand(1, i+1, i+1, 1.0)
-		// Distinct track IDs beyond one byte: bytes wrap at 256.
-		c.Track.ID.Bytes[14] = byte(i / 200)
-		c.Track.ID.Bytes[15] = byte(i % 200)
-		pool = append(pool, c)
-	}
-	rankOf := map[pgtype.UUID]int{}
-	for i, c := range pool {
-		rankOf[c.Track.ID] = i
-	}
-	totalRank, picks := 0, 0
-	for day := 1; day <= 28; day++ {
-		got := pickWeightedTail(pool, "2026-06-"+twoDigits(day), 10)
-		if len(got) != 10 {
-			t.Fatalf("day %d: len = %d, want 10", day, len(got))
-		}
-		for _, c := range got {
-			totalRank += rankOf[c.Track.ID]
-			picks++
-		}
-	}
-	mean := float64(totalRank) / float64(picks)
-	if mean > 80 {
-		t.Errorf("mean selected rank = %.1f; want well below uniform ~99.5", mean)
-	}
-}
-
-func TestPickWeightedTail_DeterministicWithinDay(t *testing.T) {
-	pool := make([]recommendation.Candidate, 0, 60)
-	for i := 0; i < 60; i++ {
-		pool = append(pool, makeCand(i+1, i+1, i+1, 1.0))
-	}
-	a := pickWeightedTail(pool, "2026-06-05", 8)
-	b := pickWeightedTail(pool, "2026-06-05", 8)
-	for i := range a {
-		if a[i].Track.ID != b[i].Track.ID {
-			t.Fatal("weighted tail must be deterministic within a day")
-		}
-	}
-}
@@ -236,7 +236,7 @@ func (s *Scheduler) runStartupCatchUp(ctx context.Context, users []dbq.ListActiv
 // build can read a fresh profile (phase-2 consumption); both steps are
 // best-effort and a failure in one is logged without blocking the other.
 func (s *Scheduler) rebuildUserDaily(ctx context.Context, userID pgtype.UUID, now time.Time) {
-	if err := taste.BuildTasteProfile(ctx, s.pool, s.logger, userID, currentTasteConfig()); err != nil {
+	if err := taste.BuildTasteProfile(ctx, s.pool, s.logger, userID, taste.DefaultConfig()); err != nil {
 		s.logger.Warn("scheduler: taste profile rebuild failed",
 			"user_id", uuidStringPL(userID), "err", err)
 	}
@@ -1,7 +1,6 @@
 package playlists

 import (
-	"sort"
 	"testing"

 	"github.com/jackc/pgx/v5/pgtype"
@@ -47,26 +46,6 @@ func TestPickSeedArtistsFromRows_Empty(t *testing.T) {
 	}
 }

-func TestPickKindForSeedTier(t *testing.T) {
-	// The seed query's fallback tiers map onto the rule-#131 ladder:
-	// fresh 7-day engagement is the exact desire, everything past the
-	// 30-day step-back collapses into the far tier (#1255).
-	cases := []struct {
-		tier int32
-		want string
-	}{
-		{0, pickKindTier1},
-		{1, pickKindTier2},
-		{2, pickKindTier3},
-		{3, pickKindTier3},
-	}
-	for _, c := range cases {
-		if got := pickKindForSeedTier(c.tier); got != c.want {
-			t.Errorf("pickKindForSeedTier(%d) = %q, want %q", c.tier, got, c.want)
-		}
-	}
-}
-
 // userIDHash is the per-user, per-day hash that drives the daily-
 // determinism RNGs. Same family as tieBreakHash, just keyed on user
 // ID instead of track ID.
@@ -97,100 +76,81 @@ func TestUserIDHash_DifferentUserChangesHash(t *testing.T) {
 	}
 }

-// pickDailySeeds shuffles the candidate pool daily-deterministically
-// and takes up to n — For-You uses n=forYouSeedCount for its
-// multi-seed blend (#1269), Songs-like uses n=songsLikeSeedCount via
-// the pickSeedArtistsForDay wrapper. Verifies determinism within a day,
-// variation across days, and graceful degradation on small pools.
+// pickForYouSeedForDay rotates the chosen For-You seed across the
+// user's top-played candidates using userIDHash. Verifies the picker
+// is deterministic within a day, varies across days, and degrades
+// gracefully when fewer than 5 candidates exist.

-func TestPickDailySeeds_DeterministicWithinDay(t *testing.T) {
+func TestPickForYouSeedForDay_DeterministicWithinDay(t *testing.T) {
 	u := pgtype.UUID{Bytes: [16]byte{1}, Valid: true}
-	pool := []pgtype.UUID{
+	seeds := []pgtype.UUID{
 		{Bytes: [16]byte{10}, Valid: true},
 		{Bytes: [16]byte{20}, Valid: true},
 		{Bytes: [16]byte{30}, Valid: true},
 		{Bytes: [16]byte{40}, Valid: true},
 		{Bytes: [16]byte{50}, Valid: true},
 	}
-	a := pickDailySeeds(pool, u, "2026-05-04", 3)
-	b := pickDailySeeds(pool, u, "2026-05-04", 3)
-	if len(a) != 3 || len(b) != 3 {
-		t.Fatalf("lens = %d, %d; want 3, 3", len(a), len(b))
-	}
-	for i := range a {
-		if a[i] != b[i] {
-			t.Fatalf("same day should pick same seeds; got %v then %v", a, b)
-		}
+	a := pickForYouSeedForDay(seeds, u, "2026-05-04")
+	b := pickForYouSeedForDay(seeds, u, "2026-05-04")
+	if a != b {
+		t.Fatalf("same day should pick same seed; got %v then %v", a, b)
 	}
 }

-func TestPickDailySeeds_VariesAcrossDays(t *testing.T) {
+func TestPickForYouSeedForDay_VariesAcrossDays(t *testing.T) {
 	u := pgtype.UUID{Bytes: [16]byte{1}, Valid: true}
-	pool := []pgtype.UUID{
+	seeds := []pgtype.UUID{
 		{Bytes: [16]byte{10}, Valid: true},
 		{Bytes: [16]byte{20}, Valid: true},
 		{Bytes: [16]byte{30}, Valid: true},
 		{Bytes: [16]byte{40}, Valid: true},
 		{Bytes: [16]byte{50}, Valid: true},
 	}
-	firstPicks := map[[16]byte]bool{}
+	picks := map[[16]byte]bool{}
 	for i := 1; i <= 30; i++ {
 		date := "2026-05-" + twoDigits(i)
-		firstPicks[pickDailySeeds(pool, u, date, 3)[0].Bytes] = true
+		picks[pickForYouSeedForDay(seeds, u, date).Bytes] = true
 	}
-	if len(firstPicks) < 2 {
-		t.Errorf("expected >=2 distinct lead seeds across 30 days; got %d", len(firstPicks))
+	if len(picks) < 2 {
+		t.Errorf("expected >=2 distinct seeds across 30 days; got %d", len(picks))
 	}
 }

-func TestPickDailySeeds_SmallPool(t *testing.T) {
+func TestPickForYouSeedForDay_SingleCandidate(t *testing.T) {
 	u := pgtype.UUID{Bytes: [16]byte{1}, Valid: true}
 	only := pgtype.UUID{Bytes: [16]byte{99}, Valid: true}
-	got := pickDailySeeds([]pgtype.UUID{only}, u, "2026-05-04", 3)
-	if len(got) != 1 || got[0] != only {
-		t.Errorf("single-entry pool should return just that entry; got %v", got)
+	got := pickForYouSeedForDay([]pgtype.UUID{only}, u, "2026-05-04")
+	if got != only {
+		t.Errorf("single-seed pool should return that seed; got %v", got)
 	}
 }

-func TestPickDailySeeds_EmptyPool(t *testing.T) {
+func TestPickForYouSeedForDay_EmptyPool(t *testing.T) {
 	u := pgtype.UUID{Bytes: [16]byte{1}, Valid: true}
-	if got := pickDailySeeds(nil, u, "2026-05-04", 3); len(got) != 0 {
-		t.Errorf("empty pool should return nothing; got %v", got)
+	got := pickForYouSeedForDay(nil, u, "2026-05-04")
+	if got.Valid {
+		t.Errorf("empty pool should return zero UUID; got %v", got)
 	}
 }

-// pickSeedArtistsForDay takes the user's top-12 candidate artists and
-// returns songsLikeSeedCount of them via daily-deterministic shuffle.
-// Verifies the picker is deterministic within a day, varies across days,
-// and degrades gracefully when fewer than songsLikeSeedCount candidates
-// exist. bigSeedPool is a pool comfortably larger than songsLikeSeedCount
-// so the "returns exactly the count" cases have room.
-func bigSeedPool(n int) []pgtype.UUID {
-	pool := make([]pgtype.UUID, 0, n)
-	for i := 0; i < n; i++ {
-		pool = append(pool, pgtype.UUID{Bytes: [16]byte{byte(10 * (i + 1))}, Valid: true})
-	}
-	return pool
-}
-
-// seedSetKey sorts the picked seeds' lead bytes into a stable string so
-// two picks with the same members (any order) compare equal.
-func seedSetKey(seeds []pgtype.UUID) string {
-	bs := make([]byte, 0, len(seeds))
-	for _, s := range seeds {
-		bs = append(bs, s.Bytes[0])
-	}
-	sort.Slice(bs, func(i, j int) bool { return bs[i] < bs[j] })
-	return string(bs)
-}
+// pickSeedArtistsForDay takes the user's top-5 candidate artists and
+// returns 3 of them via daily-deterministic shuffle. Verifies the
+// picker is deterministic within a day, varies across days, and
+// degrades gracefully when fewer than 3 or 5 candidates exist.

 func TestPickSeedArtistsForDay_DeterministicWithinDay(t *testing.T) {
 	u := pgtype.UUID{Bytes: [16]byte{1}, Valid: true}
-	pool := bigSeedPool(10)
+	pool := []pgtype.UUID{
+		{Bytes: [16]byte{10}, Valid: true},
+		{Bytes: [16]byte{20}, Valid: true},
+		{Bytes: [16]byte{30}, Valid: true},
+		{Bytes: [16]byte{40}, Valid: true},
+		{Bytes: [16]byte{50}, Valid: true},
+	}
 	a := pickSeedArtistsForDay(pool, u, "2026-05-04")
 	b := pickSeedArtistsForDay(pool, u, "2026-05-04")
-	if len(a) != songsLikeSeedCount || len(b) != songsLikeSeedCount {
-		t.Fatalf("expected %d seeds; got %d / %d", songsLikeSeedCount, len(a), len(b))
+	if len(a) != 3 || len(b) != 3 {
+		t.Fatalf("expected 3 seeds; got %d / %d", len(a), len(b))
 	}
 	for i := range a {
 		if a[i] != b[i] {
@@ -201,23 +161,40 @@ func TestPickSeedArtistsForDay_DeterministicWithinDay(t *testing.T) {

 func TestPickSeedArtistsForDay_VariesAcrossDays(t *testing.T) {
 	u := pgtype.UUID{Bytes: [16]byte{1}, Valid: true}
-	pool := bigSeedPool(10)
-	// Collect the seed set (order-independent) across many dates. With
-	// C(10, songsLikeSeedCount) combinations, 30 dates yield >=2 distinct sets.
-	seen := map[string]bool{}
+	pool := []pgtype.UUID{
+		{Bytes: [16]byte{10}, Valid: true},
+		{Bytes: [16]byte{20}, Valid: true},
+		{Bytes: [16]byte{30}, Valid: true},
+		{Bytes: [16]byte{40}, Valid: true},
+		{Bytes: [16]byte{50}, Valid: true},
+	}
+	// Collect the trio (as a sorted byte tuple) across many dates.
+	// With C(5,3) = 10 possible trios, 30 dates should yield >=2 distinct sets.
+	seen := map[[3]byte]bool{}
 	for i := 1; i <= 30; i++ {
 		got := pickSeedArtistsForDay(pool, u, "2026-05-"+twoDigits(i))
-		if len(got) != songsLikeSeedCount {
-			t.Fatalf("expected %d seeds; got %d", songsLikeSeedCount, len(got))
+		if len(got) != 3 {
+			t.Fatalf("expected 3 seeds; got %d", len(got))
 		}
-		seen[seedSetKey(got)] = true
+		// Sort the three byte values for set-equivalence comparison.
+		v := [3]byte{got[0].Bytes[0], got[1].Bytes[0], got[2].Bytes[0]}
+		if v[0] > v[1] {
+			v[0], v[1] = v[1], v[0]
+		}
+		if v[1] > v[2] {
+			v[1], v[2] = v[2], v[1]
+		}
+		if v[0] > v[1] {
+			v[0], v[1] = v[1], v[0]
+		}
+		seen[v] = true
 	}
 	if len(seen) < 2 {
-		t.Errorf("expected >=2 distinct seed sets across 30 days; got %d", len(seen))
+		t.Errorf("expected >=2 distinct seed trios across 30 days; got %d", len(seen))
 	}
 }

-func TestPickSeedArtistsForDay_FewerThanCount(t *testing.T) {
+func TestPickSeedArtistsForDay_FewerThanFive(t *testing.T) {
 	u := pgtype.UUID{Bytes: [16]byte{1}, Valid: true}
 	pool := []pgtype.UUID{
 		{Bytes: [16]byte{10}, Valid: true},
@@ -12,10 +12,8 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"math"
 	"math/rand"
 	"sort"
-	"sync"
 	"time"

 	"github.com/jackc/pgx/v5"
@@ -24,7 +22,6 @@ import (

 	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
 	"git.fabledsword.com/bvandeusen/minstrel/internal/recommendation"
-	"git.fabledsword.com/bvandeusen/minstrel/internal/taste"
 )

 // seedArtistRow mirrors the sqlc-generated PickSeedArtistsRow shape.
@@ -35,7 +32,7 @@ type seedArtistRow struct {
 }

 // pickSeedArtistsFromRows projects sqlc rows into the seed list. The
-// SQL already orders by score DESC + artist_id and LIMIT 12, so this is
+// SQL already orders by score DESC + artist_id and LIMIT 3, so this is
 // just a column projection — but pulling it into a function keeps the
 // call-site readable and makes the post-fetch path testable without
 // a database.
@@ -86,15 +83,32 @@ func userIDHash(userID pgtype.UUID, dateStr string) uint64 {
 	return binary.BigEndian.Uint64(sum[:8])
 }

-// pickDailySeeds takes a candidate pool of UUIDs and returns up to n
-// of them, daily-deterministically shuffled. Each day gets a different
-// ordering / selection, but within-day stability is preserved (same
-// inputs always produce the same output).
+// pickForYouSeedForDay picks one of the user's top-played candidate
+// tracks as today's For-You seed. With 5 candidates and SHA-256-based
+// rotation, each candidate gets picked roughly 1 day in 5; the chosen
+// seed drives the similarity candidate pool, so the resulting mix is
+// substantially different across days for a user with diverse top-N
+// plays.
+//
+// Degrades gracefully: 1 candidate → returns it; 0 → returns zero UUID
+// (caller treats as "no seed available" and skips For-You).
+func pickForYouSeedForDay(seeds []pgtype.UUID, userID pgtype.UUID, dateStr string) pgtype.UUID {
+	if len(seeds) == 0 {
+		return pgtype.UUID{}
+	}
+	idx := int(userIDHash(userID, dateStr) % uint64(len(seeds)))
+	return seeds[idx]
+}
+
+// pickSeedArtistsForDay takes a candidate pool of up to N artists and
+// returns up to 3 of them, daily-deterministically shuffled. Each day
+// gets a different ordering / selection, but within-day stability is
+// preserved (same inputs always produce the same output).
 //
 // Uses Fisher-Yates over a copy of the input, seeded by userIDHash.
-// Degrades gracefully: <n candidates returns whatever is available in
+// Degrades gracefully: <3 candidates returns whatever is available in
 // shuffled order.
-func pickDailySeeds(pool []pgtype.UUID, userID pgtype.UUID, dateStr string, n int) []pgtype.UUID {
+func pickSeedArtistsForDay(pool []pgtype.UUID, userID pgtype.UUID, dateStr string) []pgtype.UUID {
 	if len(pool) == 0 {
 		return nil
 	}
@@ -104,151 +118,41 @@ func pickDailySeeds(pool []pgtype.UUID, userID pgtype.UUID, dateStr string, n in
 	rng.Shuffle(len(shuffled), func(i, j int) {
 		shuffled[i], shuffled[j] = shuffled[j], shuffled[i]
 	})
+	n := 3
 	if len(shuffled) < n {
 		n = len(shuffled)
 	}
 	return shuffled[:n]
 }

-// songsLikeSeedCount is how many "Songs like {artist}" mixes to build
-// each day (#1491). Bumped from 3 when Songs-like was promoted to its
-// own dedicated Home row — the best-performing surface (low skip / high
-// completion) was buried as 3 tiles in the shared Playlists carousel, so
-// the wider row now shows a wider spread. Drawn from PickSeedArtists'
-// deeper top-12 pool via a daily-deterministic shuffle so the set still
-// rotates day to day rather than pinning the same six artists.
-const songsLikeSeedCount = 6
-
-// pickSeedArtistsForDay picks up to songsLikeSeedCount seed artists for
-// the Songs-like mixes; For-You uses pickDailySeeds directly with
-// forYouSeedCount.
-func pickSeedArtistsForDay(pool []pgtype.UUID, userID pgtype.UUID, dateStr string) []pgtype.UUID {
-	return pickDailySeeds(pool, userID, dateStr, songsLikeSeedCount)
-}
-
 // rankedCandidate is a (track_id, score) pair used during in-memory
 // sorting before insert into playlist_tracks. T5 fills these from
-// recommendation.Candidate scores. PickKind is the track's provenance
-// within its mix — For-You's head/tail split (#1249) and Discover's
-// buckets (#1270); empty persists as NULL (variant doesn't stamp yet).
+// recommendation.Candidate scores.
 type rankedCandidate struct {
-	TrackID  pgtype.UUID
-	Score    float64
-	PickKind string
-}
-
-// Pick kinds, persisted on playlist_tracks.pick_kind so plays can
-// attribute skips to the population that sourced the track — For You's
-// "taste engine missing" vs "freshness tax", Discover's three buckets
-// (#1270). Values mirror the CHECK in migration 0041; taste_unheard is
-// Discover's taste-targeted-novelty arm (#1488).
-const (
-	pickKindTaste        = "taste"
-	pickKindFresh        = "fresh"
-	pickKindDormant      = "dormant"
-	pickKindTasteUnheard = "taste_unheard"
-	pickKindCrossUser    = "cross_user"
-	pickKindRandom       = "random"
-	pickKindTier1        = "tier1"
-	pickKindTier2        = "tier2"
-	pickKindTier3        = "tier3"
-)
-
-// pickKindForSeedTier maps PickSeedArtists' seed-pool fallback tier
-// onto the rule-#131 pick-kind ladder: fresh 7-day engagement pins the
-// mix's exact desire (tier1), the 30-day window steps back a little
-// (tier2), and all-time / liked-only seeds are the far fallback
-// (tier3). Stamped mix-wide — seed staleness is a property of the
-// whole build, and it's what the metrics breakdown attributes skips to.
-func pickKindForSeedTier(tier int32) string {
-	switch tier {
-	case 0:
-		return pickKindTier1
-	case 1:
-		return pickKindTier2
-	default:
-		return pickKindTier3
-	}
-}
-
-// pickKindForMixTier maps a tiered mix query's 1-based tier column
-// (numbered to match rule #131's ladder directly) onto the pick-kind
-// vocabulary. Distinct from pickKindForSeedTier, whose 0-based tiers
-// count fallback steps of the seed pool rather than eligibility rungs.
-func pickKindForMixTier(tier int32) string {
-	switch tier {
-	case 1:
-		return pickKindTier1
-	case 2:
-		return pickKindTier2
-	default:
-		return pickKindTier3
-	}
+	TrackID pgtype.UUID
+	Score   float64
 }

 const systemMixLength = 25

-// systemMixWeights are the scoring weights used by the daily builds.
+// systemMixWeights are the fixed scoring weights used by the cron worker.
 // JitterMagnitude is small (0.1) and combined with a userIDHash-seeded
 // RNG (see scoreAndSortCandidates) — same (user, day) produces same
 // scores within a day, but near-tied candidates reshuffle across days
 // so the playlist doesn't feel frozen.
-//
-// DB-tunable since #1250: the recsettings service pushes the current
-// daily_mix profile via SetSystemMixWeights at boot and on every admin
-// change (coverart Configure() pattern — no signature threading, live
-// effect without restart). The literal here is only the pre-push
-// value; shipped defaults live in recsettings.ShippedDailyMixWeights,
-// which must stay in sync with it.
-var (
-	systemTuningMu   sync.RWMutex
-	systemMixWeights = recommendation.ScoringWeights{
-		BaseWeight:       1.0,
-		LikeBoost:        2.0,
-		RecencyWeight:    1.0,
-		SkipPenalty:      2.0,
-		JitterMagnitude:  0.1,
-		ContextWeight:    0.5,
-		SimilarityWeight: 1.5,
-		// Taste profile (#796 phase 2): the daily mixes are the primary
-		// taste-driven surface, so they lean on it. TasteMatchScore is in
-		// [-1,+1], so 1.5 makes a strong taste fit comparable to a like boost
-		// while passive avoidance (negative) gently demotes.
-		TasteWeight: 1.5,
-		// Time-of-day/weekday context affinity (#1531), in [-1,+1]. Starts
-		// uniform with radio pending trend data.
-		ContextTimeWeight: 1.0,
-	}
-	systemTasteConfig = taste.DefaultConfig()
-)
-
-// SetSystemMixWeights installs the current daily_mix scoring weights.
-// Called by the recsettings service at boot and on admin updates.
-func SetSystemMixWeights(w recommendation.ScoringWeights) {
-	systemTuningMu.Lock()
-	defer systemTuningMu.Unlock()
-	systemMixWeights = w
-}
-
-// SetTasteConfig installs the taste-profile build configuration
-// (half-life + engagement curve, #1250). Same push model as
-// SetSystemMixWeights.
-func SetTasteConfig(c taste.Config) {
-	systemTuningMu.Lock()
-	defer systemTuningMu.Unlock()
-	systemTasteConfig = c
-}
-
-func currentSystemMixWeights() recommendation.ScoringWeights {
-	systemTuningMu.RLock()
-	defer systemTuningMu.RUnlock()
-	return systemMixWeights
-}
-
-func currentTasteConfig() taste.Config {
-	systemTuningMu.RLock()
-	defer systemTuningMu.RUnlock()
-	return systemTasteConfig
+var systemMixWeights = recommendation.ScoringWeights{
+	BaseWeight:       1.0,
+	LikeBoost:        2.0,
+	RecencyWeight:    1.0,
+	SkipPenalty:      2.0,
+	JitterMagnitude:  0.1,
+	ContextWeight:    0.5,
+	SimilarityWeight: 1.5,
+	// Taste profile (#796 phase 2): the daily mixes are the primary
+	// taste-driven surface, so they lean on it. TasteMatchScore is in
+	// [-1,+1], so 1.5 makes a strong taste fit comparable to a like boost
+	// while passive avoidance (negative) gently demotes.
+	TasteWeight: 1.5,
 }

 // forYouHeadN is the number of top-scored tracks that anchor the For-You
@@ -271,122 +175,6 @@ const (
 	forYouTailN = 50
 )

-// forYouSeedCount is how many of the user's top-5 tracks seed each
-// day's build (#1269). A single rotating seed made the mix bipolar
-// day-to-day — swinging whole neighborhoods as the rotation moved
-// between dissimilar anchors; blending 3 spans neighborhoods within
-// one day and smooths the swing across days.
-const forYouSeedCount = 3
-
-// headQuotas fixes each seed's share of the For-You head so one
-// neighborhood can't monopolize it even when its candidates out-score
-// the others (#1269): 50/30/20 for three seeds, 60/40 for two, all of
-// it for one. Rounding remainder goes to the primary seed; a thin
-// seed's unfilled quota spills best-first in pickQuotaHead.
-func headQuotas(numSeeds, headN int) []int {
-	if numSeeds <= 1 {
-		return []int{headN}
-	}
-	fractions := []float64{0.5, 0.3, 0.2}
-	if numSeeds == 2 {
-		fractions = []float64{0.6, 0.4}
-	}
-	if numSeeds > len(fractions) {
-		// Not reachable at forYouSeedCount = 3; even split keeps any
-		// future seed-count change from silently starving seeds.
-		fractions = make([]float64, numSeeds)
-		for i := range fractions {
-			fractions[i] = 1.0 / float64(numSeeds)
-		}
-	}
-	quotas := make([]int, numSeeds)
-	assigned := 0
-	for i := 0; i < numSeeds; i++ {
-		quotas[i] = int(float64(headN) * fractions[i])
-		assigned += quotas[i]
-	}
-	quotas[0] += headN - assigned
-	return quotas
-}
-
-// pickQuotaHead walks the score-sorted capped pool best-first, taking
-// candidates whose originating seed still has head quota; slots a thin
-// seed can't fill spill best-first regardless of seed in a second
-// pass. A nil seedOf (single-seed path, tests) attributes everything
-// to seed 0, which reduces to plain top-headN.
-func pickQuotaHead(capped []recommendation.Candidate, seedOf map[pgtype.UUID]int, numSeeds, headN int) []recommendation.Candidate {
-	quotas := headQuotas(numSeeds, headN)
-	taken := make([]int, len(quotas))
-	inHead := make(map[pgtype.UUID]bool, headN)
-	head := make([]recommendation.Candidate, 0, headN)
-	for _, c := range capped {
-		if len(head) >= headN {
-			break
-		}
-		si := seedOf[c.Track.ID]
-		if si < 0 || si >= len(quotas) {
-			si = 0
-		}
-		if taken[si] >= quotas[si] {
-			continue
-		}
-		taken[si]++
-		head = append(head, c)
-		inHead[c.Track.ID] = true
-	}
-	for _, c := range capped {
-		if len(head) >= headN {
-			break
-		}
-		if inHead[c.Track.ID] {
-			continue
-		}
-		head = append(head, c)
-		inHead[c.Track.ID] = true
-	}
-	return head
-}
-
-// forYouTailHalfLifeRanks tunes the fresh tail's rank bias (#1269): a
-// candidate's sampling weight halves every 50 ranks, so the 101st-best
-// candidate is far likelier than the 401st-best instead of equal —
-// freshness keeps its "you'll probably enjoy this" half.
-const forYouTailHalfLifeRanks = 50.0
-
-// tailSampleUniverse quantizes tieBreakHash into a uniform (0,1] draw
-// for the weighted sample; 1e6 buckets is plenty of resolution for
-// pools of a few hundred.
-const tailSampleUniverse uint64 = 1_000_000
-
-// pickWeightedTail samples up to tailN candidates from the rank-
-// ordered tail pool with exponentially rank-decaying weights, using
-// deterministic Efraimidis-Spirakis keys (u^(1/w), u derived from
-// tieBreakHash): same (track, day) → same key, so the sample is stable
-// within a day and rotates across days. Replaces the uniform daily
-// draw where rank 380 had the same chance as rank 101.
-func pickWeightedTail(tailPool []recommendation.Candidate, dateStr string, tailN int) []recommendation.Candidate {
-	if len(tailPool) <= tailN {
-		return tailPool
-	}
-	type keyed struct {
-		c   recommendation.Candidate
-		key float64
-	}
-	keys := make([]keyed, len(tailPool))
-	for i, c := range tailPool {
-		u := (float64(tieBreakHash(c.Track.ID, dateStr)%tailSampleUniverse) + 1) /
-			float64(tailSampleUniverse+1)
-		w := math.Exp2(-float64(i) / forYouTailHalfLifeRanks)
-		keys[i] = keyed{c: c, key: math.Pow(u, 1/w)}
-	}
-	sort.SliceStable(keys, func(i, j int) bool { return keys[i].key > keys[j].key })
-	out := make([]recommendation.Candidate, tailN)
-	for i := 0; i < tailN; i++ {
-		out[i] = keys[i].c
-	}
-	return out
-}
-
 // scoreAndSortCandidates scores every candidate with recommendation.Score
 // and returns a new slice sorted by score DESC (ties broken by
 // tieBreakHash). The scoring RNG is seeded by userIDHash so jitter is
@@ -411,10 +199,9 @@ func scoreAndSortCandidates(cands []recommendation.Candidate, userID pgtype.UUID
 	sort.SliceStable(ordered, func(i, j int) bool {
 		return uuidLessPL(ordered[i].Track.ID, ordered[j].Track.ID)
 	})
-	weights := currentSystemMixWeights()
 	pairs := make([]scored, len(ordered))
 	for i, c := range ordered {
-		pairs[i] = scored{c: c, score: recommendation.Score(c.Inputs, weights, now, rng.Float64)}
+		pairs[i] = scored{c: c, score: recommendation.Score(c.Inputs, systemMixWeights, now, rng.Float64)}
 	}
 	sort.SliceStable(pairs, func(i, j int) bool {
 		if pairs[i].score != pairs[j].score {
@@ -546,17 +333,13 @@ func systemForYouSourceLimits() recommendation.CandidateSourceLimits {
 		// deep slice of the user's top taste-profile artists into the pool
 		// (#796 phase 2b). Empty for cold-start users (no profile yet).
 		TasteOverlap: 80,
-		// Household co-play (#1533): a deeper collaborative slice for the
-		// taste surfaces. Empty on single-user servers.
-		UserCoplay: 40,
 	}
 }

-// produceForYou: blend candidate pools from up to forYouSeedCount of
-// the user's top-5 played tracks (rotating daily via pickDailySeeds),
-// then head+tail composition with per-seed head quotas (#1269). The
-// base seed query failing is fatal; a per-seed candidate-load failure
-// is logged and that seed just contributes nothing.
+// produceForYou: today's seed from the user's top-5 played tracks
+// (rotates daily via userIDHash), similarity candidate pool, head+
+// tail composition. The base seed query failing is fatal; a
+// candidate-load failure is logged and yields no For-You.
 func produceForYou(
 	ctx context.Context, q *dbq.Queries, logger *slog.Logger,
 	userID pgtype.UUID, dateStr string, now time.Time,
@@ -565,52 +348,33 @@ func produceForYou(
 	if err != nil {
 		return nil, fmt.Errorf("pick for-you seed candidates: %w", err)
 	}
-	seeds := pickDailySeeds(forYouSeeds, userID, dateStr, forYouSeedCount)
-	if len(seeds) == 0 {
+	forYouSeed := pickForYouSeedForDay(forYouSeeds, userID, dateStr)
+	if !forYouSeed.Valid {
 		return nil, nil
 	}
 	zeroVec := recommendation.SessionVector{Seed: true}
-	// Merge per-seed pools; first-seen wins on dedup, and seedOf
-	// remembers which seed sourced each track for the head quotas.
-	var merged []recommendation.Candidate
-	seedOf := map[pgtype.UUID]int{}
-	for i, seed := range seeds {
-		cands, cerr := recommendation.LoadCandidatesFromSimilarity(
-			ctx, q, userID, seed,
-			1, // recentlyPlayedHours — small to avoid filtering the seed's recent neighbourhood
-			zeroVec,
-			seeds,
-			systemForYouSourceLimits(),
-		)
-		if cerr != nil {
-			logger.Warn("system playlist: for-you candidates load failed for seed; continuing",
-				"user_id", uuidStringPL(userID), "seed", uuidStringPL(seed), "err", cerr)
-			continue
-		}
-		for _, c := range cands {
-			if _, seen := seedOf[c.Track.ID]; seen {
-				continue
-			}
-			seedOf[c.Track.ID] = i
-			merged = append(merged, c)
-		}
-	}
-	if len(merged) == 0 {
+	cands, cerr := recommendation.LoadCandidatesFromSimilarity(
+		ctx, q, userID, forYouSeed,
+		1, // recentlyPlayedHours — small to avoid filtering the seed's recent neighbourhood
+		zeroVec,
+		[]pgtype.UUID{forYouSeed},
+		systemForYouSourceLimits(),
+	)
+	if cerr != nil {
+		logger.Warn("system playlist: for-you candidates load failed; skipping",
+			"user_id", uuidStringPL(userID), "err", cerr)
 		return nil, nil
 	}
-	tracks := pickHeadAndTail(merged, seedOf, len(seeds), userID, dateStr, now, forYouHeadN, forYouTailN)
+	tracks := pickHeadAndTail(cands, userID, dateStr, now, forYouHeadN, forYouTailN)
 	if len(tracks) == 0 {
 		return nil, nil
 	}
 	return []builtPlaylist{{Name: "For You", Variant: "for_you", Tracks: tracks}}, nil
 }

-// produceSeedMixes: up to songsLikeSeedCount "Songs like {artist}"
-// mixes. Seed artists rotate daily-deterministically; the seed query falls back
-// through widening engagement windows (#1255) and every returned row
-// shares the winning tier, stamped onto the built tracks as their
-// pick_kind. The base seed-artist query failing is fatal; per-artist
-// failures are logged + skipped.
+// produceSeedMixes: up to 3 "Songs like {artist}" mixes. Seed
+// artists rotate daily-deterministically. The base seed-artist
+// query failing is fatal; per-artist failures are logged + skipped.
 func produceSeedMixes(
 	ctx context.Context, q *dbq.Queries, logger *slog.Logger,
 	userID pgtype.UUID, dateStr string, now time.Time,
@@ -619,10 +383,6 @@ func produceSeedMixes(
 	if err != nil {
 		return nil, fmt.Errorf("pick seed artists: %w", err)
 	}
-	seedTierKind := ""
-	if len(seedRows) > 0 {
-		seedTierKind = pickKindForSeedTier(seedRows[0].Tier)
-	}
 	seedRowsLocal := make([]seedArtistRow, 0, len(seedRows))
 	for _, r := range seedRows {
 		seedRowsLocal = append(seedRowsLocal, seedArtistRow{
@@ -667,9 +427,6 @@ func produceSeedMixes(
 		if len(tracks) == 0 {
 			continue
 		}
-		for i := range tracks {
-			tracks[i].PickKind = seedTierKind
-		}
 		out = append(out, builtPlaylist{
 			Name:         fmt.Sprintf("Songs like %s", artistRow.Name),
 			Variant:      "songs_like_artist",
@@ -701,7 +458,7 @@ func produceDiscover(
 }

 // BuildSystemPlaylists builds the user's daily system mixes (one For-You +
-// up to songsLikeSeedCount Songs-like-{seed} mixes). Atomic-replace inside one tx;
+// up to 3 Songs-like-{seed} mixes). Atomic-replace inside one tx;
 // concurrency-guarded via system_playlist_runs.in_flight; deterministic
 // within a day via tieBreakHash(track_id, now.UTC().Format("2006-01-02")).
 //
@@ -844,22 +601,20 @@ func pickTopN(cands []recommendation.Candidate, userID pgtype.UUID, dateStr stri
 		capped = capped[:n]
 	}
 	rng := rand.New(rand.NewSource(int64(userIDHash(userID, dateStr))))
-	weights := currentSystemMixWeights()
 	out := make([]rankedCandidate, len(capped))
 	for i, c := range capped {
 		out[i] = rankedCandidate{
 			TrackID: c.Track.ID,
-			Score:   recommendation.Score(c.Inputs, weights, now, rng.Float64),
+			Score:   recommendation.Score(c.Inputs, systemMixWeights, now, rng.Float64),
 		}
 	}
 	return out
 }

-// pickHeadAndTail picks headN taste anchors from the score-sorted pool
-// (under per-seed quotas when seedOf/numSeeds describe a multi-seed
-// blend, #1269) plus tailN freshness picks sampled rank-weighted from
-// positions 2*headN onward. Caps applied before the head/tail split.
-// Used by For-You only.
+// pickHeadAndTail picks headN from the score-sorted head plus tailN from
+// positions 2*headN onward (the tail), with the tail sampled
+// daily-deterministically via tieBreakHash. Caps applied before the
+// head/tail split. Used by For-You only.
 //
 // The "tail" — candidates ranked beyond 2*headN — is still similarity-
 // related (every candidate passed the similarity filter) but isn't among
@@ -869,76 +624,58 @@ func pickTopN(cands []recommendation.Candidate, userID pgtype.UUID, dateStr stri
 // Falls back to standard pickTopN behavior when the candidate pool is too
 // small to support a meaningful head/tail split (capped pool <=
 // headN+tailN, or no candidates at or beyond position 2*headN).
-func pickHeadAndTail(
-	cands []recommendation.Candidate, seedOf map[pgtype.UUID]int, numSeeds int,
-	userID pgtype.UUID, dateStr string, now time.Time, headN, tailN int,
-) []rankedCandidate {
+func pickHeadAndTail(cands []recommendation.Candidate, userID pgtype.UUID, dateStr string, now time.Time, headN, tailN int) []rankedCandidate {
 	sorted := scoreAndSortCandidates(cands, userID, dateStr, now)
 	capped := capCandidatesByAlbumAndArtist(sorted)
 	rng := rand.New(rand.NewSource(int64(userIDHash(userID, dateStr))))
-	weights := currentSystemMixWeights()

 	total := headN + tailN
 	if len(capped) <= total {
 		// Pool too small for a head/tail split — return up to total entries.
-		// All marked taste: top-N-by-score IS the taste mechanism; no
-		// exploration sampling happens on this path.
 		if len(capped) < total {
 			total = len(capped)
 		}
 		out := make([]rankedCandidate, total)
 		for i := 0; i < total; i++ {
 			out[i] = rankedCandidate{
-				TrackID:  capped[i].Track.ID,
-				Score:    recommendation.Score(capped[i].Inputs, weights, now, rng.Float64),
-				PickKind: pickKindTaste,
+				TrackID: capped[i].Track.ID,
+				Score:   recommendation.Score(capped[i].Inputs, systemMixWeights, now, rng.Float64),
 			}
 		}
 		return out
 	}

-	head := pickQuotaHead(capped, seedOf, numSeeds, headN)
-	inHead := make(map[pgtype.UUID]bool, len(head))
-	for _, c := range head {
-		inHead[c.Track.ID] = true
-	}
+	head := capped[:headN]

 	tailStart := 2 * headN
 	if tailStart >= len(capped) {
 		tailStart = headN
 	}

-	// The tail pool keeps its rank order (position drives the sampling
-	// weight); head members are excluded — a quota walk can reach past
-	// tailStart when a seed's candidates rank deep.
-	tailPool := make([]recommendation.Candidate, 0, len(capped)-tailStart)
-	for _, c := range capped[tailStart:] {
-		if inHead[c.Track.ID] {
-			continue
-		}
-		tailPool = append(tailPool, c)
-	}
-	tail := pickWeightedTail(tailPool, dateStr, tailN)
+	// Defensive copy so that sorting the tail pool does not mutate capped.
+	tailPool := append([]recommendation.Candidate{}, capped[tailStart:]...)

-	// Combine: head first (score-sorted under quotas), then the fresh
-	// sample. "First similar, then surprise" reads naturally in
-	// playback. Head entries are the taste picks; tail entries are the
-	// freshness injection (#1249) — the split the metrics page
-	// attributes skips to.
+	// Sort tail pool by tieBreakHash (daily-deterministic), take tailN.
+	// Sample is stable across requests within a day but varies across days.
+	sort.SliceStable(tailPool, func(i, j int) bool {
+		return tieBreakHash(tailPool[i].Track.ID, dateStr) < tieBreakHash(tailPool[j].Track.ID, dateStr)
+	})
+	tail := tailPool
+	if len(tail) > tailN {
+		tail = tail[:tailN]
+	}
+
+	// Combine: head order preserved (score-sorted), tail in tieBreakHash
+	// order. "First similar, then surprise" reads naturally in playback.
 	combined := make([]recommendation.Candidate, 0, len(head)+len(tail))
 	combined = append(combined, head...)
 	combined = append(combined, tail...)

 	out := make([]rankedCandidate, len(combined))
 	for i, c := range combined {
-		kind := pickKindTaste
-		if i >= len(head) {
-			kind = pickKindFresh
-		}
 		out[i] = rankedCandidate{
-			TrackID:  c.Track.ID,
-			Score:    recommendation.Score(c.Inputs, weights, now, rng.Float64),
-			PickKind: kind,
+			TrackID: c.Track.ID,
+			Score:   recommendation.Score(c.Inputs, systemMixWeights, now, rng.Float64),
 		}
 	}
 	return out
@@ -972,15 +709,9 @@ func insertSystemPlaylist(ctx context.Context, qtx *dbq.Queries, userID pgtype.U
 	}

 	for _, t := range tracks {
-		var pickKind *string
-		if t.PickKind != "" {
-			k := t.PickKind
-			pickKind = &k
-		}
 		if _, err := qtx.AppendPlaylistTrack(ctx, dbq.AppendPlaylistTrackParams{
 			PlaylistID: p.ID,
 			TrackID:    t.TrackID,
-			PickKind:   pickKind,
 		}); err != nil {
 			// Track may have been deleted between candidate-load and insert;
 			// skip silently rather than failing the whole build.
@@ -40,17 +40,6 @@ import (
 // Discover so shuffle-on-play has a varied pool within a day.
 const discoveryMixLen = 100

-// Minimum viable mix sizes (issue #1246): below the floor the variant
-// is withheld entirely so Home renders its "listen more to unlock"
-// placeholder — a playlist with a couple of songs reads as a build
-// bug, not a mix. Album-coherent mixes (NewForYou / FirstListens) get
-// a lower floor because one legitimate new album (~5+ tracks) is a
-// useful mix on its own; the scattered mixes need more to feel real.
-const (
-	discoveryMixMinLen      = 15
-	discoveryMixMinLenAlbum = 5
-)
-
 // discoveryMixSpec describes one discovery mix. The unified producer
 // reads the spec and runs a single code path for all variants.
 type discoveryMixSpec struct {
@@ -66,11 +55,6 @@ type discoveryMixSpec struct {
 	// or when day-over-day stability is the intended UX (NewForYou).
 	dailyRotate bool

-	// minLen is the minimum viable mix size: a finished pool below it
-	// is withheld (no playlist row) so the client renders the locked
-	// placeholder instead of a mix that looks built-wrong (#1246).
-	minLen int
-
 	// fetch returns the raw ranked rows. dateStr is supplied for
 	// queries that accept it (passed as the second positional arg
 	// historically); queries that don't accept it ignore the param.
@@ -95,49 +79,25 @@ func produceDiscoveryMix(spec discoveryMixSpec) systemPlaylistProducer {
 		if spec.dailyRotate {
 			pool = rotateForDay(pool, userID, dateStr)
 		}
-		tracks := finishMix(pool, spec.diversify)
-		if len(tracks) < spec.minLen {
-			logger.Info("system playlist: "+spec.variant+" below minimum viable size; withholding",
-				"user_id", uuidStringPL(userID), "pool", len(tracks), "min", spec.minLen)
-			return nil, nil
-		}
-		return emit(spec.name, spec.variant, tracks), nil
+		return emit(spec.name, spec.variant, finishMix(pool, spec.diversify)), nil
 	}
 }

-// rotateForDay rotates the pool left by a daily-deterministic offset
-// so each day's downstream truncate-to-N surfaces a different slice
-// while contiguous-block ordering inside the slice is preserved.
-//
-// Rotation happens WITHIN each contiguous same-pick-kind block
-// (#1267): tiered mixes arrive tier-ordered, and a whole-pool
-// rotation would hoist tier-3 filler above tier-1's exact fits.
-// Untiered pools are a single block, which reduces to the original
-// whole-pool rotation (same seed, same first draw). Empty /
-// single-element pools pass through unchanged.
+// rotateForDay rotates pool left by a daily-deterministic offset so
+// each day's downstream truncate-to-N surfaces a different slice of
+// the pool while contiguous-block ordering inside the slice is
+// preserved. Empty / single-element pools pass through unchanged.
 func rotateForDay(pool []discoverTrack, userID pgtype.UUID, dateStr string) []discoverTrack {
 	n := len(pool)
 	if n <= 1 {
 		return pool
 	}
 	rng := rand.New(rand.NewSource(int64(userIDHash(userID, dateStr))))
-	out := make([]discoverTrack, 0, n)
-	for start := 0; start < n; {
-		end := start + 1
-		for end < n && pool[end].PickKind == pool[start].PickKind {
-			end++
-		}
-		block := pool[start:end]
-		if len(block) > 1 {
-			offset := rng.Intn(len(block))
-			out = append(out, block[offset:]...)
-			out = append(out, block[:offset]...)
-		} else {
-			out = append(out, block...)
-		}
-		start = end
-	}
-	return out
+	offset := rng.Intn(n)
+	rotated := make([]discoverTrack, 0, n)
+	rotated = append(rotated, pool[offset:]...)
+	rotated = append(rotated, pool[:offset]...)
+	return rotated
 }

 // discoveryMixSpecs is the concrete spec list used by the registry in
@@ -149,7 +109,6 @@ var discoveryMixSpecs = []discoveryMixSpec{
 	{
 		name: "Deep Cuts", variant: "deep_cuts",
 		diversify: true, dailyRotate: false, // SQL day-keys via md5(id||$2)
-		minLen: discoveryMixMinLen,
 		fetch: func(ctx context.Context, q *dbq.Queries, uid pgtype.UUID, ds string) ([]discoverTrack, error) {
 			rows, err := q.ListDeepCutsTracks(ctx, dbq.ListDeepCutsTracksParams{
 				UserID: uid, Column2: ds,
@@ -167,7 +126,6 @@ var discoveryMixSpecs = []discoveryMixSpec{
 	{
 		name: "Rediscover", variant: "rediscover",
 		diversify: true, dailyRotate: true, // SQL has no date arg
-		minLen: discoveryMixMinLen,
 		fetch: func(ctx context.Context, q *dbq.Queries, uid pgtype.UUID, _ string) ([]discoverTrack, error) {
 			rows, err := q.ListRediscoverTracks(ctx, uid)
 			if err != nil {
@@ -183,7 +141,6 @@ var discoveryMixSpecs = []discoveryMixSpec{
 	{
 		name: "New for you", variant: "new_for_you",
 		diversify: true, dailyRotate: true, // operator wants daily rotation on all deterministic mixes
-		minLen: discoveryMixMinLenAlbum,
 		fetch: func(ctx context.Context, q *dbq.Queries, uid pgtype.UUID, _ string) ([]discoverTrack, error) {
 			rows, err := q.ListNewForYouTracks(ctx, uid)
 			if err != nil {
@@ -191,10 +148,7 @@ var discoveryMixSpecs = []discoveryMixSpec{
 			}
 			out := make([]discoverTrack, len(rows))
 			for i, r := range rows {
-				out[i] = discoverTrack{
-					ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID,
-					PickKind: pickKindForMixTier(r.Tier),
-				}
+				out[i] = discoverTrack{ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID}
 			}
 			return out, nil
 		},
@@ -202,7 +156,6 @@ var discoveryMixSpecs = []discoveryMixSpec{
 	{
 		name: "On this day", variant: "on_this_day",
 		diversify: true, dailyRotate: false, // SQL day-keys via md5(id||$2)
-		minLen: discoveryMixMinLen,
 		fetch: func(ctx context.Context, q *dbq.Queries, uid pgtype.UUID, ds string) ([]discoverTrack, error) {
 			rows, err := q.ListOnThisDayTracks(ctx, dbq.ListOnThisDayTracksParams{
 				UserID: uid, Column2: ds,
@@ -220,7 +173,6 @@ var discoveryMixSpecs = []discoveryMixSpec{
 	{
 		name: "First listens", variant: "first_listens",
 		diversify: true, dailyRotate: true, // SQL has no date arg; daily rotate + diversity top-up
-		minLen: discoveryMixMinLenAlbum,
 		fetch: func(ctx context.Context, q *dbq.Queries, uid pgtype.UUID, _ string) ([]discoverTrack, error) {
 			rows, err := q.ListFirstListensTracks(ctx, uid)
 			if err != nil {
@@ -228,10 +180,7 @@ var discoveryMixSpecs = []discoveryMixSpec{
 			}
 			out := make([]discoverTrack, len(rows))
 			for i, r := range rows {
-				out[i] = discoverTrack{
-					ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID,
-					PickKind: pickKindForMixTier(r.Tier),
-				}
+				out[i] = discoverTrack{ID: r.ID, AlbumID: r.AlbumID, ArtistID: r.ArtistID}
 			}
 			return out, nil
 		},
@@ -268,7 +217,7 @@ func finishMix(rows []discoverTrack, diversify bool) []rankedCandidate {
 	}
 	tracks := make([]rankedCandidate, len(pool))
 	for i, t := range pool {
-		tracks[i] = rankedCandidate{TrackID: t.ID, PickKind: t.PickKind}
+		tracks[i] = rankedCandidate{TrackID: t.ID}
 	}
 	return tracks
 }
@@ -1,342 +0,0 @@
-package playlists_test
-
-import (
-	"context"
-	"fmt"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq"
-)
-
-// seedTrackForArtist creates another track under an existing artist +
-// album pair. seedTrack's mbid-less upsert never dedupes artists, and
-// Deep Cuts' affinity rule needs several tracks sharing one artist_id.
-func seedTrackForArtist(t *testing.T, pool *pgxpool.Pool, title string, albumID, artistID pgtype.UUID) dbq.Track {
-	t.Helper()
-	track, err := dbq.New(pool).UpsertTrack(context.Background(), dbq.UpsertTrackParams{
-		Title: title, AlbumID: albumID, ArtistID: artistID,
-		DurationMs: 1000,
-		FilePath:   filepath.Join(t.TempDir(), fmt.Sprintf("%s.mp3", title)),
-		FileSize:   100, FileFormat: "mp3",
-	})
-	if err != nil {
-		t.Fatalf("seed track for artist: %v", err)
-	}
-	return track
-}
-
-// seedSourcedPlayEvent is seedPlayEvent plus a source tag — needed by
-// the Rediscover cooldown, which keys off rediscover-sourced skips.
-func seedSourcedPlayEvent(t *testing.T, pool *pgxpool.Pool, userID, trackID pgtype.UUID, startedAt time.Time, wasSkipped bool, source string) {
-	t.Helper()
-	_, err := pool.Exec(context.Background(), `
-		WITH s AS (
-			INSERT INTO play_sessions (user_id, started_at, last_event_at)
-			VALUES ($1, $3, $3)
-			RETURNING id
-		)
-		INSERT INTO play_events (user_id, track_id, session_id, started_at, was_skipped, source)
-		SELECT $1, $2, s.id, $3, $4, $5 FROM s
-	`, userID, trackID, startedAt, wasSkipped, source)
-	if err != nil {
-		t.Fatalf("seed sourced play_event: %v", err)
-	}
-}
-
-// idSet collapses candidate rows into a lookup by track id.
-func idSet[T any](rows []T, id func(T) pgtype.UUID) map[pgtype.UUID]bool {
-	out := make(map[pgtype.UUID]bool, len(rows))
-	for _, r := range rows {
-		out[id(r)] = true
-	}
-	return out
-}
-
-// seedPlayWithDuration inserts a completed play with an explicit
-// duration_played_ms — the "attempted >= 30s" queries key off it.
-func seedPlayWithDuration(t *testing.T, pool *pgxpool.Pool, userID, trackID pgtype.UUID, startedAt time.Time, durationMs int32) {
-	t.Helper()
-	_, err := pool.Exec(context.Background(), `
-		WITH s AS (
-			INSERT INTO play_sessions (user_id, started_at, last_event_at)
-			VALUES ($1, $3, $3)
-			RETURNING id
-		)
-		INSERT INTO play_events (user_id, track_id, session_id, started_at, duration_played_ms)
-		SELECT $1, $2, s.id, $3, $4 FROM s
-	`, userID, trackID, startedAt, durationMs)
-	if err != nil {
-		t.Fatalf("seed play with duration: %v", err)
-	}
-}
-
-// seedAlbumForArtist creates a fresh album under an existing artist —
-// the tiered album queries need several albums sharing one artist_id.
-func seedAlbumForArtist(t *testing.T, pool *pgxpool.Pool, title string, artistID pgtype.UUID) pgtype.UUID {
-	t.Helper()
-	al, err := dbq.New(pool).UpsertAlbum(context.Background(), dbq.UpsertAlbumParams{
-		Title: title, SortTitle: title, ArtistID: artistID,
-	})
-	if err != nil {
-		t.Fatalf("seed album for artist: %v", err)
-	}
-	return al.ID
-}
-
-func backdateAlbum(t *testing.T, pool *pgxpool.Pool, albumID pgtype.UUID, to time.Time) {
-	t.Helper()
-	if _, err := pool.Exec(context.Background(),
-		`UPDATE albums SET created_at = $2 WHERE id = $1`, albumID, to); err != nil {
-		t.Fatalf("backdate album: %v", err)
-	}
-}
-
-func likeArtist(t *testing.T, pool *pgxpool.Pool, userID, artistID pgtype.UUID) {
-	t.Helper()
-	if _, err := pool.Exec(context.Background(),
-		`INSERT INTO general_likes_artists (user_id, artist_id) VALUES ($1, $2)`,
-		userID, artistID); err != nil {
-		t.Fatalf("like artist: %v", err)
-	}
-}
-
-func TestListDeepCutsTracks_SkippedTracksExcluded(t *testing.T) {
-	// #1257: eligibility used to count only unskipped plays, so a track
-	// skipped repeatedly (and never finished) read as "barely heard".
-	pool := newPool(t)
-	q := dbq.New(pool)
-	u := seedUser(t, pool, "dc1")
-	now := time.Now().UTC()
-
-	// Affinity artist: 5 non-skip plays on the heavy track.
-	heavy := seedTrack(t, pool, "dc1-heavy", "dc1-artist")
-	for p := 0; p < 5; p++ {
-		seedPlayEvent(t, pool, u.ID, heavy.ID, now.Add(-time.Duration(p+1)*time.Hour), false)
-	}
-	// Actively rejected: two skips, zero completed plays.
-	rejected := seedTrackForArtist(t, pool, "dc1-rejected", heavy.AlbumID, heavy.ArtistID)
-	seedPlayEvent(t, pool, u.ID, rejected.ID, now.Add(-2*time.Hour), true)
-	seedPlayEvent(t, pool, u.ID, rejected.ID, now.Add(-3*time.Hour), true)
-	// Genuinely unexplored.
-	unheard := seedTrackForArtist(t, pool, "dc1-unheard", heavy.AlbumID, heavy.ArtistID)
-	// One accidental skip stays below the threshold.
-	oneSkip := seedTrackForArtist(t, pool, "dc1-oneskip", heavy.AlbumID, heavy.ArtistID)
-	seedPlayEvent(t, pool, u.ID, oneSkip.ID, now.Add(-4*time.Hour), true)
-
-	rows, err := q.ListDeepCutsTracks(context.Background(), dbq.ListDeepCutsTracksParams{
-		UserID: u.ID, Column2: "2026-07-03",
-	})
-	if err != nil {
-		t.Fatalf("ListDeepCutsTracks: %v", err)
-	}
-	got := idSet(rows, func(r dbq.ListDeepCutsTracksRow) pgtype.UUID { return r.ID })
-	if got[rejected.ID] {
-		t.Error("twice-skipped track qualified as a deep cut; skips must disqualify")
-	}
-	if !got[unheard.ID] {
-		t.Error("unexplored track missing from deep cuts")
-	}
-	if !got[oneSkip.ID] {
-		t.Error("single accidental skip must not banish a track")
-	}
-	if got[heavy.ID] {
-		t.Error("heavily-played track must not be a deep cut")
-	}
-}
-
-func TestListOnThisDayTracks_WrapsYearBoundary(t *testing.T) {
-	// #1256: plain ABS on day-of-year made Dec 28 vs Jan 3 read as 359
-	// days apart. The build date parameter anchors "today" so the wrap
-	// is testable at any run date.
-	pool := newPool(t)
-	q := dbq.New(pool)
-	u := seedUser(t, pool, "otd1")
-
-	// Played Dec 28, 2025 — 6 circular days from the Jan 3 build date.
-	winter := seedTrack(t, pool, "otd1-winter", "otd1-artist")
-	seedPlayEvent(t, pool, u.ID, winter.ID,
-		time.Date(2025, 12, 28, 12, 0, 0, 0, time.UTC), false)
-	// Played mid-March — far outside the ±10-day window.
-	spring := seedTrack(t, pool, "otd1-spring", "otd1-artist")
-	seedPlayEvent(t, pool, u.ID, spring.ID,
-		time.Date(2025, 3, 15, 12, 0, 0, 0, time.UTC), false)
-
-	rows, err := q.ListOnThisDayTracks(context.Background(), dbq.ListOnThisDayTracksParams{
-		UserID: u.ID, Column2: "2026-01-03",
-	})
-	if err != nil {
-		t.Fatalf("ListOnThisDayTracks: %v", err)
-	}
-	got := idSet(rows, func(r dbq.ListOnThisDayTracksRow) pgtype.UUID { return r.ID })
-	if !got[winter.ID] {
-		t.Error("play 6 calendar days across the year boundary must qualify (circular DOY)")
-	}
-	if got[spring.ID] {
-		t.Error("play ~70 days away must not qualify")
-	}
-}
-
-func TestListNewForYouTracks_TiersAndConsumption(t *testing.T) {
-	// #1267: tiered eligibility with consume-on-play. Tier 1 = fresh
-	// affinity albums; tier 2 = affinity albums from the wider 90-day
-	// window; tier 3 = fresh additions without affinity; any attempted
-	// (>=30s) track consumes the album out of the mix entirely.
-	pool := newPool(t)
-	q := dbq.New(pool)
-	u := seedUser(t, pool, "nfy1")
-	now := time.Now().UTC()
-
-	// Affinity artist via a like; anchor track establishes the artist.
-	anchor := seedTrack(t, pool, "nfy1-anchor", "nfy1-artistX")
-	likeArtist(t, pool, u.ID, anchor.ArtistID)
-	backdateAlbum(t, pool, anchor.AlbumID, now.Add(-200*24*time.Hour)) // out of every window
-
-	// Fresh affinity album → tier 1.
-	freshAlbum := seedAlbumForArtist(t, pool, "nfy1-fresh", anchor.ArtistID)
-	freshTrack := seedTrackForArtist(t, pool, "nfy1-fresh-1", freshAlbum, anchor.ArtistID)
-	// Affinity album added 60 days ago → tier 2.
-	olderAlbum := seedAlbumForArtist(t, pool, "nfy1-older", anchor.ArtistID)
-	olderTrack := seedTrackForArtist(t, pool, "nfy1-older-1", olderAlbum, anchor.ArtistID)
-	backdateAlbum(t, pool, olderAlbum, now.Add(-60*24*time.Hour))
-	// Fresh album by an unrelated artist → tier 3.
-	otherTrack := seedTrack(t, pool, "nfy1-other-1", "nfy1-artistY")
-	// Fresh affinity album with one attempted track → consumed, absent.
-	consumedAlbum := seedAlbumForArtist(t, pool, "nfy1-consumed", anchor.ArtistID)
-	consumedTrack := seedTrackForArtist(t, pool, "nfy1-consumed-1", consumedAlbum, anchor.ArtistID)
-	seedPlayWithDuration(t, pool, u.ID, consumedTrack.ID, now.Add(-time.Hour), 35_000)
-	// Affinity album added 120 days ago → outside every window, absent.
-	ancientAlbum := seedAlbumForArtist(t, pool, "nfy1-ancient", anchor.ArtistID)
-	ancientTrack := seedTrackForArtist(t, pool, "nfy1-ancient-1", ancientAlbum, anchor.ArtistID)
-	backdateAlbum(t, pool, ancientAlbum, now.Add(-120*24*time.Hour))
-
-	rows, err := q.ListNewForYouTracks(context.Background(), u.ID)
-	if err != nil {
-		t.Fatalf("ListNewForYouTracks: %v", err)
-	}
-	tiers := map[pgtype.UUID]int32{}
-	for _, r := range rows {
-		tiers[r.ID] = r.Tier
-	}
-	if got := tiers[freshTrack.ID]; got != 1 {
-		t.Errorf("fresh affinity album tier = %d, want 1", got)
-	}
-	if got := tiers[olderTrack.ID]; got != 2 {
-		t.Errorf("60-day affinity album tier = %d, want 2", got)
-	}
-	if got := tiers[otherTrack.ID]; got != 3 {
-		t.Errorf("fresh non-affinity album tier = %d, want 3", got)
-	}
-	if _, in := tiers[consumedTrack.ID]; in {
-		t.Error("album with an attempted track must be consumed out of the mix")
-	}
-	if _, in := tiers[ancientTrack.ID]; in {
-		t.Error("album added 120 days ago must be outside every window")
-	}
-}
-
-func TestListFirstListensTracks_AttemptThreshold(t *testing.T) {
-	// #1268: "attempted" is track-level at >=30s. A 2-second brush no
-	// longer disqualifies an album; barely-attempted albums step back
-	// to tier 2 with the attempted tracks themselves excluded.
-	pool := newPool(t)
-	q := dbq.New(pool)
-	u := seedUser(t, pool, "fl1")
-	now := time.Now().UTC()
-
-	// Never touched → tier 1.
-	untouched := seedTrack(t, pool, "fl1-untouched-1", "fl1-artistA")
-	// One 2-second accidental brush → still tier 1 (the headline bug).
-	brushed := seedTrack(t, pool, "fl1-brushed-1", "fl1-artistB")
-	seedPlayWithDuration(t, pool, u.ID, brushed.ID, now.Add(-time.Hour), 2_000)
-	// 4-track album with one attempted (25%) → tier 2, attempted track
-	// excluded, siblings present.
-	barely1 := seedTrack(t, pool, "fl1-barely-1", "fl1-artistC")
-	barely2 := seedTrackForArtist(t, pool, "fl1-barely-2", barely1.AlbumID, barely1.ArtistID)
-	barely3 := seedTrackForArtist(t, pool, "fl1-barely-3", barely1.AlbumID, barely1.ArtistID)
-	barely4 := seedTrackForArtist(t, pool, "fl1-barely-4", barely1.AlbumID, barely1.ArtistID)
-	seedPlayWithDuration(t, pool, u.ID, barely1.ID, now.Add(-time.Hour), 40_000)
-	// 2-track album with one attempted (50%) → past the brush
-	// threshold, absent entirely.
-	explored1 := seedTrack(t, pool, "fl1-explored-1", "fl1-artistD")
-	explored2 := seedTrackForArtist(t, pool, "fl1-explored-2", explored1.AlbumID, explored1.ArtistID)
-	seedPlayWithDuration(t, pool, u.ID, explored1.ID, now.Add(-time.Hour), 40_000)
-
-	rows, err := q.ListFirstListensTracks(context.Background(), u.ID)
-	if err != nil {
-		t.Fatalf("ListFirstListensTracks: %v", err)
-	}
-	tiers := map[pgtype.UUID]int32{}
-	for _, r := range rows {
-		tiers[r.ID] = r.Tier
-	}
-	if got := tiers[untouched.ID]; got != 1 {
-		t.Errorf("untouched album tier = %d, want 1", got)
-	}
-	if got := tiers[brushed.ID]; got != 1 {
-		t.Errorf("2-second brush must not disqualify: tier = %d, want 1", got)
-	}
-	if _, in := tiers[barely1.ID]; in {
-		t.Error("the attempted track itself is not a first listen")
-	}
-	for _, tr := range []dbq.Track{barely2, barely3, barely4} {
-		if got := tiers[tr.ID]; got != 2 {
-			t.Errorf("sibling of attempted track tier = %d, want 2", got)
-		}
-	}
-	if _, in := tiers[explored1.ID]; in {
-		t.Error("half-attempted album must be excluded (attempted track)")
-	}
-	if _, in := tiers[explored2.ID]; in {
-		t.Error("half-attempted album must be excluded (sibling)")
-	}
-}
-
-func TestListRediscoverTracks_SkippedResurfacingCoolsDown(t *testing.T) {
-	// #1258: a skip on a rediscover-sourced play is a declined
-	// invitation — the track sits out ~90 days instead of re-qualifying
-	// the next day. Skips from other surfaces don't cool down, and the
-	// cooldown expires.
-	pool := newPool(t)
-	q := dbq.New(pool)
-	u := seedUser(t, pool, "rd1")
-	now := time.Now().UTC()
-
-	eligible := func(name string, playsAge time.Duration) dbq.Track {
-		tk := seedTrack(t, pool, name, name+"-artist")
-		for p := 0; p < 3; p++ {
-			seedPlayEvent(t, pool, u.ID, tk.ID,
-				now.Add(-playsAge-time.Duration(p)*time.Hour), false)
-		}
-		return tk
-	}
-
-	// Declined 5 days ago from Rediscover itself → cooling down.
-	declined := eligible("rd1-declined", 60*24*time.Hour)
-	seedSourcedPlayEvent(t, pool, u.ID, declined.ID, now.Add(-5*24*time.Hour), true, "rediscover")
-	// Skipped 5 days ago, but from a different surface → still eligible.
-	otherSkip := eligible("rd1-otherskip", 60*24*time.Hour)
-	seedSourcedPlayEvent(t, pool, u.ID, otherSkip.ID, now.Add(-5*24*time.Hour), true, "radio")
-	// Declined 100 days ago → cooldown expired, eligible again.
-	lapsed := eligible("rd1-lapsed", 120*24*time.Hour)
-	seedSourcedPlayEvent(t, pool, u.ID, lapsed.ID, now.Add(-100*24*time.Hour), true, "rediscover")
-
-	rows, err := q.ListRediscoverTracks(context.Background(), u.ID)
-	if err != nil {
-		t.Fatalf("ListRediscoverTracks: %v", err)
-	}
-	got := idSet(rows, func(r dbq.ListRediscoverTracksRow) pgtype.UUID { return r.ID })
-	if got[declined.ID] {
-		t.Error("track declined from rediscover 5 days ago must be cooling down")
-	}
-	if !got[otherSkip.ID] {
-		t.Error("skip from a non-rediscover surface must not cool the track down")
-	}
-	if !got[lapsed.ID] {
-		t.Error("cooldown must expire after ~90 days")
-	}
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`ALTER TABLE recommendation_weight_profiles DROP COLUMN IF EXISTS context_time_weight;`
				`@@ -1 +0,0 @@`
				`ALTER TABLE play_events DROP COLUMN IF EXISTS device_class;`