Fix

0.65 was still too dark per feedback. The original concern that made
us drop accentL from 0.74 (accent surfaces stacking too bright over
the darkened spotlight/hero cards) is already fixed architecturally by
the earlier color-mix() conversion, which makes bg-accent-tint/
bg-accent-btn a solid precomputed value that no longer stacks with
whatever's underneath. So there's no reason to keep accentL dimmed for
that reason anymore.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

.gitea/workflows/ci-cd.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   backend-tests:
-    name: BackEnd
+    name: Backend tests (.NET)
     runs-on: ubuntu-latest
     timeout-minutes: 20
     defaults:
@@ -35,7 +35,7 @@ jobs:
         run: dotnet test Musify.slnx --no-build -c Release
 
   web-player-checks:
-    name: WebPlayer
+    name: web-player (check + lint)
     runs-on: ubuntu-latest
     timeout-minutes: 15
     defaults:
@@ -52,10 +52,10 @@ jobs:
 
       - run: npm ci
 
-      - name: Type-check
+      - name: Type-check (svelte-check)
         run: npm run check
 
-      - name: Lint
+      - name: Lint (prettier + eslint + design tokens)
         run: npm run lint
 
   # Runs on the production host itself, through the existing self-hosted
@@ -69,7 +69,7 @@ jobs:
   # deploy reuses it instead of a fresh checkout, since .env.prod is
   # untracked and only lives there.
   deploy:
-    name: Deploy
+    name: Deploy to production
     needs: [backend-tests, web-player-checks]
     if: github.ref == 'refs/heads/master' && github.event_name == 'push'
     runs-on: [production]
@@ -81,47 +81,36 @@ jobs:
       - name: Pull latest master
         run: |
           set -euo pipefail
-          git config --global --add safe.directory "$DEPLOY_PATH"
           cd "$DEPLOY_PATH"
           git fetch origin master
           git reset --hard origin/master
 
-      - name: Generate stream-ticket keys
+      - name: Migrate database, generate keys
         run: |
           set -euo pipefail
           cd "$DEPLOY_PATH"
-          $COMPOSE run --rm --no-deps keys-init
+          $COMPOSE up -d wait-for-postgres keys-init migrate
 
-      # The migrations are baked into the migrator image, so it is rebuilt on
+      # zitadel-init/seaweedfs-init verify themselves through the PUBLIC
-      # every deploy (plain `up` would reuse the stale image and re-apply the
+      # auth./s3. URLs (see deploy/compose.yml), so they only succeed once a
-      # old migrations). `run --rm` starts wait-for-postgres, blocks until the
+      # real domain is registered and nginx is serving it (see the TODO
-      # migration finishes and propagates its exit code, so a failed migration
+      # below and deploy/README.md). Tolerated for now so a red step here
-      # aborts the deploy before the new API is started against an old schema.
+      # doesn't block the rest of the deploy; drop the `|| true` once that's
-      - name: Migrate database
+      # in place, so a real regression here fails the job again.
+      - name: Create OIDC app + S3 bucket (pending public domain)
         run: |
-          set -euo pipefail
           cd "$DEPLOY_PATH"
-          $COMPOSE build migrate
+          $COMPOSE up -d seaweedfs-init zitadel-init || echo "expected to fail until the production domain + nginx edge exist"
-          $COMPOSE run --rm migrate
-
-      # Both jobs verify themselves through the public auth./s3. URLs, served
-      # by the shared edge nginx (Infrastructure's edge/), and are idempotent.
-      - name: Create OIDC app and S3 bucket
-        run: |
-          set -euo pipefail
-          cd "$DEPLOY_PATH"
-          $COMPOSE up -d seaweedfs-init zitadel-init
-          for job in musify-seaweedfs-init musify-zitadel-init; do
-            code=$(docker wait "$job")
-            if [ "$code" != "0" ]; then
-              docker logs "$job"
-              echo "$job exited with $code"
-              exit 1
-            fi
-          done
 
       - name: Build and start apps
         run: |
           set -euo pipefail
           cd "$DEPLOY_PATH"
           $COMPOSE --profile apps up -d --build api worker gateway web-player
+
+      # TODO once a domain is registered and pointed at this server: merge
+      # Musify's vhosts (deploy/nginx/templates) into the existing
+      # gitea-nginx config instead of running the `nginx` service from
+      # compose.prod.yml, since gitea-nginx already owns host ports 80/443
+      # for gitea.ikerdemo.cat. See "Continuous deployment" in
+      # deploy/README.md.

.gitignore

@@ -28,4 +28,5 @@ Thumbs.db
 # Deploy secrets and runtime state
 deploy/keys/
 deploy/secrets/
+deploy/nginx/certs/
 deploy/zitadel/.output/

backend/Core/Musify.Application/Albums/GetAlbumTracks.cs

@@ -36,7 +36,7 @@ namespace Musify.Application.Albums
 
             var pagedEntities = await tracksQuery
                 .OrderBy(albumTrack => albumTrack.TrackNumber)
-                .Select(albumTrack => new { albumTrack.Track, ListensCount = albumTrack.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(albumTrack => new { albumTrack.Track, ListensCount = albumTrack.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/Albums/GetRecentlyListenedAlbums.cs

@@ -16,7 +16,7 @@ namespace Musify.Application.Albums
         {
             var listenedTrackIds = database.ListeningHistories
                 .AsNoTracking()
-                .Where(history => history.UserId == request.UserId && history.IsCounted);
+                .Where(history => history.UserId == request.UserId);
 
             var ranked = await database.AlbumHasTracks
                 .AsNoTracking()

backend/Core/Musify.Application/Genres/GetAvailableGenres.cs

@@ -1,26 +0,0 @@
-using Mediator;
-using Musify.Domain.ValueObjects;
-
-namespace Musify.Application.Genres
-{
-    public record GetAvailableGenresQuery : IQuery<IReadOnlyList<AvailableGenreResponse>>;
-
-    public record AvailableGenreResponse(Genre Genre, IReadOnlyList<Genre> IncompatibleWith);
-
-    public class GetAvailableGenresQueryHandler
-        : IQueryHandler<GetAvailableGenresQuery, IReadOnlyList<AvailableGenreResponse>>
-    {
-        public ValueTask<IReadOnlyList<AvailableGenreResponse>> Handle(GetAvailableGenresQuery request, CancellationToken cancellationToken)
-        {
-            var all = Enum.GetValues<Genre>();
-
-            IReadOnlyList<AvailableGenreResponse> result = all
-                .Select(genre => new AvailableGenreResponse(
-                    genre,
-                    all.Where(other => !GenreCompatibility.AreCompatible(genre, other)).ToList()))
-                .ToList();
-
-            return ValueTask.FromResult(result);
-        }
-    }
-}

backend/Core/Musify.Application/Genres/GetGenres.cs

@@ -1,31 +0,0 @@
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts;
-using Musify.Domain.ValueObjects;
-
-namespace Musify.Application.Genres
-{
-    public record GetGenresQuery : IQuery<IReadOnlyList<GenreResponse>>;
-
-    public record GenreResponse(Genre Genre, int TrackCount);
-
-    public class GetGenresQueryHandler(IDatabase database)
-        : IQueryHandler<GetGenresQuery, IReadOnlyList<GenreResponse>>
-    {
-        public async ValueTask<IReadOnlyList<GenreResponse>> Handle(GetGenresQuery request, CancellationToken cancellationToken)
-        {
-            var rows = await database.TrackTags
-                .AsNoTracking()
-                .Where(tag => database.UserHasTracks.Any(userTrack => userTrack.TrackId == tag.TrackId))
-                .GroupBy(tag => tag.Tag)
-                .Select(group => new { Genre = group.Key, TrackCount = group.Select(tag => tag.TrackId).Distinct().Count() })
-                .ToListAsync(cancellationToken);
-
-            return rows
-                .OrderByDescending(row => row.TrackCount)
-                .ThenBy(row => row.Genre)
-                .Select(row => new GenreResponse(row.Genre, row.TrackCount))
-                .ToList();
-        }
-    }
-}

backend/Core/Musify.Application/Likes/GetLikedTracks.cs

@@ -30,7 +30,7 @@ namespace Musify.Application.Likes
 
             var pagedEntities = await likesQuery
                 .OrderByDescending(like => like.CreatedAt)
-                .Select(like => new { like.Track, ListensCount = like.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(like => new { like.Track, ListensCount = like.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/Mixes/GenerateMixesForUser.cs

@@ -38,7 +38,7 @@ namespace Musify.Application.Mixes
 
             var historyTrackIds = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(history => history.UserId == userId && history.IsCounted)
+                .Where(history => history.UserId == userId)
                 .Select(history => history.TrackId)
                 .Distinct()
                 .ToListAsync(cancellationToken);

backend/Core/Musify.Application/Mixes/MixItemMapper.cs

@@ -19,7 +19,7 @@ namespace Musify.Application.Mixes
                 .AsNoTracking()
                 .Include(track => track.Owner)
                 .Where(track => trackIds.Contains(track.Id))
-                .Select(track => new { Track = track, ListensCount = track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(track => new { Track = track, ListensCount = track.ListeningHistories.Count })
                 .ToDictionaryAsync(x => x.Track.Id, cancellationToken);
 
             return orderedItems

backend/Core/Musify.Application/PlayLists/AddAlbumToPlayList.cs

@@ -1,86 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts;
-using Musify.Application.PlayLists.Responses;
-using Musify.Domain.Entities;
-
-namespace Musify.Application.PlayLists
-{
-    public record AddAlbumToPlayListCommand(long UserId, Guid PlayListId, Guid AlbumId)
-        : ICommand<ErrorOr<AddAlbumToPlayListResponse>>;
-
-    public class AddAlbumToPlayListCommandHandler(
-        IDatabase database,
-        ILogger<AddAlbumToPlayListCommandHandler> logger)
-        : ICommandHandler<AddAlbumToPlayListCommand, ErrorOr<AddAlbumToPlayListResponse>>
-    {
-        public async ValueTask<ErrorOr<AddAlbumToPlayListResponse>> Handle(AddAlbumToPlayListCommand request, CancellationToken cancellationToken)
-        {
-            var playList = await database.PlayLists
-                .SingleOrDefaultAsync(pl => pl.Id == request.PlayListId, cancellationToken);
-            if (playList == null)
-            {
-                logger.LogInformation("Playlist {PlayListId} not found", request.PlayListId);
-                return Error.NotFound();
-            }
-
-            if (playList.UserId != request.UserId)
-            {
-                logger.LogWarning("User {UserId} is not the owner of playlist {PlayListId}", request.UserId, request.PlayListId);
-                return Error.Unauthorized();
-            }
-
-            var albumExists = await database.Albums
-                .AsNoTracking()
-                .AnyAsync(album => album.Id == request.AlbumId, cancellationToken);
-            if (!albumExists)
-            {
-                logger.LogInformation("Album {AlbumId} not found", request.AlbumId);
-                return Error.NotFound(description: $"Album {request.AlbumId} not found");
-            }
-
-            var albumTrackIds = await database.AlbumHasTracks
-                .AsNoTracking()
-                .Where(albumTrack => albumTrack.AlbumId == request.AlbumId)
-                .OrderBy(albumTrack => albumTrack.TrackNumber)
-                .Select(albumTrack => albumTrack.TrackId)
-                .ToListAsync(cancellationToken);
-
-            var playListTracksQuery = database.PlayListHasTracks
-                .Where(plt => plt.PlayListId == request.PlayListId);
-
-            var existingTrackIds = (await playListTracksQuery
-                .Select(plt => plt.TrackId)
-                .ToListAsync(cancellationToken)).ToHashSet();
-
-            var newTrackIds = albumTrackIds
-                .Where(trackId => !existingTrackIds.Contains(trackId))
-                .ToList();
-
-            if (newTrackIds.Count == 0)
-                return new AddAlbumToPlayListResponse(0);
-
-            var nextPosition = existingTrackIds.Count > 0
-                ? await playListTracksQuery.MaxAsync(plt => plt.Position, cancellationToken) + 1
-                : 0;
-
-            await database.PlayListHasTracks.AddRangeAsync(
-                newTrackIds.Select((trackId, index) => new PlayListHasTrack
-                {
-                    PlayListId = request.PlayListId,
-                    TrackId = trackId,
-                    Position = nextPosition + index
-                }),
-                cancellationToken);
-
-            await database.SaveChangesAsync(cancellationToken);
-
-            logger.LogInformation("Added {Count} tracks from album {AlbumId} to playlist {PlayListId}",
-                newTrackIds.Count, request.AlbumId, request.PlayListId);
-
-            return new AddAlbumToPlayListResponse(newTrackIds.Count);
-        }
-    }
-}

backend/Core/Musify.Application/PlayLists/GetPlayListById.cs

@@ -21,8 +21,6 @@ namespace Musify.Application.PlayLists
                 .Select(p => new
                 {
                     PlayList = p,
-                    TrackCount = p.PlayListTracks.Count,
-                    DurationSeconds = p.PlayListTracks.Sum(plt => (double?)plt.Track.DurationSeconds) ?? 0,
                     CoverTrackIds = p.PlayListTracks
                         .OrderBy(plt => plt.Position)
                         .Take(PlayListApplicationResponse.CoverTrackCount)
@@ -38,7 +36,7 @@ namespace Musify.Application.PlayLists
                 && entry.PlayList.UserId != request.RequestingUserId)
                 return Error.NotFound();
 
-            return PlayListApplicationResponse.FromEntity(entry.PlayList, entry.TrackCount, entry.DurationSeconds, entry.CoverTrackIds);
+            return PlayListApplicationResponse.FromEntity(entry.PlayList, entry.CoverTrackIds);
         }
     }
 }

backend/Core/Musify.Application/PlayLists/GetPlayListTracks.cs

@@ -36,7 +36,7 @@ namespace Musify.Application.PlayLists
 
             var pagedEntities = await tracksQuery
                 .OrderBy(plt => plt.Position)
-                .Select(plt => new { plt.Track, ListensCount = plt.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(plt => new { plt.Track, ListensCount = plt.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/PlayLists/GetPlayLists.cs

@@ -25,8 +25,6 @@ namespace Musify.Application.PlayLists
                 .Select(p => new
                 {
                     PlayList = p,
-                    TrackCount = p.PlayListTracks.Count,
-                    DurationSeconds = p.PlayListTracks.Sum(plt => (double?)plt.Track.DurationSeconds) ?? 0,
                     CoverTrackIds = p.PlayListTracks
                         .OrderBy(plt => plt.Position)
                         .Take(PlayListApplicationResponse.CoverTrackCount)
@@ -36,7 +34,7 @@ namespace Musify.Application.PlayLists
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedPlayLists = new StaticPagedList<PlayListApplicationResponse>(
-                pagedEntities.Select(entry => PlayListApplicationResponse.FromEntity(entry.PlayList, entry.TrackCount, entry.DurationSeconds, entry.CoverTrackIds)),
+                pagedEntities.Select(entry => PlayListApplicationResponse.FromEntity(entry.PlayList, entry.CoverTrackIds)),
                 pagedEntities.PageNumber, pagedEntities.PageSize, pagedEntities.TotalItemCount);
 
             return PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists);

backend/Core/Musify.Application/PlayLists/GetPlayListsByUserId.cs

@@ -46,8 +46,6 @@ namespace Musify.Application.PlayLists
                 .Select(p => new
                 {
                     PlayList = p,
-                    TrackCount = p.PlayListTracks.Count,
-                    DurationSeconds = p.PlayListTracks.Sum(plt => (double?)plt.Track.DurationSeconds) ?? 0,
                     CoverTrackIds = p.PlayListTracks
                         .OrderBy(plt => plt.Position)
                         .Take(PlayListApplicationResponse.CoverTrackCount)
@@ -57,7 +55,7 @@ namespace Musify.Application.PlayLists
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedPlayLists = new StaticPagedList<PlayListApplicationResponse>(
-                pagedEntities.Select(entry => PlayListApplicationResponse.FromEntity(entry.PlayList, entry.TrackCount, entry.DurationSeconds, entry.CoverTrackIds)),
+                pagedEntities.Select(entry => PlayListApplicationResponse.FromEntity(entry.PlayList, entry.CoverTrackIds)),
                 pagedEntities.PageNumber, pagedEntities.PageSize, pagedEntities.TotalItemCount);
 
             return PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists);

backend/Core/Musify.Application/PlayLists/Responses/AddAlbumToPlayListResponse.cs

@@ -1,4 +0,0 @@
-namespace Musify.Application.PlayLists.Responses
-{
-    public record AddAlbumToPlayListResponse(int AddedCount);
-}

backend/Core/Musify.Application/PlayLists/Responses/PlayListApplicationResponse.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-using Musify.Application.Serialization;
 using Musify.Domain.Entities;
 using Musify.Domain.ValueObjects;
 
@@ -12,10 +10,7 @@ namespace Musify.Application.PlayLists.Responses
         string? SmallImageKeyName,
         string? MediumImageKeyName,
         string? LargeImageKeyName,
-        [property: JsonConverter(typeof(LongAsStringConverter))] long OwnerUserId,
         PlaylistVisibility Visibility,
-        int TrackCount,
-        double DurationSeconds,
         DateTime CreatedAt,
         DateTime UpdatedAt,
         IReadOnlyList<Guid> CoverTrackIds)
@@ -24,8 +19,6 @@ namespace Musify.Application.PlayLists.Responses
 
         public static PlayListApplicationResponse FromEntity(
             PlayList playList,
-            int trackCount = 0,
-            double durationSeconds = 0,
             IReadOnlyList<Guid>? coverTrackIds = null)
         {
             return new PlayListApplicationResponse(
@@ -35,10 +28,7 @@ namespace Musify.Application.PlayLists.Responses
                 playList.Pictures?.SmallName,
                 playList.Pictures?.MediumName,
                 playList.Pictures?.LargeName,
-                playList.UserId,
                 playList.Visibility,
-                trackCount,
-                durationSeconds,
                 playList.CreatedAt,
                 playList.UpdatedAt,
                 coverTrackIds ?? []);

backend/Core/Musify.Application/PlayLists/UpdatePlayList.cs

@@ -112,22 +112,7 @@ namespace Musify.Application.PlayLists
                 .ToListAsync(cancellationToken);
 
             logger.LogInformation("Updated playlist {PlayListId}", playListEntity.Id);
-            var totals = await database.PlayListHasTracks
+            return PlayListApplicationResponse.FromEntity(playListEntity, coverTrackIds);
-                .AsNoTracking()
-                .Where(plt => plt.PlayListId == playListEntity.Id)
-                .GroupBy(plt => plt.PlayListId)
-                .Select(group => new
-                {
-                    TrackCount = group.Count(),
-                    DurationSeconds = group.Sum(plt => plt.Track.DurationSeconds)
-                })
-                .SingleOrDefaultAsync(cancellationToken);
-
-            return PlayListApplicationResponse.FromEntity(
-                playListEntity,
-                totals?.TrackCount ?? 0,
-                totals?.DurationSeconds ?? 0,
-                coverTrackIds);
         }
 
         private async Task<ErrorOr<Success>> PublishUpdatePlayListPictureSourceEventAsync(

backend/Core/Musify.Application/Services/TrackStreamIssuer.cs

@@ -30,7 +30,6 @@ public sealed class TrackStreamIssuer(
             folderPath,
             streamGatewayConfiguration.AudioFileName);
 
-        Guid? listenId = null;
         if (userId != null)
         {
             var newListeningHistory = new ListeningHistory
@@ -40,10 +39,9 @@ public sealed class TrackStreamIssuer(
             };
             await database.ListeningHistories.AddAsync(newListeningHistory, cancellationToken);
             await database.SaveChangesAsync(cancellationToken);
-            listenId = newListeningHistory.Id;
         }
 
-        return new TrackStreamResponse(manifestUrl, ticket.Token, ticket.ExpiresInSeconds, listenId);
+        return new TrackStreamResponse(manifestUrl, ticket.Token, ticket.ExpiresInSeconds);
     }
 
     private long? AnonymousFragmentBytes(long? userId)

backend/Core/Musify.Application/Tracks/CreateTrack.cs

@@ -18,8 +18,7 @@ namespace Musify.Application.Tracks
         string Title,
         Guid PictureIntentId,
         Guid AudioIntentId,
-        IReadOnlyCollection<Genre> Tags,
+        IReadOnlyCollection<Genre> Tags)
-        bool IsExplicit = false)
         : ICommand<ErrorOr<TrackApplicationResponse>>;
 
     public class CreateTrackCommandHandler(
@@ -84,7 +83,6 @@ namespace Musify.Application.Tracks
                 NormalizedTitle = request.Title.ToUpperInvariant(),
                 OwnerUserId = user.Id,
                 Owner = user,
-                IsExplicit = request.IsExplicit,
                 Pictures = new TrackPictures
                 {
                     OriginalName = pictureIntent.ObjectName,

backend/Core/Musify.Application/Tracks/DeleteStaleUncountedListens.cs

@@ -1,33 +0,0 @@
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts;
-
-namespace Musify.Application.Tracks
-{
-    public record DeleteStaleUncountedListensCommand : ICommand<int>;
-
-    public class DeleteStaleUncountedListensCommandHandler(
-        IDatabase database,
-        ILogger<DeleteStaleUncountedListensCommandHandler> logger)
-        : ICommandHandler<DeleteStaleUncountedListensCommand, int>
-    {
-        public async ValueTask<int> Handle(DeleteStaleUncountedListensCommand request, CancellationToken cancellationToken)
-        {
-            var cutoff = DateTime.UtcNow.AddDays(-ListeningRules.UncountedRetentionDays);
-
-            var stale = await database.ListeningHistories
-                .Where(l => !l.IsCounted && l.ListenedAt < cutoff)
-                .ToListAsync(cancellationToken);
-
-            if (stale.Count == 0)
-                return 0;
-
-            database.ListeningHistories.RemoveRange(stale);
-            await database.SaveChangesAsync(cancellationToken);
-
-            logger.LogInformation("Deleted {Count} uncounted listens older than {Days} days", stale.Count, ListeningRules.UncountedRetentionDays);
-            return stale.Count;
-        }
-    }
-}

backend/Core/Musify.Application/Tracks/GetLastTrackListenedByUserId.cs

@@ -19,7 +19,7 @@ namespace Musify.Application.Tracks
                 .Include(t => t.Track.Tags)
                 .Where(t => t.UserId == query.UserId)
                 .OrderByDescending(t => t.ListenedAt)
-                .Select(t => TrackApplicationResponse.FromEntity(t.Track, t.Track.ListeningHistories.Count(l => l.IsCounted)))
+                .Select(t => TrackApplicationResponse.FromEntity(t.Track, t.Track.ListeningHistories.Count))
                 .FirstOrDefaultAsync(cancellationToken);
 
             return track == null

backend/Core/Musify.Application/Tracks/GetListeningHistory.cs

@@ -17,7 +17,7 @@ namespace Musify.Application.Tracks
         {
             var recentTrackIds = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(l => l.UserId == query.UserId && l.IsCounted)
+                .Where(l => l.UserId == query.UserId)
                 .GroupBy(l => l.TrackId)
                 .OrderByDescending(g => g.Max(l => l.ListenedAt))
                 .Select(g => g.Key)
@@ -29,7 +29,7 @@ namespace Musify.Application.Tracks
                 .Include(t => t.Owner)
                 .Include(t => t.Tags)
                 .Where(t => recentTrackIds.Contains(t.Id))
-                .Select(t => new { t.Id, Track = t, ListensCount = t.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { t.Id, Track = t, ListensCount = t.ListeningHistories.Count })
                 .ToDictionaryAsync(t => t.Id, cancellationToken);
 
             return recentTrackIds

backend/Core/Musify.Application/Tracks/GetTrackById.cs

@@ -18,7 +18,7 @@ namespace Musify.Application.Tracks
                 .Include(t => t.Owner)
                 .Include(t => t.Tags)
                 .Where(t => t.Id == request.TrackId)
-                .Select(t => new { Track = t, ListensCount = t.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { Track = t, ListensCount = t.ListeningHistories.Count })
                 .SingleOrDefaultAsync(cancellationToken);
 
             if (entity == null)

backend/Core/Musify.Application/Tracks/GetTracks.cs

@@ -5,11 +5,10 @@ using Musify.Application.Tracks.Responses;
 using X.PagedList;
 using X.PagedList.EF;
 using Musify.Application.Contracts;
-using Musify.Domain.ValueObjects;
 
 namespace Musify.Application.Tracks
 {
-    public record GetTracksQuery(string? Name, int PageNumber, int PageSize, Genre? Genre = null)
+    public record GetTracksQuery(string? Name, int PageNumber, int PageSize)
         : IQuery<ErrorOr<TracksSearchResponse>>;
 
     public class GetTracksQueryHandler(IDatabase database)
@@ -29,15 +28,12 @@ namespace Musify.Application.Tracks
                 tracksQuery = tracksQuery.Where(t => t.Track.NormalizedTitle.Contains(normalizedName));
             }
 
-            if (request.Genre is { } genre)
-                tracksQuery = tracksQuery.Where(t => t.Track.Tags.Any(tag => tag.Tag == genre));
-
             var totalCount = await tracksQuery.CountAsync(cancellationToken);
 
             var pagedEntities = await tracksQuery
                 .OrderByDescending(t => t.Track.CreatedAt)
                 .ThenBy(t => t.Id)
-                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var items = pagedEntities

backend/Core/Musify.Application/Tracks/GetTracksByUserId.cs

@@ -40,7 +40,7 @@ namespace Musify.Application.Tracks
 
             var pagedEntities = await tracksQuery
                 .OrderBy(t => t.Track.CreatedAt)
-                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count })
                 .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/Tracks/ListeningRules.cs

@@ -1,14 +0,0 @@
-namespace Musify.Application.Tracks
-{
-    public static class ListeningRules
-    {
-        public const double CountedThresholdSeconds = 30;
-        public const double CountedThresholdFraction = 0.5;
-        public const double DurationToleranceSeconds = 2;
-        public const double ClockToleranceSeconds = 5;
-        public const int UncountedRetentionDays = 8;
-
-        public static double CountedThreshold(double durationSeconds) =>
-            Math.Min(CountedThresholdSeconds, durationSeconds * CountedThresholdFraction);
-    }
-}

backend/Core/Musify.Application/Tracks/RecordListeningProgress.cs

@@ -1,44 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts;
-
-namespace Musify.Application.Tracks
-{
-    public record RecordListeningProgressCommand(
-        long UserId,
-        Guid ListenId,
-        double PlayedSeconds)
-        : ICommand<ErrorOr<Success>>;
-
-    public class RecordListeningProgressCommandHandler(IDatabase database)
-        : ICommandHandler<RecordListeningProgressCommand, ErrorOr<Success>>
-    {
-        public async ValueTask<ErrorOr<Success>> Handle(RecordListeningProgressCommand request, CancellationToken cancellationToken)
-        {
-            if (!double.IsFinite(request.PlayedSeconds) || request.PlayedSeconds < 0)
-                return Error.Validation(description: "playedSeconds must be a non-negative number.");
-
-            var listen = await database.ListeningHistories
-                .Include(l => l.Track)
-                .SingleOrDefaultAsync(l => l.Id == request.ListenId && l.UserId == request.UserId, cancellationToken);
-
-            if (listen == null)
-                return Error.NotFound();
-
-            var now = DateTime.UtcNow;
-            var durationCap = listen.Track.DurationSeconds + ListeningRules.DurationToleranceSeconds;
-            var clockCap = (now - listen.ListenedAt).TotalSeconds + ListeningRules.ClockToleranceSeconds;
-            var accepted = Math.Min(request.PlayedSeconds, Math.Min(durationCap, clockCap));
-
-            listen.PlayedSeconds = Math.Max(listen.PlayedSeconds ?? 0, accepted);
-            listen.LastProgressAt = now;
-            listen.IsCounted = listen.IsCounted
-                || listen.PlayedSeconds >= ListeningRules.CountedThreshold(listen.Track.DurationSeconds);
-
-            await database.SaveChangesAsync(cancellationToken);
-
-            return Result.Success;
-        }
-    }
-}

backend/Core/Musify.Application/Tracks/Responses/TrackApplicationResponse.cs

@@ -15,8 +15,7 @@ namespace Musify.Application.Tracks.Responses
         DateTime CreatedAt,
         DateTime UpdatedAt,
         [property: JsonConverter(typeof(LongAsStringConverter))] long OwnerUserId,
-        IReadOnlyCollection<Genre> Tags,
+        IReadOnlyCollection<Genre> Tags)
-        bool IsExplicit)
     {
         public static TrackApplicationResponse FromEntity(Track track, int listensCount) =>
             new(
@@ -29,7 +28,6 @@ namespace Musify.Application.Tracks.Responses
                 track.CreatedAt,
                 track.UpdatedAt,
                 track.OwnerUserId,
-                track.Tags.Select(tag => tag.Tag).ToList(),
+                track.Tags.Select(tag => tag.Tag).ToList());
-                track.IsExplicit);
     }
 }

backend/Core/Musify.Application/Tracks/Responses/TrackStreamResponse.cs

@@ -3,6 +3,5 @@ namespace Musify.Application.Tracks.Responses
     public record TrackStreamResponse(
         string ManifestUrl,
         string Ticket,
-        int ExpiresInSeconds,
+        int ExpiresInSeconds);
-        Guid? ListenId = null);
 }

backend/Core/Musify.Application/Users/FollowVisibility.cs

@@ -1,30 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts;
-
-namespace Musify.Application.Users
-{
-    public static class FollowVisibility
-    {
-        public static async Task<bool> CanViewFollowersAsync(
-            IDatabase database,
-            long? viewerId,
-            long userId,
-            CancellationToken cancellationToken)
-        {
-            if (viewerId is not { } viewer)
-                return false;
-
-            if (viewer == userId)
-                return true;
-
-            var mutualRows = await database.UserFollows
-                .AsNoTracking()
-                .CountAsync(f =>
-                    (f.FollowerId == viewer && f.FollowedId == userId) ||
-                    (f.FollowerId == userId && f.FollowedId == viewer),
-                    cancellationToken);
-
-            return mutualRows == 2;
-        }
-    }
-}

backend/Core/Musify.Application/Users/GetListeningStats.cs

@@ -20,18 +20,17 @@ namespace Musify.Application.Users
                 .Where(l => l.UserId == request.UserId && l.ListenedAt >= weekAgo);
 
             var tracksThisWeek = await thisWeekHistory
-                .Where(l => l.IsCounted)
                 .Select(l => l.TrackId)
                 .Distinct()
                 .CountAsync(cancellationToken);
 
             var secondsThisWeek = await thisWeekHistory
-                .Join(database.Tracks.AsNoTracking(), l => l.TrackId, t => t.Id, (l, t) => l.PlayedSeconds ?? (l.IsCounted ? t.DurationSeconds : 0))
+                .Join(database.Tracks.AsNoTracking(), l => l.TrackId, t => t.Id, (l, t) => t.DurationSeconds)
                 .SumAsync(cancellationToken);
 
             var listenedDates = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(l => l.UserId == request.UserId && l.IsCounted)
+                .Where(l => l.UserId == request.UserId)
                 .Select(l => l.ListenedAt.Date)
                 .Distinct()
                 .ToListAsync(cancellationToken);

backend/Core/Musify.Application/Users/GetUserFollowers.cs

@@ -1,46 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts;
-using Musify.Application.Shared;
-using Musify.Application.Users.Responses;
-using X.PagedList.EF;
-
-namespace Musify.Application.Users
-{
-    public record GetUserFollowersQuery(long? ViewerId, long UserId, int PageNumber, int PageSize)
-        : IQuery<ErrorOr<PaginatedResponse<UserSummaryResponse>>>;
-
-    public class GetUserFollowersQueryHandler(IDatabase database)
-        : IQueryHandler<GetUserFollowersQuery, ErrorOr<PaginatedResponse<UserSummaryResponse>>>
-    {
-        public async ValueTask<ErrorOr<PaginatedResponse<UserSummaryResponse>>> Handle(GetUserFollowersQuery request, CancellationToken cancellationToken)
-        {
-            if (!await database.Users.AnyAsync(u => u.Id == request.UserId, cancellationToken))
-                return Error.NotFound();
-
-            if (!await FollowVisibility.CanViewFollowersAsync(database, request.ViewerId, request.UserId, cancellationToken))
-                return Error.Forbidden();
-
-            var followsQuery = database.UserFollows
-                .AsNoTracking()
-                .Where(f => f.FollowedId == request.UserId);
-
-            var totalCount = await followsQuery.CountAsync(cancellationToken);
-            var viewerId = request.ViewerId;
-
-            var page = await followsQuery
-                .OrderByDescending(f => f.CreatedAt)
-                .Select(f => new UserSummaryResponse(
-                    f.Follower.Id,
-                    f.Follower.Name,
-                    f.Follower.FirstName,
-                    f.Follower.SecondName,
-                    f.Follower.ProfilePictureUrl,
-                    viewerId != null && database.UserFollows.Any(v => v.FollowerId == viewerId && v.FollowedId == f.FollowerId)))
-                .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
-
-            return PaginatedResponse<UserSummaryResponse>.FromPagedList(page);
-        }
-    }
-}

backend/Core/Musify.Application/Users/GetUserFollowing.cs

@@ -1,43 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts;
-using Musify.Application.Shared;
-using Musify.Application.Users.Responses;
-using X.PagedList.EF;
-
-namespace Musify.Application.Users
-{
-    public record GetUserFollowingQuery(long? ViewerId, long UserId, int PageNumber, int PageSize)
-        : IQuery<ErrorOr<PaginatedResponse<UserSummaryResponse>>>;
-
-    public class GetUserFollowingQueryHandler(IDatabase database)
-        : IQueryHandler<GetUserFollowingQuery, ErrorOr<PaginatedResponse<UserSummaryResponse>>>
-    {
-        public async ValueTask<ErrorOr<PaginatedResponse<UserSummaryResponse>>> Handle(GetUserFollowingQuery request, CancellationToken cancellationToken)
-        {
-            if (!await database.Users.AnyAsync(u => u.Id == request.UserId, cancellationToken))
-                return Error.NotFound();
-
-            var followsQuery = database.UserFollows
-                .AsNoTracking()
-                .Where(f => f.FollowerId == request.UserId);
-
-            var totalCount = await followsQuery.CountAsync(cancellationToken);
-            var viewerId = request.ViewerId;
-
-            var page = await followsQuery
-                .OrderByDescending(f => f.CreatedAt)
-                .Select(f => new UserSummaryResponse(
-                    f.Followed.Id,
-                    f.Followed.Name,
-                    f.Followed.FirstName,
-                    f.Followed.SecondName,
-                    f.Followed.ProfilePictureUrl,
-                    viewerId != null && database.UserFollows.Any(v => v.FollowerId == viewerId && v.FollowedId == f.FollowedId)))
-                .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
-
-            return PaginatedResponse<UserSummaryResponse>.FromPagedList(page);
-        }
-    }
-}

backend/Core/Musify.Application/Users/GetUserProfile.cs

@@ -7,7 +7,7 @@ using Musify.Application.Serialization;
 
 namespace Musify.Application.Users
 {
-    public record GetUserProfileQuery(long UserId, long? ViewerId = null) : IQuery<ErrorOr<UserProfileResponse>>;
+    public record GetUserProfileQuery(long UserId) : IQuery<ErrorOr<UserProfileResponse>>;
 
     public record UserProfileResponse(
         [property: JsonConverter(typeof(LongAsStringConverter))] long Id,
@@ -17,9 +17,7 @@ namespace Musify.Application.Users
         string? ProfilePictureUrl,
         DateTime CreatedAt,
         int FollowersCount,
-        int FollowingCount,
+        int FollowingCount);
-        bool IsFollowing,
-        bool CanViewFollowers);
 
     public class GetUserProfileQueryHandler(IDatabase database)
         : IQueryHandler<GetUserProfileQuery, ErrorOr<UserProfileResponse>>
@@ -51,14 +49,6 @@ namespace Musify.Application.Users
                 .AsNoTracking()
                 .CountAsync(f => f.FollowerId == request.UserId, cancellationToken);
 
-            var isFollowing = request.ViewerId is { } viewerId && viewerId != request.UserId &&
-                await database.UserFollows
-                    .AsNoTracking()
-                    .AnyAsync(f => f.FollowerId == viewerId && f.FollowedId == request.UserId, cancellationToken);
-
-            var canViewFollowers = await FollowVisibility.CanViewFollowersAsync(
-                database, request.ViewerId, request.UserId, cancellationToken);
-
             return new UserProfileResponse(
                 user.Id,
                 user.Name,
@@ -67,9 +57,7 @@ namespace Musify.Application.Users
                 user.ProfilePictureUrl,
                 user.CreatedAt,
                 followersCount,
-                followingCount,
+                followingCount);
-                isFollowing,
-                canViewFollowers);
         }
     }
 }

backend/Core/Musify.Application/Users/GetUsers.cs

@@ -8,13 +8,13 @@ using Musify.Application.Contracts;
 
 namespace Musify.Application.Users
 {
-    public record GetUsersQuery(int PageNumber, int PageSize, string? UsernameSearch, long? ViewerId = null)
+    public record GetUsersQuery(int PageNumber, int PageSize, string? UsernameSearch)
-        : IQuery<ErrorOr<PaginatedResponse<UserSummaryResponse>>>;
+        : IQuery<ErrorOr<PaginatedResponse<UserApplicationResponse>>>;
 
     public class GetUsersQueryHandler(IDatabase database)
-        : IQueryHandler<GetUsersQuery, ErrorOr<PaginatedResponse<UserSummaryResponse>>>
+        : IQueryHandler<GetUsersQuery, ErrorOr<PaginatedResponse<UserApplicationResponse>>>
     {
-        public async ValueTask<ErrorOr<PaginatedResponse<UserSummaryResponse>>> Handle(GetUsersQuery request, CancellationToken cancellationToken)
+        public async ValueTask<ErrorOr<PaginatedResponse<UserApplicationResponse>>> Handle(GetUsersQuery request, CancellationToken cancellationToken)
         {
             var usersQuery = database.Users
                 .AsNoTracking()
@@ -27,19 +27,11 @@ namespace Musify.Application.Users
             }
 
             var totalCount = await usersQuery.CountAsync(cancellationToken);
-            var viewerId = request.ViewerId;
             var pagedUsers = await usersQuery
-                .OrderBy(u => u.Name)
+                .Select(u => UserApplicationResponse.FromEntity(u))
-                .Select(u => new UserSummaryResponse(
-                    u.Id,
-                    u.Name,
-                    u.FirstName,
-                    u.SecondName,
-                    u.ProfilePictureUrl,
-                    viewerId != null && database.UserFollows.Any(f => f.FollowerId == viewerId && f.FollowedId == u.Id)))
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
-            return PaginatedResponse<UserSummaryResponse>.FromPagedList(pagedUsers);
+            return PaginatedResponse<UserApplicationResponse>.FromPagedList(pagedUsers);
         }
     }
 }

backend/Core/Musify.Application/Users/Responses/UserSummaryResponse.cs

@@ -1,13 +0,0 @@
-using System.Text.Json.Serialization;
-using Musify.Application.Serialization;
-
-namespace Musify.Application.Users.Responses
-{
-    public record UserSummaryResponse(
-        [property: JsonConverter(typeof(LongAsStringConverter))] long Id,
-        string Name,
-        string? FirstName,
-        string? SecondName,
-        string? ProfilePictureUrl,
-        bool IsFollowedByViewer);
-}

backend/Core/Musify.Domain/Entities/ListeningHistory.cs

@@ -19,12 +19,6 @@ namespace Musify.Domain.Entities
         [Required]
         public DateTime ListenedAt { get; set; } = DateTime.UtcNow;
 
-        public double? PlayedSeconds { get; set; }
-
-        public DateTime? LastProgressAt { get; set; }
-
-        public bool IsCounted { get; set; }
-
         [ForeignKey(nameof(UserId) )]
         public User User { get; set; }
 

backend/Core/Musify.Domain/Entities/Track.cs

@@ -31,9 +31,6 @@ namespace Musify.Domain.Entities
         [Required]
         public LifeCycleStatus LifeCycleStatus { get; set; } = LifeCycleStatus.Active;
 
-        [Required]
-        public bool IsExplicit { get; set; }
-
         [Required]
         public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 

backend/Core/Musify.Infrastructure/Jobs/DailyMixGenerationJob.cs

@@ -15,7 +15,6 @@ namespace Musify.Infrastructure.Jobs
         {
             var userIds = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(history => history.IsCounted)
                 .Select(history => history.UserId)
                 .Distinct()
                 .ToListAsync(cancellationToken);

backend/Core/Musify.Infrastructure/Jobs/ListeningHistoryCleanupJob.cs

@@ -1,13 +0,0 @@
-using Mediator;
-using Musify.Application.Tracks;
-
-namespace Musify.Infrastructure.Jobs
-{
-    public class ListeningHistoryCleanupJob(IMediator mediator)
-    {
-        public async Task RunAsync(CancellationToken cancellationToken)
-        {
-            await mediator.Send(new DeleteStaleUncountedListensCommand(), cancellationToken);
-        }
-    }
-}

backend/Core/Musify.Infrastructure/Persistence/AuditableEntityInterceptor.cs

@@ -37,7 +37,7 @@ namespace Musify.Infrastructure.Persistence
                 }
                 else if (entry.State == EntityState.Modified)
                 {
-                    entry.Property(nameof(IAuditable.UpdatedAt)).CurrentValue = now;
+                    entry.Entity.UpdatedAt = now;
                 }
             }
         }

backend/Core/Musify.Infrastructure/Persistence/Database.cs

@@ -13,13 +13,9 @@ namespace Musify.Infrastructure.Persistence
     public class Database(DatabaseConfiguration configuration)
         : DbContext, AppIDatabase
     {
-        private static readonly AuditableEntityInterceptor AuditInterceptor = new();
-
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder
+            optionsBuilder.UseNpgsql(configuration.ConnectionString, o => o.MapEnum<Genre>("genre"));
-                .UseNpgsql(configuration.ConnectionString, o => o.MapEnum<Genre>("genre"))
-                .AddInterceptors(AuditInterceptor);
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)

backend/Core/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs

@@ -18,7 +18,10 @@ namespace Musify.Infrastructure.Persistence
             serviceDescriptors.AddSingleton(serviceProvider =>
                 serviceProvider.GetRequiredService<IOptions<DatabaseConfiguration>>().Value);
 
-            serviceDescriptors.AddDbContext<Database>();
+            serviceDescriptors.AddSingleton<AuditableEntityInterceptor>();
+
+            serviceDescriptors.AddDbContext<Database>((serviceProvider, options) =>
+                options.AddInterceptors(serviceProvider.GetRequiredService<AuditableEntityInterceptor>()));
 
             serviceDescriptors.AddScoped<IDatabase>(serviceProvider => serviceProvider.GetRequiredService<Database>());
 

backend/Core/Musify.Infrastructure/Persistence/Migrations/20260923172640_TrackPlayedSeconds.cs

@@ -1,52 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Musify.Infrastructure.Persistence.Migrations
-{
-    /// <inheritdoc />
-    public partial class TrackPlayedSeconds : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsCounted",
-                table: "ListeningHistory",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "LastProgressAt",
-                table: "ListeningHistory",
-                type: "timestamp with time zone",
-                nullable: true);
-
-            migrationBuilder.AddColumn<double>(
-                name: "PlayedSeconds",
-                table: "ListeningHistory",
-                type: "double precision",
-                nullable: true);
-
-            migrationBuilder.Sql("UPDATE \"ListeningHistory\" SET \"IsCounted\" = TRUE;");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsCounted",
-                table: "ListeningHistory");
-
-            migrationBuilder.DropColumn(
-                name: "LastProgressAt",
-                table: "ListeningHistory");
-
-            migrationBuilder.DropColumn(
-                name: "PlayedSeconds",
-                table: "ListeningHistory");
-        }
-    }
-}

backend/Core/Musify.Infrastructure/Persistence/Migrations/20260923203135_AddTrackIsExplicit.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Musify.Infrastructure.Persistence.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddTrackIsExplicit : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsExplicit",
-                table: "Tracks",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsExplicit",
-                table: "Tracks");
-        }
-    }
-}

backend/Core/Musify.Infrastructure/Persistence/Migrations/DatabaseModelSnapshot.cs

@@ -1,4 +1,4 @@
-// <auto-generated />
+
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -68,7 +68,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("Delivered");
 
-                    b.ToTable("InboxState");
+                    b.ToTable("InboxState", (string)null);
                 });
 
             modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxMessage", b =>
@@ -159,7 +159,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("InboxMessageId", "InboxConsumerId", "SequenceNumber")
                         .IsUnique();
 
-                    b.ToTable("OutboxMessage");
+                    b.ToTable("OutboxMessage", (string)null);
                 });
 
             modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxState", b =>
@@ -189,7 +189,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("Created");
 
-                    b.ToTable("OutboxState");
+                    b.ToTable("OutboxState", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Album", b =>
@@ -231,7 +231,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("OwnerUserId");
 
-                    b.ToTable("Albums");
+                    b.ToTable("Albums", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.AlbumHasTrack", b =>
@@ -259,7 +259,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("AlbumId", "TrackId")
                         .IsUnique();
 
-                    b.ToTable("AlbumHasTrack");
+                    b.ToTable("AlbumHasTrack", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.ListeningHistory", b =>
@@ -268,18 +268,9 @@ namespace Musify.Infrastructure.Persistence.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
-                    b.Property<bool>("IsCounted")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime?>("LastProgressAt")
-                        .HasColumnType("timestamp with time zone");
-
                     b.Property<DateTime>("ListenedAt")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<double?>("PlayedSeconds")
-                        .HasColumnType("double precision");
-
                     b.Property<Guid>("TrackId")
                         .HasColumnType("uuid");
 
@@ -292,7 +283,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("ListeningHistory");
+                    b.ToTable("ListeningHistory", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Mix", b =>
@@ -326,7 +317,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId", "Position");
 
-                    b.ToTable("Mixes");
+                    b.ToTable("Mixes", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.MixItem", b =>
@@ -350,7 +341,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("MixId", "Position");
 
-                    b.ToTable("MixItems");
+                    b.ToTable("MixItems", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.PlayList", b =>
@@ -394,7 +385,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("PlayLists");
+                    b.ToTable("PlayLists", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.PlayListHasTrack", b =>
@@ -421,7 +412,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("TrackId");
 
-                    b.ToTable("PlayListHasTrack");
+                    b.ToTable("PlayListHasTrack", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Track", b =>
@@ -436,9 +427,6 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.Property<double>("DurationSeconds")
                         .HasColumnType("double precision");
 
-                    b.Property<bool>("IsExplicit")
-                        .HasColumnType("boolean");
-
                     b.Property<int>("LifeCycleStatus")
                         .HasColumnType("integer");
 
@@ -462,7 +450,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("OwnerUserId");
 
-                    b.ToTable("Tracks");
+                    b.ToTable("Tracks", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.TrackLike", b =>
@@ -487,7 +475,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("UserId", "TrackId")
                         .IsUnique();
 
-                    b.ToTable("TrackLikes");
+                    b.ToTable("TrackLikes", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.TrackTag", b =>
@@ -507,7 +495,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("TrackId", "Tag")
                         .IsUnique();
 
-                    b.ToTable("TrackTags");
+                    b.ToTable("TrackTags", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Upload", b =>
@@ -536,7 +524,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("Upload");
+                    b.ToTable("Upload", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.UploadIntent", b =>
@@ -587,7 +575,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("UploadIntents");
+                    b.ToTable("UploadIntents", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.User", b =>
@@ -625,7 +613,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("User");
+                    b.ToTable("User", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.UserFollow", b =>
@@ -650,7 +638,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("FollowerId", "FollowedId")
                         .IsUnique();
 
-                    b.ToTable("UserFollows");
+                    b.ToTable("UserFollows", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.UserHasTrack", b =>
@@ -671,7 +659,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("UserHasTrack");
+                    b.ToTable("UserHasTrack", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Infrastructure.MassTransit.Sagas.AlbumProcessingState", b =>
@@ -698,7 +686,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("CorrelationId");
 
-                    b.ToTable("AlbumProcessingState");
+                    b.ToTable("AlbumProcessingState", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Infrastructure.MassTransit.Sagas.PlayListProcessingState", b =>
@@ -725,7 +713,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("CorrelationId");
 
-                    b.ToTable("PlayListProcessingState");
+                    b.ToTable("PlayListProcessingState", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Infrastructure.MassTransit.Sagas.TrackProcessingState", b =>
@@ -761,7 +749,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("CorrelationId");
 
-                    b.ToTable("TrackProcessingState");
+                    b.ToTable("TrackProcessingState", (string)null);
                 });
 
             modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxMessage", b =>
@@ -815,7 +803,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                             b1.HasKey("AlbumId");
 
-                            b1.ToTable("Albums");
+                            b1.ToTable("Albums", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("AlbumId");
@@ -908,28 +896,32 @@ namespace Musify.Infrastructure.Persistence.Migrations
                                 .HasColumnType("uuid");
 
                             b1.Property<string>("LargeName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("LargePictureName");
 
                             b1.Property<string>("MediumName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("MediumPictureName");
 
                             b1.Property<string>("OriginalName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("OriginalPictureName");
 
                             b1.Property<string>("SmallName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("SmallPictureName");
 
                             b1.HasKey("PlayListId");
 
-                            b1.ToTable("PlayLists");
+                            b1.ToTable("PlayLists", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("PlayListId");
@@ -1000,7 +992,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                             b1.HasKey("TrackId");
 
-                            b1.ToTable("Tracks");
+                            b1.ToTable("Tracks", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("TrackId");
@@ -1037,7 +1029,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                             b1.HasKey("TrackId");
 
-                            b1.ToTable("Tracks");
+                            b1.ToTable("Tracks", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("TrackId");

backend/Core/Musify.Infrastructure/Services/ServicesDependencyInjection.cs

@@ -74,7 +74,6 @@ namespace Musify.Infrastructure.Services
 
             serviceDescriptors.AddHangfireServer();
             serviceDescriptors.AddScoped<DailyMixGenerationJob>();
-            serviceDescriptors.AddScoped<ListeningHistoryCleanupJob>();
 
             return serviceDescriptors;
         }

backend/Hosts/Musify.Api/DataTransferObjects/Tracks/CreateTrackRequest.cs

@@ -6,5 +6,4 @@ public record CreateTrackRequest(
     string Title,
     Guid PictureIntentId,
     Guid AudioIntentId,
-    IReadOnlyCollection<Genre> Tags,
+    IReadOnlyCollection<Genre> Tags);
-    bool IsExplicit = false);

backend/Hosts/Musify.Api/DataTransferObjects/Tracks/RecordListeningProgressRequest.cs

@@ -1,3 +0,0 @@
-namespace Musify.Api.DataTransferObjects.Tracks;
-
-public record RecordListeningProgressRequest(double PlayedSeconds);

backend/Hosts/Musify.Api/Endpoints/GenreEndpoints.cs

@@ -1,39 +0,0 @@
-using Mediator;
-using Musify.Application.Genres;
-
-namespace Musify.Api.Endpoints;
-
-public static class GenreEndpoints
-{
-    public static IEndpointRouteBuilder MapGenreEndpoints(this IEndpointRouteBuilder app)
-    {
-        var group = app.MapGroup("/genres")
-            .WithTags("Genres");
-
-        group.MapGet("/", GetGenres)
-            .WithName("GetGenres")
-            .WithSummary("Get The Genres That Have At Least One Track, Most Populated First. Works Anonymously.")
-            .Produces<IReadOnlyList<GenreResponse>>();
-
-        group.MapGet("/available", GetAvailableGenres)
-            .WithName("GetAvailableGenres")
-            .WithSummary("Get Every Genre A Track Can Be Tagged With, Including The Genres It Cannot Be Combined With. Works Anonymously.")
-            .Produces<IReadOnlyList<AvailableGenreResponse>>();
-
-        return app;
-    }
-
-    private static async Task<IReadOnlyList<AvailableGenreResponse>> GetAvailableGenres(
-        IMediator mediator,
-        CancellationToken cancellationToken)
-    {
-        return await mediator.Send(new GetAvailableGenresQuery(), cancellationToken);
-    }
-
-    private static async Task<IReadOnlyList<GenreResponse>> GetGenres(
-        IMediator mediator,
-        CancellationToken cancellationToken)
-    {
-        return await mediator.Send(new GetGenresQuery(), cancellationToken);
-    }
-}

backend/Hosts/Musify.Api/Endpoints/PlayListEndpoints.cs

@@ -94,14 +94,6 @@ public static class PlayListEndpoints
             .Produces(StatusCodes.Status404NotFound)
             .Produces(StatusCodes.Status409Conflict);
 
-        group.MapPost("/{playlistId}/albums/{albumId}", AddAlbumToPlayList)
-            .WithName("AddAlbumToPlayList")
-            .WithSummary("Add All The Tracks Of An Album To One Of Your PlayLists, Skipping Those Already In It.")
-            .RequireAuthorization()
-            .Produces<AddAlbumToPlayListResponse>()
-            .Produces(StatusCodes.Status401Unauthorized)
-            .Produces(StatusCodes.Status404NotFound);
-
         group.MapDelete("/{playlistId}/tracks/{trackId}", RemoveTrackFromPlayList)
             .WithName("RemoveTrackFromPlayList")
             .WithSummary("Remove A Track From A PlayList.")
@@ -242,20 +234,6 @@ public static class PlayListEndpoints
         return trackResult.ToCreatedResult(track => $"/tracks/{track.Id}");
     }
 
-    private static async Task<IResult> AddAlbumToPlayList(
-        IMediator mediator,
-        CurrentUser currentUser,
-        Guid playlistId,
-        Guid albumId,
-        CancellationToken cancellationToken)
-    {
-        var result = await mediator.Send(
-            new AddAlbumToPlayListCommand(currentUser.RequiredId, playlistId, albumId),
-            cancellationToken);
-
-        return result.ToHttpResult();
-    }
-
     private static async Task<IResult> RemoveTrackFromPlayList(
         IMediator mediator,
         CurrentUser currentUser,

backend/Hosts/Musify.Api/Endpoints/TrackEndpoints.cs

@@ -1,5 +1,4 @@
 using Mediator;
-using Musify.Domain.ValueObjects;
 using Musify.Application.Tracks;
 using Musify.Application.Tracks.Responses;
 using Musify.Application.Shared;
@@ -20,9 +19,8 @@ public static class TrackEndpoints
 
         group.MapGet("/", GetTracks)
             .WithName("GetTracks")
-            .WithSummary("Get Paginated Tracks, Optionally Filtered By Name And Genre.")
+            .WithSummary("Get Paginated Tracks, Optionally Filtered By Name.")
-            .Produces<TracksSearchResponse>()
+            .Produces<TracksSearchResponse>();
-            .ProducesValidationProblem();
 
         group.MapGet("/{id}", GetTrackById)
             .WithName("GetTrackById")
@@ -43,14 +41,6 @@ public static class TrackEndpoints
             .Produces(StatusCodes.Status401Unauthorized)
             .Produces(StatusCodes.Status404NotFound);
 
-        group.MapPut("/listens/{listenId}/progress", RecordListeningProgress)
-            .WithName("RecordListeningProgress")
-            .WithSummary("Report The Total Seconds Actually Played For A Listen Started By The Stream Endpoint.")
-            .RequireAuthorization()
-            .Produces(StatusCodes.Status204NoContent)
-            .Produces(StatusCodes.Status401Unauthorized)
-            .Produces(StatusCodes.Status404NotFound);
-
         group.MapGet("/users/{userId}", GetTracksByUserId)
             .WithName("GetTracksByUserId")
             .WithSummary("Get Paginated Tracks For A User.")
@@ -94,25 +84,10 @@ public static class TrackEndpoints
         IMediator mediator,
         CancellationToken cancellationToken,
         string? name,
-        string? genre,
         int pageNumber = 1,
         int pageSize = 10)
     {
-        Genre? parsedGenre = null;
+        var result = await mediator.Send(new GetTracksQuery(name, pageNumber, pageSize), cancellationToken);
-        if (!string.IsNullOrWhiteSpace(genre))
-        {
-            if (!Enum.TryParse<Genre>(genre, ignoreCase: true, out var value) || !Enum.IsDefined(value))
-            {
-                return Results.ValidationProblem(new Dictionary<string, string[]>
-                {
-                    [nameof(genre)] = [$"'{genre}' is not a valid genre."]
-                });
-            }
-
-            parsedGenre = value;
-        }
-
-        var result = await mediator.Send(new GetTracksQuery(name, pageNumber, pageSize, parsedGenre), cancellationToken);
         return result.ToHttpResult();
     }
 
@@ -153,19 +128,6 @@ public static class TrackEndpoints
         return result.ToHttpResult();
     }
 
-    private static async Task<IResult> RecordListeningProgress(
-        IMediator mediator,
-        CurrentUser currentUser,
-        Guid listenId,
-        RecordListeningProgressRequest request,
-        CancellationToken cancellationToken)
-    {
-        var result = await mediator.Send(
-            new RecordListeningProgressCommand(currentUser.RequiredId, listenId, request.PlayedSeconds),
-            cancellationToken);
-        return result.ToHttpResult();
-    }
-
     private static async Task<IResult> GetTracksByUserId(
         IMediator mediator,
         long userId,
@@ -185,7 +147,7 @@ public static class TrackEndpoints
         CancellationToken cancellationToken)
     {
         var result = await mediator.Send(
-            new CreateTrackCommand(currentUser.RequiredId, request.Title, request.PictureIntentId, request.AudioIntentId, request.Tags, request.IsExplicit),
+            new CreateTrackCommand(currentUser.RequiredId, request.Title, request.PictureIntentId, request.AudioIntentId, request.Tags),
             cancellationToken);
 
         return result.ToCreatedResult(track => $"/tracks/{track.Id}");

backend/Hosts/Musify.Api/Endpoints/UserEndpoints.cs

@@ -21,7 +21,7 @@ public static class UserEndpoints
         group.MapGet("/", GetUsers)
             .WithName("GetUsers")
             .WithSummary("Get Paginated Users.")
-            .Produces<PaginatedResponse<UserSummaryResponse>>();
+            .Produces<PaginatedResponse<UserApplicationResponse>>();
 
         group.MapGet("/{id}", GetUserById)
             .WithName("GetUserById")
@@ -52,19 +52,6 @@ public static class UserEndpoints
             .Produces<UserProfileResponse>()
             .Produces(StatusCodes.Status404NotFound);
 
-        group.MapGet("/{id}/followers", GetFollowers)
-            .WithName("GetUserFollowers")
-            .WithSummary("Get The Users Following A User. Visible To The User And To Mutual Followers.")
-            .Produces<PaginatedResponse<UserSummaryResponse>>()
-            .Produces(StatusCodes.Status403Forbidden)
-            .Produces(StatusCodes.Status404NotFound);
-
-        group.MapGet("/{id}/following", GetFollowing)
-            .WithName("GetUserFollowing")
-            .WithSummary("Get The Users A User Follows.")
-            .Produces<PaginatedResponse<UserSummaryResponse>>()
-            .Produces(StatusCodes.Status404NotFound);
-
         group.MapGet("/{id}/is-following", IsFollowing)
             .WithName("IsFollowingUser")
             .WithSummary("Check Whether The Current User Follows Another User.")
@@ -101,13 +88,12 @@ public static class UserEndpoints
 
     private static async Task<IResult> GetUsers(
         IMediator mediator,
-        CurrentUser currentUser,
         CancellationToken cancellationToken,
         string? usernameSearch,
         int pageNumber = 1,
         int pageSize = 10)
     {
-        var result = await mediator.Send(new GetUsersQuery(pageNumber, pageSize, usernameSearch, currentUser.Id), cancellationToken);
+        var result = await mediator.Send(new GetUsersQuery(pageNumber, pageSize, usernameSearch), cancellationToken);
         return result.ToHttpResult();
     }
 
@@ -147,35 +133,10 @@ public static class UserEndpoints
 
     private static async Task<IResult> GetUserProfile(
         IMediator mediator,
-        CurrentUser currentUser,
         long id,
         CancellationToken cancellationToken)
     {
-        var result = await mediator.Send(new GetUserProfileQuery(id, currentUser.Id), cancellationToken);
+        var result = await mediator.Send(new GetUserProfileQuery(id), cancellationToken);
-        return result.ToHttpResult();
-    }
-
-    private static async Task<IResult> GetFollowers(
-        IMediator mediator,
-        CurrentUser currentUser,
-        long id,
-        CancellationToken cancellationToken,
-        int pageNumber = 1,
-        int pageSize = 20)
-    {
-        var result = await mediator.Send(new GetUserFollowersQuery(currentUser.Id, id, pageNumber, pageSize), cancellationToken);
-        return result.ToHttpResult();
-    }
-
-    private static async Task<IResult> GetFollowing(
-        IMediator mediator,
-        CurrentUser currentUser,
-        long id,
-        CancellationToken cancellationToken,
-        int pageNumber = 1,
-        int pageSize = 20)
-    {
-        var result = await mediator.Send(new GetUserFollowingQuery(currentUser.Id, id, pageNumber, pageSize), cancellationToken);
         return result.ToHttpResult();
     }
 

backend/Hosts/Musify.Api/Program.cs

@@ -40,7 +40,6 @@ app.UseAuthorization();
 app
     .MapAlbumEndpoints()
     .MapConfigEndpoints()
-    .MapGenreEndpoints()
     .MapLikeEndpoints()
     .MapMixEndpoints()
     .MapPlayListEndpoints()

backend/Hosts/Musify.Worker/Program.cs

@@ -41,11 +41,6 @@ using (var scope = host.Services.CreateScope())
         job => job.RunAsync(CancellationToken.None),
         Cron.Daily(),
         new RecurringJobOptions { TimeZone = TimeZoneInfo.Utc });
-    recurringJobManager.AddOrUpdate<ListeningHistoryCleanupJob>(
-        "listening-history-cleanup",
-        job => job.RunAsync(CancellationToken.None),
-        Cron.Daily(3),
-        new RecurringJobOptions { TimeZone = TimeZoneInfo.Utc });
 }
 
 host.Run();

backend/Tests/Musify.Api.Tests/Endpoints/GenreEndpointsTests.cs

@@ -1,106 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Microsoft.Extensions.DependencyInjection;
-using Musify.Api.Tests.TestSupport;
-using Musify.Application.Genres;
-using Musify.Application.Tracks.Responses;
-using Musify.Domain.Entities;
-using Musify.Domain.ValueObjects;
-using Musify.Infrastructure.Persistence;
-using Xunit;
-
-namespace Musify.Api.Tests.Endpoints
-{
-    [Collection(ApiCollection.Name)]
-    public sealed class GenreEndpointsTests(ApiTestFixture fixture)
-    {
-        private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web)
-        {
-            Converters = { new JsonStringEnumConverter() }
-        };
-
-        private async Task<string> SeedTrackAsync(Genre genre)
-        {
-            using var scope = fixture.Services.CreateScope();
-            var database = scope.ServiceProvider.GetRequiredService<Database>();
-            var owner = new User { Id = Random.Shared.NextInt64(1, long.MaxValue), Name = "genre-owner", NormalizedName = "GENRE-OWNER" };
-            var title = $"Genre track {Guid.NewGuid():N}";
-            var track = new Track
-            {
-                Title = title,
-                NormalizedTitle = title.ToUpperInvariant(),
-                OwnerUserId = owner.Id,
-                Owner = owner,
-                Tags = [new TrackTag { TrackId = Guid.Empty, Tag = genre }]
-            };
-            foreach (var tag in track.Tags)
-                tag.TrackId = track.Id;
-            database.Users.Add(owner);
-            database.Tracks.Add(track);
-            database.UserHasTracks.Add(new UserHasTrack { UserId = owner.Id, TrackId = track.Id });
-            await database.SaveChangesAsync(TestContext.Current.CancellationToken);
-            return title;
-        }
-
-        [Fact]
-        public async Task GetGenres_Anonymous_ListsGenresInUse()
-        {
-            await SeedTrackAsync(Genre.Funk);
-
-            var response = await fixture.CreateAnonymousClient().GetAsync("/genres", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<List<GenreResponse>>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Contains(body!, g => g.Genre == Genre.Funk && g.TrackCount >= 1);
-        }
-
-        [Fact]
-        public async Task GetAvailableGenres_Anonymous_ListsEveryGenreWithIncompatibilities()
-        {
-            var response = await fixture.CreateAnonymousClient().GetAsync("/genres/available", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<List<AvailableGenreResponse>>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Equal(Enum.GetValues<Genre>().Length, body!.Count);
-            Assert.Contains(Genre.Lofi, body.Single(g => g.Genre == Genre.Metal).IncompatibleWith);
-        }
-
-        [Theory]
-        [InlineData("Nope")]
-        [InlineData("999")]
-        public async Task GetTracks_UnknownGenre_ReturnsBadRequest(string genre)
-        {
-            var response = await fixture.CreateAnonymousClient().GetAsync($"/tracks?genre={genre}", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-        }
-
-        [Fact]
-        public async Task GetTracks_GenreQuery_IsCaseInsensitive()
-        {
-            var title = await SeedTrackAsync(Genre.Blues);
-
-            var response = await fixture.CreateAnonymousClient().GetAsync("/tracks?genre=blues&pageSize=100", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<TracksSearchResponse>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Contains(body!.Items, item => item.Track.Title == title);
-        }
-
-        [Fact]
-        public async Task GetTracks_GenreQuery_FiltersByTag()
-        {
-            var title = await SeedTrackAsync(Genre.Ambient);
-            await SeedTrackAsync(Genre.Techno);
-
-            var response = await fixture.CreateAnonymousClient().GetAsync("/tracks?genre=Ambient&pageSize=100", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<TracksSearchResponse>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Contains(body!.Items, item => item.Track.Title == title);
-            Assert.All(body.Items, item => Assert.Contains(Genre.Ambient, item.Track.Tags));
-        }
-    }
-}

backend/Tests/Musify.Api.Tests/Endpoints/ListeningProgressEndpointsTests.cs

@@ -1,109 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Musify.Api.DataTransferObjects.Tracks;
-using Musify.Api.DataTransferObjects.Users;
-using Musify.Domain.Entities;
-using Musify.Infrastructure.Persistence;
-using Xunit;
-using Musify.Api.Tests.TestSupport;
-
-namespace Musify.Api.Tests.Endpoints
-{
-    [Collection(ApiCollection.Name)]
-    public sealed class ListeningProgressEndpointsTests(ApiTestFixture fixture)
-    {
-        private async Task<long> CreateUserAsync()
-        {
-            var userId = Random.Shared.NextInt64(1, long.MaxValue);
-            var response = await fixture.CreateAnonymousClient().PostAsJsonAsync(
-                "/users", new CreateUserRequest(userId, $"user-{userId}", null, null), TestContext.Current.CancellationToken);
-            response.EnsureSuccessStatusCode();
-            return userId;
-        }
-
-        private async Task<Guid> SeedListenAsync(long userId, double durationSeconds)
-        {
-            using var scope = fixture.Services.CreateScope();
-            var database = scope.ServiceProvider.GetRequiredService<Database>();
-            var owner = await database.Users.SingleAsync(u => u.Id == userId, TestContext.Current.CancellationToken);
-            var track = new Track
-            {
-                Title = "Progress track",
-                NormalizedTitle = "PROGRESS TRACK",
-                OwnerUserId = owner.Id,
-                Owner = owner,
-                DurationSeconds = durationSeconds
-            };
-            var listen = new ListeningHistory
-            {
-                UserId = userId,
-                TrackId = track.Id,
-                ListenedAt = DateTime.UtcNow.AddMinutes(-10)
-            };
-            database.Tracks.Add(track);
-            database.ListeningHistories.Add(listen);
-            await database.SaveChangesAsync(TestContext.Current.CancellationToken);
-            return listen.Id;
-        }
-
-        private async Task<ListeningHistory> LoadListenAsync(Guid listenId)
-        {
-            using var scope = fixture.Services.CreateScope();
-            var database = scope.ServiceProvider.GetRequiredService<Database>();
-            return await database.ListeningHistories.AsNoTracking()
-                .SingleAsync(l => l.Id == listenId, TestContext.Current.CancellationToken);
-        }
-
-        [Fact]
-        public async Task PutProgress_Anonymous_ReturnsUnauthorized()
-        {
-            var response = await fixture.CreateAnonymousClient().PutAsJsonAsync(
-                $"/tracks/listens/{Guid.NewGuid()}/progress", new RecordListeningProgressRequest(10), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
-        }
-
-        [Fact]
-        public async Task PutProgress_OwnListen_StoresSecondsAndMarksCounted()
-        {
-            var userId = await CreateUserAsync();
-            var listenId = await SeedListenAsync(userId, durationSeconds: 200);
-
-            var response = await fixture.CreateAuthenticatedClient(userId).PutAsJsonAsync(
-                $"/tracks/listens/{listenId}/progress", new RecordListeningProgressRequest(45), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
-            var stored = await LoadListenAsync(listenId);
-            Assert.Equal(45, stored.PlayedSeconds);
-            Assert.True(stored.IsCounted);
-        }
-
-        [Fact]
-        public async Task PutProgress_OtherUsersListen_ReturnsNotFound()
-        {
-            var ownerId = await CreateUserAsync();
-            var otherId = await CreateUserAsync();
-            var listenId = await SeedListenAsync(ownerId, durationSeconds: 200);
-
-            var response = await fixture.CreateAuthenticatedClient(otherId).PutAsJsonAsync(
-                $"/tracks/listens/{listenId}/progress", new RecordListeningProgressRequest(45), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-            Assert.Null((await LoadListenAsync(listenId)).PlayedSeconds);
-        }
-
-        [Fact]
-        public async Task PutProgress_NegativeSeconds_ReturnsBadRequest()
-        {
-            var userId = await CreateUserAsync();
-            var listenId = await SeedListenAsync(userId, durationSeconds: 200);
-
-            var response = await fixture.CreateAuthenticatedClient(userId).PutAsJsonAsync(
-                $"/tracks/listens/{listenId}/progress", new RecordListeningProgressRequest(-5), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Albums/GetRecentlyListenedAlbumsQueryHandlerTests.cs

@@ -57,25 +57,5 @@ namespace Musify.Application.Tests.Albums
             Assert.False(result.IsError);
             Assert.Equal(2, result.Value.Count);
         }
-
-        [Fact]
-        public async Task Handle_UncountedListens_AreIgnored()
-        {
-            var owner = TestEntities.User();
-            var countedAlbum = TestEntities.Album(owner.Id, "Counted album");
-            var skippedAlbum = TestEntities.Album(owner.Id, "Skipped album");
-            var countedTrack = TestEntities.Track(owner, "In counted");
-            var skippedTrack = TestEntities.Track(owner, "In skipped");
-            await SeedAsync(
-                owner, countedAlbum, skippedAlbum, countedTrack, skippedTrack,
-                new AlbumHasTrack { AlbumId = countedAlbum.Id, TrackId = countedTrack.Id, TrackNumber = 1 },
-                new AlbumHasTrack { AlbumId = skippedAlbum.Id, TrackId = skippedTrack.Id, TrackNumber = 1 },
-                TestEntities.ListeningHistory(owner.Id, countedTrack.Id, DateTime.UtcNow.AddDays(-1), playedSeconds: 120),
-                TestEntities.ListeningHistory(owner.Id, skippedTrack.Id, DateTime.UtcNow, playedSeconds: 1, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetRecentlyListenedAlbumsQuery(owner.Id, Limit: 10), TestContext.Current.CancellationToken);
-
-            Assert.Equal(["Counted album"], result.Value.Select(album => album.Title));
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Genres/GetAvailableGenresQueryHandlerTests.cs

@@ -1,32 +0,0 @@
-using Musify.Application.Genres;
-using Musify.Domain.ValueObjects;
-using Xunit;
-
-namespace Musify.Application.Tests.Genres
-{
-    public sealed class GetAvailableGenresQueryHandlerTests
-    {
-        private static async Task<IReadOnlyList<AvailableGenreResponse>> RunAsync() =>
-            await new GetAvailableGenresQueryHandler().Handle(new GetAvailableGenresQuery(), TestContext.Current.CancellationToken);
-
-        [Fact]
-        public async Task Handle_ReturnsEveryGenre()
-        {
-            var result = await RunAsync();
-
-            Assert.Equal(Enum.GetValues<Genre>(), result.Select(r => r.Genre));
-        }
-
-        [Fact]
-        public async Task Handle_ListsIncompatibleGenresSymmetrically()
-        {
-            var result = await RunAsync();
-
-            var metal = result.Single(r => r.Genre == Genre.Metal);
-            var lofi = result.Single(r => r.Genre == Genre.Lofi);
-            Assert.Contains(Genre.Lofi, metal.IncompatibleWith);
-            Assert.Contains(Genre.Metal, lofi.IncompatibleWith);
-            Assert.Empty(result.Single(r => r.Genre == Genre.Pop).IncompatibleWith);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Genres/GetGenresQueryHandlerTests.cs

@@ -1,69 +0,0 @@
-using Musify.Application.Genres;
-using Musify.Application.Tests.TestSupport;
-using Musify.Domain.Entities;
-using Musify.Domain.ValueObjects;
-using Xunit;
-
-namespace Musify.Application.Tests.Genres
-{
-    public sealed class GetGenresQueryHandlerTests : HandlerTestBase
-    {
-        private GetGenresQueryHandler CreateHandler() => new(Database);
-
-        [Fact]
-        public async Task Handle_NoTracks_ReturnsEmpty()
-        {
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Empty(result);
-        }
-
-        [Fact]
-        public async Task Handle_ReturnsOnlyGenresInUse_MostPopulatedFirst()
-        {
-            var owner = TestEntities.User();
-            var rockA = TestEntities.Track(owner, "Rock A", tags: [Genre.Rock]);
-            var rockB = TestEntities.Track(owner, "Rock B", tags: [Genre.Rock, Genre.Indie]);
-            var jazz = TestEntities.Track(owner, "Jazz", tags: [Genre.Jazz]);
-            await SeedAsync(
-                owner, rockA, rockB, jazz,
-                new UserHasTrack { UserId = owner.Id, TrackId = rockA.Id },
-                new UserHasTrack { UserId = owner.Id, TrackId = rockB.Id },
-                new UserHasTrack { UserId = owner.Id, TrackId = jazz.Id });
-
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Equal(
-                [(Genre.Rock, 2), (Genre.Jazz, 1), (Genre.Indie, 1)],
-                result.Select(r => (r.Genre, r.TrackCount)));
-        }
-
-        [Fact]
-        public async Task Handle_TrackInSeveralLibraries_IsCountedOnce()
-        {
-            var owner = TestEntities.User();
-            var other = TestEntities.User(id: 2, name: "other-user");
-            var track = TestEntities.Track(owner, tags: [Genre.Pop]);
-            await SeedAsync(
-                owner, other, track,
-                new UserHasTrack { UserId = owner.Id, TrackId = track.Id },
-                new UserHasTrack { UserId = other.Id, TrackId = track.Id });
-
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Equal(1, Assert.Single(result).TrackCount);
-        }
-
-        [Fact]
-        public async Task Handle_TrackNotInAnyLibrary_IsIgnored()
-        {
-            var owner = TestEntities.User();
-            var track = TestEntities.Track(owner, tags: [Genre.Metal]);
-            await SeedAsync(owner, track);
-
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Empty(result);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Mixes/GenerateMixesForUserCommandHandlerTests.cs

@@ -72,21 +72,5 @@ namespace Musify.Application.Tests.Mixes
                 .ToListAsync(TestContext.Current.CancellationToken);
             Assert.All(discoveryItems, item => Assert.Equal(unheardTrack.Id, item.TrackId));
         }
-
-        [Fact]
-        public async Task Handle_TrackWithOnlyUncountedListens_IsTreatedAsUnheard()
-        {
-            var user = TestEntities.User();
-            var skipped = TestEntities.Track(user, "Only skipped");
-            await SeedAsync(
-                user, skipped,
-                new UserHasTrack { UserId = user.Id, TrackId = skipped.Id },
-                TestEntities.ListeningHistory(user.Id, skipped.Id, playedSeconds: 3, isCounted: false));
-
-            await CreateHandler().Handle(new GenerateMixesForUserCommand(user.Id), TestContext.Current.CancellationToken);
-
-            var mixes = await Database.Mixes.ToListAsync(TestContext.Current.CancellationToken);
-            Assert.Contains(mixes, mix => mix.Title == "Descubrimiento");
-        }
     }
 }

backend/Tests/Musify.Application.Tests/PlayLists/AddAlbumToPlayListCommandHandlerTests.cs

@@ -1,91 +0,0 @@
-using ErrorOr;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.PlayLists;
-using Musify.Application.Tests.TestSupport;
-using Musify.Domain.Entities;
-using Xunit;
-
-namespace Musify.Application.Tests.PlayLists
-{
-    public sealed class AddAlbumToPlayListCommandHandlerTests : HandlerTestBase
-    {
-        private AddAlbumToPlayListCommandHandler CreateHandler() => new(Database, NoOpLogger<AddAlbumToPlayListCommandHandler>());
-
-        [Fact]
-        public async Task Handle_AddsAlbumTracksInAlbumOrder()
-        {
-            var owner = TestEntities.User();
-            var playList = TestEntities.PlayList(owner.Id);
-            var album = TestEntities.Album(owner.Id);
-            var first = TestEntities.Track(owner, "First");
-            var second = TestEntities.Track(owner, "Second");
-            await SeedAsync(
-                owner, playList, album, first, second,
-                new AlbumHasTrack { AlbumId = album.Id, TrackId = second.Id, TrackNumber = 2 },
-                new AlbumHasTrack { AlbumId = album.Id, TrackId = first.Id, TrackNumber = 1 });
-
-            var result = await CreateHandler().Handle(new AddAlbumToPlayListCommand(owner.Id, playList.Id, album.Id), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            Assert.Equal(2, result.Value.AddedCount);
-            var links = await Database.PlayListHasTracks.OrderBy(link => link.Position).ToListAsync(TestContext.Current.CancellationToken);
-            Assert.Equal([first.Id, second.Id], links.Select(link => link.TrackId));
-            Assert.Equal([0, 1], links.Select(link => link.Position));
-        }
-
-        [Fact]
-        public async Task Handle_SkipsTracksAlreadyInPlayList_AndAppendsAfterThem()
-        {
-            var owner = TestEntities.User();
-            var playList = TestEntities.PlayList(owner.Id);
-            var album = TestEntities.Album(owner.Id);
-            var existing = TestEntities.Track(owner, "Existing");
-            var fresh = TestEntities.Track(owner, "Fresh");
-            await SeedAsync(
-                owner, playList, album, existing, fresh,
-                new AlbumHasTrack { AlbumId = album.Id, TrackId = existing.Id, TrackNumber = 1 },
-                new AlbumHasTrack { AlbumId = album.Id, TrackId = fresh.Id, TrackNumber = 2 },
-                new PlayListHasTrack { PlayListId = playList.Id, TrackId = existing.Id, Position = 4 });
-
-            var result = await CreateHandler().Handle(new AddAlbumToPlayListCommand(owner.Id, playList.Id, album.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(1, result.Value.AddedCount);
-            var link = await Database.PlayListHasTracks.SingleAsync(l => l.TrackId == fresh.Id, TestContext.Current.CancellationToken);
-            Assert.Equal(5, link.Position);
-        }
-
-        [Fact]
-        public async Task Handle_PlayListMissing_ReturnsNotFound()
-        {
-            var result = await CreateHandler().Handle(new AddAlbumToPlayListCommand(1, Guid.NewGuid(), Guid.NewGuid()), TestContext.Current.CancellationToken);
-
-            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
-        }
-
-        [Fact]
-        public async Task Handle_NotOwner_ReturnsUnauthorized()
-        {
-            var owner = TestEntities.User(1, "owner");
-            var stranger = TestEntities.User(2, "stranger");
-            var playList = TestEntities.PlayList(owner.Id);
-            var album = TestEntities.Album(owner.Id);
-            await SeedAsync(owner, stranger, playList, album);
-
-            var result = await CreateHandler().Handle(new AddAlbumToPlayListCommand(stranger.Id, playList.Id, album.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(ErrorType.Unauthorized, result.FirstError.Type);
-        }
-
-        [Fact]
-        public async Task Handle_AlbumMissing_ReturnsNotFound()
-        {
-            var owner = TestEntities.User();
-            var playList = TestEntities.PlayList(owner.Id);
-            await SeedAsync(owner, playList);
-
-            var result = await CreateHandler().Handle(new AddAlbumToPlayListCommand(owner.Id, playList.Id, Guid.NewGuid()), TestContext.Current.CancellationToken);
-
-            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Shared/TrackApplicationResponseTests.cs

@@ -17,17 +17,6 @@ namespace Musify.Application.Tests.Shared
             Assert.Equal("The Owner", response.Artist);
             Assert.Equal(owner.Id, response.OwnerUserId);
             Assert.Equal(3, response.ListensCount);
-            Assert.False(response.IsExplicit);
-        }
-
-        [Fact]
-        public void FromEntity_CopiesExplicitFlag()
-        {
-            var track = TestEntities.Track(TestEntities.User(), isExplicit: true);
-
-            var response = TrackApplicationResponse.FromEntity(track, listensCount: 0);
-
-            Assert.True(response.IsExplicit);
         }
     }
 }

backend/Tests/Musify.Application.Tests/TestSupport/TestEntities.cs

@@ -56,8 +56,7 @@ namespace Musify.Application.Tests.TestSupport
             TrackPictures? pictures = null,
             TrackAudio? audio = null,
             LifeCycleStatus lifeCycleStatus = LifeCycleStatus.Active,
-            IEnumerable<Genre>? tags = null,
+            IEnumerable<Genre>? tags = null)
-            bool isExplicit = false)
         {
             var track = new Track
             {
@@ -65,7 +64,6 @@ namespace Musify.Application.Tests.TestSupport
                 NormalizedTitle = title.ToUpperInvariant(),
                 DurationSeconds = durationSeconds,
                 LifeCycleStatus = lifeCycleStatus,
-                IsExplicit = isExplicit,
                 OwnerUserId = owner.Id,
                 Owner = owner,
                 Pictures = pictures ?? ProcessedPictures(),
@@ -179,16 +177,12 @@ namespace Musify.Application.Tests.TestSupport
         public static ListeningHistory ListeningHistory(
             long userId,
             Guid trackId,
-            DateTime? listenedAt = null,
+            DateTime? listenedAt = null) =>
-            double? playedSeconds = null,
-            bool isCounted = true) =>
             new()
             {
                 UserId = userId,
                 TrackId = trackId,
-                ListenedAt = listenedAt ?? DateTime.UtcNow,
+                ListenedAt = listenedAt ?? DateTime.UtcNow
-                PlayedSeconds = playedSeconds,
-                IsCounted = isCounted
             };
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/CreateTrackCommandHandlerTests.cs

@@ -58,26 +58,6 @@ namespace Musify.Application.Tests.Tracks
             Assert.Equal(ProcessingStatus.Pending, stored.Audio.TranscodeStatus);
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task Handle_StoresExplicitFlag(bool isExplicit)
-        {
-            var user = TestEntities.User();
-            var (picture, audio) = SeedIntents(user.Id);
-            await SeedAsync(user, picture, audio);
-
-            var command = new CreateTrackCommand(user.Id, "My Song", picture.Id, audio.Id, [Genre.Pop], isExplicit);
-
-            var result = await CreateHandler().Handle(command, TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            Assert.Equal(isExplicit, result.Value.IsExplicit);
-            var stored = await Database.Tracks.FindAsync([result.Value.Id], TestContext.Current.CancellationToken);
-            Assert.NotNull(stored);
-            Assert.Equal(isExplicit, stored.IsExplicit);
-        }
-
         [Fact]
         public async Task Handle_NoTags_ReturnsValidationError()
         {

backend/Tests/Musify.Application.Tests/Tracks/DeleteStaleUncountedListensCommandHandlerTests.cs

@@ -1,32 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Tests.TestSupport;
-using Musify.Application.Tracks;
-using Xunit;
-
-namespace Musify.Application.Tests.Tracks
-{
-    public sealed class DeleteStaleUncountedListensCommandHandlerTests : HandlerTestBase
-    {
-        private DeleteStaleUncountedListensCommandHandler CreateHandler() =>
-            new(Database, NoOpLogger<DeleteStaleUncountedListensCommandHandler>());
-
-        [Fact]
-        public async Task Handle_DeletesOnlyOldUncountedListens()
-        {
-            var owner = TestEntities.User();
-            var track = TestEntities.Track(owner);
-            var oldUncounted = TestEntities.ListeningHistory(owner.Id, track.Id, DateTime.UtcNow.AddDays(-9), playedSeconds: 2, isCounted: false);
-            var oldCounted = TestEntities.ListeningHistory(owner.Id, track.Id, DateTime.UtcNow.AddDays(-9), playedSeconds: 100);
-            var recentUncounted = TestEntities.ListeningHistory(owner.Id, track.Id, DateTime.UtcNow.AddDays(-2), playedSeconds: 2, isCounted: false);
-            await SeedAsync(owner, track, oldUncounted, oldCounted, recentUncounted);
-
-            var deleted = await CreateHandler().Handle(new DeleteStaleUncountedListensCommand(), TestContext.Current.CancellationToken);
-
-            Assert.Equal(1, deleted);
-            var remaining = await Database.ListeningHistories.Select(l => l.Id).ToListAsync(TestContext.Current.CancellationToken);
-            Assert.DoesNotContain(oldUncounted.Id, remaining);
-            Assert.Contains(oldCounted.Id, remaining);
-            Assert.Contains(recentUncounted.Id, remaining);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Tracks/GetListeningHistoryQueryHandlerTests.cs

@@ -35,21 +35,5 @@ namespace Musify.Application.Tests.Tracks
 
             Assert.Empty(result);
         }
-
-        [Fact]
-        public async Task Handle_UncountedListens_AreIgnored()
-        {
-            var owner = TestEntities.User();
-            var counted = TestEntities.Track(owner, "Counted");
-            var skipped = TestEntities.Track(owner, "Skipped");
-            await SeedAsync(
-                owner, counted, skipped,
-                TestEntities.ListeningHistory(owner.Id, counted.Id, DateTime.UtcNow.AddMinutes(-5), playedSeconds: 90),
-                TestEntities.ListeningHistory(owner.Id, skipped.Id, DateTime.UtcNow, playedSeconds: 2, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetListeningHistoryQuery(owner.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(["Counted"], result.Select(track => track.Title));
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/GetTrackByIdQueryHandlerTests.cs

@@ -33,21 +33,5 @@ namespace Musify.Application.Tests.Tracks
 
             Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
         }
-
-        [Fact]
-        public async Task Handle_ListensCount_OnlyCountsCountedListens()
-        {
-            var owner = TestEntities.User();
-            var track = TestEntities.Track(owner);
-            await SeedAsync(
-                owner, track,
-                TestEntities.ListeningHistory(owner.Id, track.Id, playedSeconds: 100),
-                TestEntities.ListeningHistory(owner.Id, track.Id, playedSeconds: 100),
-                TestEntities.ListeningHistory(owner.Id, track.Id, playedSeconds: 1, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetTrackByIdQuery(track.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(2, result.Value.ListensCount);
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/GetTrackStreamQueryHandlerTests.cs

@@ -45,9 +45,6 @@ namespace Musify.Application.Tests.Tracks
             var history = Assert.Single(await Database.ListeningHistories.ToListAsync(TestContext.Current.CancellationToken));
             Assert.Equal(owner.Id, history.UserId);
             Assert.Equal(track.Id, history.TrackId);
-            Assert.Equal(history.Id, result.Value.ListenId);
-            Assert.False(history.IsCounted);
-            Assert.Null(history.PlayedSeconds);
         }
 
         [Fact]

backend/Tests/Musify.Application.Tests/Tracks/GetTracksQueryHandlerTests.cs

@@ -1,6 +1,5 @@
 using Musify.Application.Tests.TestSupport;
 using Musify.Application.Tracks;
-using Musify.Domain.ValueObjects;
 using Xunit;
 
 namespace Musify.Application.Tests.Tracks
@@ -44,23 +43,5 @@ namespace Musify.Application.Tests.Tracks
             var item = Assert.Single(result.Value.Items);
             Assert.Equal("Bohemian Rhapsody", item.Track.Title);
         }
-
-        [Fact]
-        public async Task Handle_GenreFilter_ReturnsOnlyTracksWithThatTag()
-        {
-            var owner = TestEntities.User();
-            var rock = TestEntities.Track(owner, "Loud", tags: [Genre.Rock, Genre.Indie]);
-            var jazz = TestEntities.Track(owner, "Smooth", tags: [Genre.Jazz]);
-            await SeedAsync(
-                owner, rock, jazz,
-                new Musify.Domain.Entities.UserHasTrack { UserId = owner.Id, TrackId = rock.Id },
-                new Musify.Domain.Entities.UserHasTrack { UserId = owner.Id, TrackId = jazz.Id });
-
-            var result = await CreateHandler().Handle(new GetTracksQuery(null, 1, 10, Genre.Indie), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            var item = Assert.Single(result.Value.Items);
-            Assert.Equal("Loud", item.Track.Title);
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/RecordListeningProgressCommandHandlerTests.cs

@@ -1,127 +0,0 @@
-using ErrorOr;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Tests.TestSupport;
-using Musify.Application.Tracks;
-using Musify.Domain.Entities;
-using Xunit;
-
-namespace Musify.Application.Tests.Tracks
-{
-    public sealed class RecordListeningProgressCommandHandlerTests : HandlerTestBase
-    {
-        private RecordListeningProgressCommandHandler CreateHandler() => new(Database);
-
-        private async Task<ListeningHistory> ReloadAsync(Guid id) =>
-            await Database.ListeningHistories.AsNoTracking()
-                .SingleAsync(l => l.Id == id, TestContext.Current.CancellationToken);
-
-        private async Task<(User User, ListeningHistory Listen)> SeedListenAsync(
-            double durationSeconds, DateTime listenedAt)
-        {
-            var user = TestEntities.User();
-            var track = TestEntities.Track(user, durationSeconds: durationSeconds);
-            var listen = TestEntities.ListeningHistory(user.Id, track.Id, listenedAt, isCounted: false);
-            await SeedAsync(user, track, listen);
-            return (user, listen);
-        }
-
-        [Fact]
-        public async Task Handle_BelowThreshold_StoresSecondsWithoutCounting()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            var result = await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 10), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            var stored = await ReloadAsync(listen.Id);
-            Assert.Equal(10, stored.PlayedSeconds);
-            Assert.False(stored.IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_ReachesThirtySeconds_MarksAsCounted()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 30), TestContext.Current.CancellationToken);
-
-            Assert.True((await ReloadAsync(listen.Id)).IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_ShortTrack_CountsAtHalfDuration()
-        {
-            var (user, listen) = await SeedListenAsync(20, DateTime.UtcNow.AddSeconds(-60));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 10), TestContext.Current.CancellationToken);
-
-            Assert.True((await ReloadAsync(listen.Id)).IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_LowerValueThanStored_KeepsHighest()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-            var handler = CreateHandler();
-
-            await handler.Handle(new RecordListeningProgressCommand(user.Id, listen.Id, 40), TestContext.Current.CancellationToken);
-            await handler.Handle(new RecordListeningProgressCommand(user.Id, listen.Id, 15), TestContext.Current.CancellationToken);
-
-            var stored = await ReloadAsync(listen.Id);
-            Assert.Equal(40, stored.PlayedSeconds);
-            Assert.True(stored.IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_MoreThanElapsedClock_IsCappedToElapsedTime()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-20));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 150), TestContext.Current.CancellationToken);
-
-            var stored = await ReloadAsync(listen.Id);
-            Assert.InRange(stored.PlayedSeconds!.Value, 24, 27);
-        }
-
-        [Fact]
-        public async Task Handle_MoreThanTrackDuration_IsCappedToDuration()
-        {
-            var (user, listen) = await SeedListenAsync(50, DateTime.UtcNow.AddMinutes(-30));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 900), TestContext.Current.CancellationToken);
-
-            Assert.Equal(52, (await ReloadAsync(listen.Id)).PlayedSeconds);
-        }
-
-        [Fact]
-        public async Task Handle_OtherUsersListen_ReturnsNotFound()
-        {
-            var (_, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            var result = await CreateHandler().Handle(
-                new RecordListeningProgressCommand(long.MaxValue, listen.Id, 10), TestContext.Current.CancellationToken);
-
-            Assert.True(result.IsError);
-            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
-        }
-
-        [Theory]
-        [InlineData(-1)]
-        [InlineData(double.NaN)]
-        [InlineData(double.PositiveInfinity)]
-        public async Task Handle_InvalidSeconds_ReturnsValidationError(double seconds)
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            var result = await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, seconds), TestContext.Current.CancellationToken);
-
-            Assert.Equal(ErrorType.Validation, result.FirstError.Type);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Users/GetListeningStatsQueryHandlerTests.cs

@@ -40,37 +40,6 @@ namespace Musify.Application.Tests.Users
             Assert.Equal(500, result.SecondsThisWeek);
         }
 
-        [Fact]
-        public async Task Handle_PlayedSeconds_SumsPlayedTimeInsteadOfDuration()
-        {
-            var user = TestEntities.User();
-            var track = TestEntities.Track(user, durationSeconds: 200);
-            await SeedAsync(
-                user, track,
-                TestEntities.ListeningHistory(user.Id, track.Id, playedSeconds: 200),
-                TestEntities.ListeningHistory(user.Id, track.Id, playedSeconds: 12, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetListeningStatsQuery(user.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(212, result.SecondsThisWeek);
-        }
-
-        [Fact]
-        public async Task Handle_UncountedListens_AreExcludedFromTracksAndStreak()
-        {
-            var user = TestEntities.User();
-            var track = TestEntities.Track(user);
-            await SeedAsync(
-                user, track,
-                TestEntities.ListeningHistory(user.Id, track.Id, playedSeconds: 3, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetListeningStatsQuery(user.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(0, result.TracksThisWeek);
-            Assert.Equal(0, result.StreakDays);
-            Assert.Equal(3, result.SecondsThisWeek);
-        }
-
         [Fact]
         public async Task Handle_ListenedTodayAndYesterday_StreakIsTwo()
         {

backend/Tests/Musify.Application.Tests/Users/GetUserFollowersQueryHandlerTests.cs

@@ -1,95 +0,0 @@
-using ErrorOr;
-using Musify.Application.Shared;
-using Musify.Application.Tests.TestSupport;
-using Musify.Application.Users;
-using Musify.Application.Users.Responses;
-using Musify.Domain.Entities;
-using Xunit;
-
-namespace Musify.Application.Tests.Users
-{
-    public sealed class GetUserFollowersQueryHandlerTests : HandlerTestBase
-    {
-        private GetUserFollowersQueryHandler CreateHandler() => new(Database);
-
-        private async Task<ErrorOr<PaginatedResponse<UserSummaryResponse>>> Send(long? viewerId, long userId) =>
-            await CreateHandler().Handle(new GetUserFollowersQuery(viewerId, userId, 1, 20), TestContext.Current.CancellationToken);
-
-        [Fact]
-        public async Task Handle_OwnProfile_ReturnsFollowers()
-        {
-            var user = TestEntities.User(1, "user");
-            var follower = TestEntities.User(2, "follower");
-            await SeedAsync(user, follower, new UserFollow { FollowerId = follower.Id, FollowedId = user.Id });
-
-            var result = await Send(user.Id, user.Id);
-
-            Assert.False(result.IsError);
-            var item = Assert.Single(result.Value.Items);
-            Assert.Equal(follower.Id, item.Id);
-            Assert.False(item.IsFollowedByViewer);
-        }
-
-        [Fact]
-        public async Task Handle_MutualFollow_ReturnsFollowersWithViewerFollowState()
-        {
-            var viewer = TestEntities.User(1, "viewer");
-            var user = TestEntities.User(2, "user");
-            var other = TestEntities.User(3, "other");
-            await SeedAsync(
-                viewer, user, other,
-                new UserFollow { FollowerId = viewer.Id, FollowedId = user.Id },
-                new UserFollow { FollowerId = user.Id, FollowedId = viewer.Id },
-                new UserFollow { FollowerId = other.Id, FollowedId = user.Id },
-                new UserFollow { FollowerId = viewer.Id, FollowedId = other.Id });
-
-            var result = await Send(viewer.Id, user.Id);
-
-            Assert.False(result.IsError);
-            Assert.Equal(2, result.Value.TotalItemCount);
-            Assert.All(result.Value.Items, item => Assert.Equal(item.Id == other.Id, item.IsFollowedByViewer));
-        }
-
-        [Fact]
-        public async Task Handle_ViewerFollowsButNotFollowedBack_ReturnsForbidden()
-        {
-            var viewer = TestEntities.User(1, "viewer");
-            var user = TestEntities.User(2, "user");
-            await SeedAsync(viewer, user, new UserFollow { FollowerId = viewer.Id, FollowedId = user.Id });
-
-            var result = await Send(viewer.Id, user.Id);
-
-            Assert.Equal(ErrorType.Forbidden, result.FirstError.Type);
-        }
-
-        [Fact]
-        public async Task Handle_FollowedByUserButNotFollowingBack_ReturnsForbidden()
-        {
-            var viewer = TestEntities.User(1, "viewer");
-            var user = TestEntities.User(2, "user");
-            await SeedAsync(viewer, user, new UserFollow { FollowerId = user.Id, FollowedId = viewer.Id });
-
-            var result = await Send(viewer.Id, user.Id);
-
-            Assert.Equal(ErrorType.Forbidden, result.FirstError.Type);
-        }
-
-        [Fact]
-        public async Task Handle_Anonymous_ReturnsForbidden()
-        {
-            await SeedAsync(TestEntities.User(1, "user"));
-
-            var result = await Send(null, 1);
-
-            Assert.Equal(ErrorType.Forbidden, result.FirstError.Type);
-        }
-
-        [Fact]
-        public async Task Handle_UserMissing_ReturnsNotFound()
-        {
-            var result = await Send(1, 404);
-
-            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Users/GetUserFollowingQueryHandlerTests.cs

@@ -1,75 +0,0 @@
-using ErrorOr;
-using Musify.Application.Tests.TestSupport;
-using Musify.Application.Users;
-using Musify.Domain.Entities;
-using Xunit;
-
-namespace Musify.Application.Tests.Users
-{
-    public sealed class GetUserFollowingQueryHandlerTests : HandlerTestBase
-    {
-        private GetUserFollowingQueryHandler CreateHandler() => new(Database);
-
-        [Fact]
-        public async Task Handle_Anonymous_ReturnsFollowedUsers()
-        {
-            var user = TestEntities.User(1, "user");
-            var followedA = TestEntities.User(2, "followedA");
-            var followedB = TestEntities.User(3, "followedB");
-            await SeedAsync(
-                user, followedA, followedB,
-                new UserFollow { FollowerId = user.Id, FollowedId = followedA.Id },
-                new UserFollow { FollowerId = user.Id, FollowedId = followedB.Id });
-
-            var result = await CreateHandler().Handle(new GetUserFollowingQuery(null, user.Id, 1, 20), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            Assert.Equal(2, result.Value.TotalItemCount);
-            Assert.All(result.Value.Items, item => Assert.False(item.IsFollowedByViewer));
-        }
-
-        [Fact]
-        public async Task Handle_Viewer_MarksUsersTheViewerFollows()
-        {
-            var viewer = TestEntities.User(1, "viewer");
-            var user = TestEntities.User(2, "user");
-            var followedA = TestEntities.User(3, "followedA");
-            var followedB = TestEntities.User(4, "followedB");
-            await SeedAsync(
-                viewer, user, followedA, followedB,
-                new UserFollow { FollowerId = user.Id, FollowedId = followedA.Id },
-                new UserFollow { FollowerId = user.Id, FollowedId = followedB.Id },
-                new UserFollow { FollowerId = viewer.Id, FollowedId = followedA.Id });
-
-            var result = await CreateHandler().Handle(new GetUserFollowingQuery(viewer.Id, user.Id, 1, 20), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            Assert.All(result.Value.Items, item => Assert.Equal(item.Id == followedA.Id, item.IsFollowedByViewer));
-        }
-
-        [Fact]
-        public async Task Handle_Pagination_ReturnsRequestedPage()
-        {
-            await SeedAsync(
-                TestEntities.User(1, "user"), TestEntities.User(2, "a"), TestEntities.User(3, "b"), TestEntities.User(4, "c"),
-                new UserFollow { FollowerId = 1, FollowedId = 2 },
-                new UserFollow { FollowerId = 1, FollowedId = 3 },
-                new UserFollow { FollowerId = 1, FollowedId = 4 });
-
-            var result = await CreateHandler().Handle(new GetUserFollowingQuery(null, 1, 2, 2), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            Assert.Single(result.Value.Items);
-            Assert.Equal(3, result.Value.TotalItemCount);
-            Assert.False(result.Value.HasNextPage);
-        }
-
-        [Fact]
-        public async Task Handle_UserMissing_ReturnsNotFound()
-        {
-            var result = await CreateHandler().Handle(new GetUserFollowingQuery(null, 404, 1, 20), TestContext.Current.CancellationToken);
-
-            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Users/GetUserProfileQueryHandlerTests.cs

@@ -30,46 +30,6 @@ namespace Musify.Application.Tests.Users
             Assert.Equal(1, result.Value.FollowingCount);
         }
 
-        [Fact]
-        public async Task Handle_MutualFollow_ViewerCanSeeFollowersAndIsFollowing()
-        {
-            var viewer = TestEntities.User(1, "viewer");
-            var user = TestEntities.User(2, "user");
-            await SeedAsync(
-                viewer, user,
-                new UserFollow { FollowerId = viewer.Id, FollowedId = user.Id },
-                new UserFollow { FollowerId = user.Id, FollowedId = viewer.Id });
-
-            var result = await CreateHandler().Handle(new GetUserProfileQuery(user.Id, viewer.Id), TestContext.Current.CancellationToken);
-
-            Assert.True(result.Value.IsFollowing);
-            Assert.True(result.Value.CanViewFollowers);
-        }
-
-        [Fact]
-        public async Task Handle_OneWayFollow_ViewerCannotSeeFollowers()
-        {
-            var viewer = TestEntities.User(1, "viewer");
-            var user = TestEntities.User(2, "user");
-            await SeedAsync(viewer, user, new UserFollow { FollowerId = viewer.Id, FollowedId = user.Id });
-
-            var result = await CreateHandler().Handle(new GetUserProfileQuery(user.Id, viewer.Id), TestContext.Current.CancellationToken);
-
-            Assert.True(result.Value.IsFollowing);
-            Assert.False(result.Value.CanViewFollowers);
-        }
-
-        [Fact]
-        public async Task Handle_OwnProfile_CanSeeFollowersButIsNotFollowing()
-        {
-            await SeedAsync(TestEntities.User(1, "user"));
-
-            var result = await CreateHandler().Handle(new GetUserProfileQuery(1, 1), TestContext.Current.CancellationToken);
-
-            Assert.False(result.Value.IsFollowing);
-            Assert.True(result.Value.CanViewFollowers);
-        }
-
         [Fact]
         public async Task Handle_UserMissing_ReturnsNotFound()
         {

backend/Tests/Musify.Application.Tests/Users/GetUsersQueryHandlerTests.cs

@@ -1,6 +1,5 @@
 using Musify.Application.Tests.TestSupport;
 using Musify.Application.Users;
-using Musify.Domain.Entities;
 using Xunit;
 
 namespace Musify.Application.Tests.Users
@@ -31,18 +30,5 @@ namespace Musify.Application.Tests.Users
             var user = Assert.Single(result.Value.Items);
             Assert.Equal(1, user.Id);
         }
-
-        [Fact]
-        public async Task Handle_Viewer_MarksFollowedUsers()
-        {
-            await SeedAsync(
-                TestEntities.User(1, "viewer"), TestEntities.User(2, "alice"), TestEntities.User(3, "bob"),
-                new UserFollow { FollowerId = 1, FollowedId = 2 });
-
-            var result = await CreateHandler().Handle(new GetUsersQuery(PageNumber: 1, PageSize: 10, UsernameSearch: null, ViewerId: 1), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            Assert.All(result.Value.Items, item => Assert.Equal(item.Id == 2, item.IsFollowedByViewer));
-        }
     }
 }

backend/Tests/Musify.Infrastructure.Tests/Persistence/AuditableEntityInterceptorTests.cs

@@ -1,4 +1,3 @@
-using Microsoft.EntityFrameworkCore;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.Tests.TestSupport;
 using Xunit;
@@ -44,11 +43,6 @@ namespace Musify.Infrastructure.Tests.Persistence
             Assert.Equal(originalCreatedAt, user.CreatedAt);
             Assert.True(user.UpdatedAt > originalCreatedAt,
                 $"original-created-at={originalCreatedAt:O}, final-updated-at={user.UpdatedAt:O}");
-
-            await using var reader = fixture.CreateDatabase();
-            var stored = await reader.Users.SingleAsync(u => u.Id == user.Id, TestContext.Current.CancellationToken);
-            Assert.True(stored.UpdatedAt > stored.CreatedAt,
-                $"stored-created-at={stored.CreatedAt:O}, stored-updated-at={stored.UpdatedAt:O}");
         }
     }
 }

deploy/.env.prod.example

@@ -7,8 +7,8 @@
 #      subdomains),
 #   2. replace every CHANGE_ME with a strong random value
 #      (`openssl rand -hex 24`),
-#   3. point each domain below at the server and add its vhost to the shared
+#   3. point each *_DOMAIN below at the server, proxied/TLS-terminated the
-#      edge (Infrastructure's edge/conf.d).
+#      same way.
 #
 # Requires ../../../Infrastructure running first, on the same Docker host,
 # with its own `infra-net` network already created. See
@@ -18,9 +18,14 @@
 DOTNET_ENVIRONMENT=Production
 
 # --- Domains -------------------------------------------------------------
-# Public URLs. They must match the vhosts of the shared edge nginx
+# Each *_DOMAIN drives its own nginx vhost (deploy/nginx/templates); the
-# (Infrastructure's edge/conf.d), which is what serves them; the domains are
+# PUBLIC_*_URL/S3_PUBLIC_URL below must agree with it (https://<domain>).
-# independent, they don't need to share a root.
+WEB_DOMAIN=musify.example.com
+API_DOMAIN=musifyapi.example.com
+STREAM_DOMAIN=musifystream.example.com
+AUTH_DOMAIN=auth.example.com
+S3_DOMAIN=s3.example.com
+
 PUBLIC_WEB_URL=https://musify.example.com
 PUBLIC_API_URL=https://musifyapi.example.com
 PUBLIC_STREAM_URL=https://musifystream.example.com
@@ -66,4 +71,6 @@ SESSION_SECRET=CHANGE_ME
 AUTH_ALLOW_INSECURE_HTTP=false
 
 # --- Misc --------------------------------------------------------------------
-AUTH_REQUIRE_HTTPS=true
+AUTH_REQUIRE_HTTPS=true
+# Largest request body nginx accepts (audio uploads go through the web player).
+MAX_UPLOAD_SIZE=1024m

deploy/README.md

@@ -13,7 +13,7 @@ wherever you actually cloned it.
 |---|---|
 | `compose.yml` | Musify's own services, including the one-shot bootstrap jobs. No published ports, no domains, no environment-specific values. |
 | `compose.dev.yml` | Development overlay: publishes Musify's ports to the host. |
-| `compose.prod.yml` | Production overlay: joins Infrastructure's `infra-net` network. |
+| `compose.prod.yml` | Production overlay: adds the nginx edge and joins Infrastructure's `infra-net` network. |
 | `.env` / `.env.prod` | The values compose interpolates. Not versioned; templates in `.env.example` / `.env.prod.example`. |
 
 The four applications (`api`, `worker`, `gateway`, `web-player`) sit behind
@@ -113,26 +113,31 @@ SeaweedFS is done from the `Infrastructure` repo instead.
 
 ## Production
 
-Musify doesn't run its own nginx: the shared edge in Infrastructure
+On a server with a domain:
-(`edge/`) owns host ports 80/443, terminates TLS for every project's domains
-and proxies to Musify's containers over `infra-net`. On a server with
-domains:
 
 1. Bring up the `Infrastructure` repo first, with its own `.env.prod` filled
    in. It creates the `infra-net` network this stack joins.
-2. Bring up its `edge/` (see Infrastructure's README) and add Musify's
+2. From this repository's root:
-   vhosts and certificate there (`edge/conf.d/musify.conf`). The five
-   public hostnames (web, api, stream, auth, s3) are independent: they
-   don't need to share a root domain.
-3. From this repository's root:
 
 ```sh
 cp deploy/.env.prod.example deploy/.env.prod
 ```
 
-   Replace every `*.example.com` with your domains (they must match the
+Fill it in:
-   edge's vhosts) and every `CHANGE_ME` with a random value
+
-   (`openssl rand -hex 24`). `chmod 600 deploy/.env.prod`.
+1. Replace every `*.example.com` with your actual domains and every
+   `CHANGE_ME` with a random value (`openssl rand -hex 24`). Each of
+   `WEB_DOMAIN`/`API_DOMAIN`/`STREAM_DOMAIN`/`AUTH_DOMAIN`/`S3_DOMAIN` is
+   independent — they don't need to share a root domain (e.g.
+   `musify.example.com` + `musifyapi.example.com`, or sibling subdomains of
+   a domain whose DNS provider doesn't allow multi-level subdomains).
+   `chmod 600 deploy/.env.prod`.
+2. Drop **`deploy/nginx/certs/origin.pem` and `origin.key`**, the origin
+   certificate nginx serves. The stack assumes Cloudflare in *Full (strict)*
+   mode in front of it, so a Cloudflare Origin Certificate is enough; any
+   certificate valid for the five hostnames works.
+3. Point the five `*_DOMAIN` values at the server, proxied and
+   TLS-terminated the same way.
 
 Then:
 
@@ -141,45 +146,68 @@ docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compo
 docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
 ```
 
-The first command starts Musify's bootstrap jobs (`zitadel-init` and
+The first command starts Musify's bootstrap jobs and the nginx edge; the
-`seaweedfs-init` reach Zitadel/SeaweedFS through the public `auth.`/`s3.`
+second builds and starts the applications, already wired to the OIDC client
-URLs, so the edge has to be serving them by then); the second builds and
+ids the first one produced. Both are idempotent, so running them again
-starts the applications, already wired to the OIDC client ids the first one
+deploys a new version (`... --profile apps up -d --build` alone is enough for
-produced. Both are idempotent, so running them again deploys a new version
+an update once the stack already exists).
-(`... --profile apps up -d --build` alone is enough for an update once the
-stack already exists).
 
-Nothing in this stack publishes a port; everything is reachable only on the
+Only nginx publishes ports (80/443). Every other Musify service, and all of
-internal `infra-net` network, through the edge.
+Infrastructure's, is reachable only on the internal `infra-net` network.
 
 ### Continuous deployment
 
 `.gitea/workflows/ci-cd.yml` runs the backend and web-player checks on every
 push/PR, and on a successful push to `master` deploys automatically. The
-deploy job runs on `gitea-runner`, the self-hosted Gitea Actions runner on
+deploy job runs on `gitea-runner`, the existing self-hosted Gitea Actions
-the production host (`~/gitea/docker-compose.yml`), configured by
+runner on the production host itself (`gitea.ikerdemo.cat`, in
-`~/gitea/runner-data/config.yaml` (`CONFIG_FILE`): job containers are pinned
+`~/gitea/docker-compose.yml`), which also carries a `production:host`
-to the `gitea_gitea` network so `actions/checkout` can resolve `gitea`,
+label registered directly in `~/gitea/runner-data/.runner` (act_runner
-`ubuntu-latest` is `node:22` (JS actions need Node inside the job
+reads `labels` from that file on every start, not from
-container), and a `production:host` label runs steps natively.
+`GITEA_RUNNER_LABELS`, once a runner is already registered). Running in
-
+native mode means the label's steps execute inside the runner container
-Native mode means the label's steps execute inside the runner container
+itself rather than spinning up a fresh one — that container has
-itself rather than a fresh one. That container has `/var/run/docker.sock`
+`/var/run/docker.sock` mounted, so `docker`/`docker compose` there still
-mounted, so `docker`/`docker compose` there still control the host's real
+control the host's real Docker daemon (sibling containers, "Docker outside
-Docker daemon (sibling containers, "Docker outside of Docker"). Its compose
+of Docker"). Its compose service also bind-mounts `/home/ubuntu/deploys`
-service also bind-mounts `/home/ubuntu/deploys` into itself at the *same*
+into itself at the *same* path, which matters because compose's own
-path, which matters because compose's own relative bind mounts (`./keys`)
+relative bind mounts (`./keys`, `./nginx/...`) are resolved by the host
-are resolved by the host daemon against that literal path; mounting it
+daemon against that literal path — mounting it anywhere else would silently
-anywhere else would silently bind the wrong (empty) directory.
+bind the wrong (empty) directory.
 
 `DEPLOY_PATH` (hardcoded in the workflow as `/home/ubuntu/deploys/musify`)
 is a persistent clone on that host, reused instead of a fresh checkout each
 run since `deploy/.env.prod` is untracked and only lives there.
 `/home/ubuntu/deploys/SharedServices` is the sibling clone of the
-`Infrastructure` repo (shared services + `edge/`), already running; its
+`Infrastructure`/`SharedServices` repo, already running (`infra-net`
-`.env.prod` shares the Postgres/RabbitMQ/S3 credentials with Musify's own
+created); its `.env.prod` shares the Postgres/RabbitMQ/S3 credentials with
-`deploy/.env.prod` by design (see that repo's README). The edge is deployed
+Musify's own `deploy/.env.prod` by design (see that repo's README).
-from that repo, not from this pipeline.
+
+**Pending DNS on the registered domains:** `deploy/.env.prod`'s five
+`*_DOMAIN` values are set (`musify.ikerdemo.cat`, `musifyapi.ikerdemo.cat`,
+`musifystream.ikerdemo.cat`, `auth.ikerdemo.cat`, `s3.ikerdemo.cat` —
+siblings, not `api.musify.ikerdemo.cat`, because the DNS provider here
+doesn't allow multi-level subdomains), but no DNS record points any of them
+at the server yet, so:
+
+- `zitadel-init` and `seaweedfs-init` (they verify themselves through the
+  public `auth.`/`s3.` URLs) fail every deploy until those two resolve and
+  are actually reachable — the workflow tolerates this on purpose, see its
+  comments. Until then, `api`/`worker` build and start but can't do
+  anything OIDC- or storage-dependent (`AUTH_CLIENT_ID`/`WEB_CLIENT_ID`/
+  `WEB_CLIENT_SECRET` in `.env.prod` stay blank); `gateway`/`web-player`
+  are unaffected.
+- The `nginx` service from `compose.prod.yml` is intentionally **not**
+  brought up by the deploy job: it would try to publish host ports 80/443,
+  which `gitea-nginx` already owns for `gitea.ikerdemo.cat` (certbot). Once
+  the five DNS records above exist, merge Musify's vhosts
+  (`deploy/nginx/templates`) into `~/gitea/nginx/conf.d` instead — same
+  nginx, additional `server_name` blocks proxying to Musify's containers
+  over `infra-net` — rather than running a second nginx that would conflict
+  on those ports. That also needs a certificate valid for the 5 hostnames
+  (the existing setup uses certbot/Let's Encrypt, not the Cloudflare Origin
+  cert `compose.prod.yml`'s nginx assumes — reconcile whichever way when
+  that's set up).
 
 ---
 
@@ -190,9 +218,13 @@ deploy/
 ├─ compose.yml                     # Musify's own services: wait-for-postgres, keys-init,
 │                                   #   migrate, seaweedfs-init, zitadel-init, api/worker/gateway/web-player
 ├─ compose.dev.yml                 # dev overlay: host ports
-├─ compose.prod.yml                # prod overlay: joins infra-net
+├─ compose.prod.yml                # prod overlay: nginx edge, joins infra-net
 ├─ .env.example / .env.prod.example
-└─ keys/                           # RS256 stream-ticket key pair (generated)
+├─ keys/                           # RS256 stream-ticket key pair (generated)
+└─ nginx/
+   ├─ templates/default.conf.template # vhosts, rendered with the domain by envsubst
+   ├─ snippets/proxy.conf             # proxy headers shared by every vhost
+   └─ certs/                          # origin.pem + origin.key (not versioned)
 ```
 
 The application images are built from `backend/Musify.*.Dockerfile` (build

deploy/compose.prod.yml

@@ -1,10 +1,11 @@
 name: musify-prod
 
-# Production overlay: joins Infrastructure's shared `infra-net` network so
+# Production overlay: adds the nginx edge and joins Infrastructure's shared
-# this project's containers can reach Postgres, Zitadel, SeaweedFS, RabbitMQ
+# `infra-net` network so this project's containers can reach Postgres,
-# and Jaeger by container name, and so the shared edge nginx (Infrastructure's
+# Zitadel, SeaweedFS, RabbitMQ and Jaeger by container name. None of them
-# `edge/`, which owns host ports 80/443 and terminates TLS for every domain)
+# run as part of this compose project anymore (see
-# can reach api, gateway and web-player. Nothing here publishes a port.
+# ../../../Infrastructure/README.md, which must already be up). Nothing but
+# nginx publishes a port; every other service is reachable only on infra-net.
 #
 #   docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml up -d
 #   docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
@@ -19,3 +20,35 @@ services:
   zitadel-init:
     volumes:
       - ./.env.prod:/workspace/.env
+
+  # Every vhost proxies through `set $upstream ...; proxy_pass $upstream;`
+  # with the embedded Docker DNS resolver (see nginx/templates), so nginx
+  # does not need api/gateway/web-player to exist at its own startup, only
+  # at request time. That is what lets it start in the FIRST command
+  # (profile-gated services aren't part of that invocation yet) and still be
+  # reachable at the auth domain for zitadel-init to provision through.
+  nginx:
+    image: nginx:1.27-alpine
+    container_name: musify-nginx
+    environment:
+      # The entrypoint renders /etc/nginx/templates/*.template with envsubst.
+      # The filter keeps it from eating nginx's own $host / $remote_addr.
+      MUSIFY_WEB_DOMAIN: ${WEB_DOMAIN}
+      MUSIFY_API_DOMAIN: ${API_DOMAIN}
+      MUSIFY_STREAM_DOMAIN: ${STREAM_DOMAIN}
+      MUSIFY_AUTH_DOMAIN: ${AUTH_DOMAIN}
+      MUSIFY_S3_DOMAIN: ${S3_DOMAIN}
+      MUSIFY_MAX_UPLOAD_SIZE: ${MAX_UPLOAD_SIZE:-1024m}
+      NGINX_ENVSUBST_FILTER: ^MUSIFY_
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./nginx/templates:/etc/nginx/templates:ro
+      - ./nginx/snippets:/etc/nginx/snippets:ro
+      - ./nginx/certs:/etc/nginx/certs:ro
+      - nginx_cache:/var/cache/nginx
+    restart: unless-stopped
+
+volumes:
+  nginx_cache:

deploy/compose.yml

@@ -381,10 +381,6 @@ services:
     environment:
       NODE_ENV: production
       PORT: 3000
-      # adapter-node rejects request bodies over 512K by default; audio
-      # uploads are posted to /upload. Keep in line with the edge's
-      # client_max_body_size.
-      BODY_SIZE_LIMIT: 1G
       ORIGIN: ${PUBLIC_WEB_URL}
       ZITADEL_ISSUER: ${PUBLIC_AUTH_URL}
       ZITADEL_CLIENT_ID: ${WEB_CLIENT_ID}

deploy/nginx/snippets/proxy.conf

@@ -0,0 +1,9 @@
+# Shared proxy settings for every Musify vhost.
+proxy_http_version 1.1;
+proxy_set_header Host              $host;
+proxy_set_header X-Real-IP         $remote_addr;
+proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto https;
+proxy_set_header X-Forwarded-Host  $host;
+proxy_set_header Upgrade           $http_upgrade;
+proxy_set_header Connection        $connection_upgrade;

deploy/nginx/templates/default.conf.template

@@ -0,0 +1,109 @@
+# Musify edge. The nginx entrypoint renders this with envsubst into
+# /etc/nginx/conf.d/default.conf (replacing the image's stock file) using the
+# MUSIFY_* variables set in compose.prod.yml. Each vhost has its own,
+# independent domain (see deploy/.env.prod.example) — they don't need to
+# share a root domain.
+#
+# Cloudflare (Full strict) terminates the public edge; this box only needs to
+# serve the Cloudflare Origin Certificate in nginx/certs/. Each vhost proxies to
+# a compose service by name through the embedded Docker DNS resolver, so nginx
+# re-resolves it instead of caching the IP of a container that may be recreated.
+
+resolver 127.0.0.11 valid=10s;
+
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name ${MUSIFY_WEB_DOMAIN} ${MUSIFY_API_DOMAIN}
+                ${MUSIFY_AUTH_DOMAIN} ${MUSIFY_STREAM_DOMAIN} ${MUSIFY_S3_DOMAIN};
+    return 301 https://$host$request_uri;
+}
+
+# Web player (SvelteKit, adapter-node). Uploads are posted to its own form
+# actions, so it needs the large body size too.
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name ${MUSIFY_WEB_DOMAIN};
+    client_max_body_size ${MUSIFY_MAX_UPLOAD_SIZE};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://web-player:3000;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+    }
+}
+
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name ${MUSIFY_API_DOMAIN};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://api:5111;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+    }
+}
+
+# Audio bytes. Buffering off keeps range requests (seeking) responsive.
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name ${MUSIFY_STREAM_DOMAIN};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://gateway:8081;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name ${MUSIFY_AUTH_DOMAIN};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://zitadel:8080;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+        grpc_set_header Host $host;
+    }
+}
+
+# Presigned S3 PUT/GET straight from the browser.
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name ${MUSIFY_S3_DOMAIN};
+    client_max_body_size ${MUSIFY_MAX_UPLOAD_SIZE};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://seaweedfs:8333;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+        proxy_request_buffering off;
+    }
+}

web-player/.env.example

@@ -11,9 +11,8 @@ ZITADEL_CLIENT_SECRET=your-web-app-client-secret
 AUTH_REDIRECT_URI=http://localhost:5173/auth/callback
 AUTH_POST_LOGOUT_URI=http://localhost:5173/
 
-# Secret used to derive the session cookie encryption key. Required, at least
+# Secret used to derive the session cookie encryption key (any long random string)
-# 32 characters (e.g. `openssl rand -base64 48`).
+SESSION_SECRET=change-me-to-a-long-random-string
-SESSION_SECRET=change-me-to-a-long-random-string-of-32-chars-or-more
 
 # Backend API base URL
 API_BASE_URL=http://localhost:5111

web-player/CLAUDE.md

@@ -1,6 +1,6 @@
 # Musify: web-player
 
-Musify's public web app (`web-player/` folder). Design and UI recipes live in this file and in `src/routes/layout.css`.
+Musify's public web app (`web-player/` folder). For design and UI recipes, use the **`musify-web`** skill.
 
 ## Stack
 
@@ -15,8 +15,7 @@ npm run dev          # dev server (port 5173)
 npm run build
 npm run check         # svelte-check, must exit 0 errors before closing a change
 npm run format         # prettier --write .
-npm run test            # vitest run (tests live next to the file they test)
+npm run lint            # prettier --check . && eslint . && npm run lint:tokens
-npm run lint            # prettier --check . && eslint . && npm run lint:tokens && npm run test
 npm run lint:tokens      # scripts/check-tokens.mjs, the design system guardrail (see below)
 ```
 
@@ -24,7 +23,6 @@ npm run lint:tokens      # scripts/check-tokens.mjs, the design system guardrail
 
 - **No comments** in code unless essential.
 - `npm run lint` and `npm run check` must exit clean before closing a change.
-- **Imports:** always `$lib/...`, never `../` (ESLint enforces it). Non-null assertions are forbidden too.
 - **Always Svelte 5 runes:** `$props()` with `interface Props`, `$state`, `$derived`, `$effect`. No `export let` or `$:`. `{#each}` always keyed.
 - **Server only code goes under `$lib/server/`**, and it's never imported from client code.
 - SSR data comes through `load` in `+page.server.ts`/`+layout.server.ts` and lands in the `data` prop.
@@ -33,57 +31,39 @@ npm run lint:tokens      # scripts/check-tokens.mjs, the design system guardrail
 
 ## Folder structure
 
-- `src/lib/types.ts` holds the domain types (`Track`, `Album`, `Playlist`, `Mix`, `ListeningStats`, `Paged<T>`). Pages and the player only ever see these, never raw API DTOs.
+- `src/lib/state/` holds reactive rune based state (`*.svelte.ts` files that don't have a more specific home). Player state stays in `$lib/player/`, theme mode in `$lib/theme/`.
-- `src/lib/player/` is the player: `player.svelte.ts` (state and orchestration), `queue.ts` (pure queue operations), `stream.ts`, `mediaSession.ts`, `progressClock.ts`, `listenTracker.ts`, `recentlyPlayed.ts` (merges `player.recentlyPlayed` with the server history), and `actions.ts` (`playAllOrToggle`, `playShuffled`, `isQueueCurrent`).
+- `src/lib/data/` holds client side domain helpers: albums, collections, genres, mixes, recentlyPlayed, search.
-- `src/lib/state/` holds reactive rune state: `panels.svelte.ts` (queue panel, create playlist modal), `history.svelte.ts` (previous page for `BackLink`), `menu.svelte.ts` (`createMenu<T>()`), `pagedList.svelte.ts` (`createPagedList`), `dialog.svelte.ts`, `liked.svelte.ts` (the user's liked tracks), `toggle.svelte.ts` (`createToggle`), and `scroll.ts` (`restoreScroll`). Nothing in `state/` imports from `components/`.
+- `src/lib/utils/` holds generic utilities with no domain knowledge, like `format.ts`.
-- `src/lib/theme/` holds the theme: `accent.svelte.ts` (accent hue per track and the hue fade), `mode.svelte.ts`, `palette.ts`, `tokens.ts`, and `color.ts` (`ACCENT_HUE`). The player never imports from `theme/`: `(app)/+layout.svelte` follows `player.currentId` and calls `accent.follow`.
+- `src/lib/components/layout/` holds the app chrome: Sidebar, TopBar, TabsBar, MobileHeader.
-- `src/lib/data/` holds client side domain helpers: albums, genres, search. It never imports from `player/`.
-- `src/lib/utils/` holds generic utilities: `format.ts`, `collections.ts`, `hrefs.ts` (search, genre and cover URLs), `menuPosition.ts`, `storage.ts`, `transitions.ts`.
-- `src/lib/actions/` holds Svelte actions: `clickOutside`, `onEscape`, `pressable`.
-- `src/lib/validation.ts` holds the form limits (`LIMITS`) shared by client forms and server parsers.
-- `src/lib/server/` is server only code (see below).
-- `src/lib/components/shell/` holds the app shell: Sidebar, TopBar, TabsBar, MobileHeader, AccountMenu, and `navLinks.ts`.
 - `src/lib/components/player/` holds the player UI: PlayerBar, PlayerDock, Queue, TrackInfo, TransportControls.
-- `src/lib/components/music/` holds the components that connect the UI to app state (the player, album data): TrackList, PlayAllButton, TrackContextMenu, AlbumContextMenu.
+- `src/lib/components/ui/` holds the design system components, split into five categories:
-- `src/lib/components/ui/` holds the design system, which is presentation only. ESLint forbids importing `$lib/player/*`, `$lib/data/*`, `$lib/server/*`, `components/music`, `components/shell` and `components/player` from it; it can use `$lib/state/*`, `$lib/utils/*`, `$lib/actions/*`, `$lib/theme/*` and `$lib/types`. It is split into five categories:
   - `primitives/` for generic controls with no music domain knowledge (Button, Input, Chip, Slider, and so on).
-  - `overlay/` for anything that floats above the content (Modal, ContextMenu, GlassMenu, ConfirmDialog, and so on).
+  - `overlay/` for anything that floats above the content (Modal, ContextMenu, AccountMenu, and so on).
-  - `media/` for stateless music display components that receive props (Artwork, MediaCard, ListRow, PlayButton, and so on).
+  - `media/` for music domain display components (Artwork, TrackList, MediaCard, PlayButton, and so on).
   - `forms/` for composite entity forms (AlbumForm, PlaylistForm, CoverForm, ImageDropzone).
-  - `layout/` for page level scaffolding (Page, PageHeader, SectionHeading).
+  - `layout/` for page level scaffolding (Page, PageHeader, SectionHeading). This is different from `components/layout/` above, which is the global app chrome.
-- The root `+layout.svelte` only holds the globals (fonts, theme, `DialogHost`). Everything the user sees after signing in lives under `src/routes/(app)/`, including Home (`(app)/+page.svelte`); `(app)/+layout.server.ts` guards the group and loads the shell data, and `(app)/+error.svelte` renders inside the shell. Unknown URLs hit the catch-all `(app)/[...rest]/` (it throws a 404) so they also get the shell (unknown `/api/...` URLs hit `api/[...rest]/`, a JSON 404); the root `+error.svelte` only covers errors outside the group or in the group layout load. Auth routes live under `src/routes/auth/`: `+page.svelte` is the login screen, and `login/`, `logout/`, `callback/` are the OIDC endpoints. The public user profile route is `src/routes/(app)/user/[id]/`, and its followers/following lists share one route, `user/[id]/[list=followList]/` (matcher in `src/params/followList.ts`).
+- Auth routes live under `src/routes/auth/`: `+page.svelte` is the login screen, and `login/`, `logout/`, `callback/` are the OIDC endpoints. The public user profile route is `src/routes/(app)/user/[id]/`.
-
-## Naming conventions and glossary
-
-- Variant maps are module level constants in upper case (`SIZE`, `VARIANT`).
-- Errors: destructure as `const { data, error } = ...` and name the caught value `err` in `catch (err)`.
-- Play handlers: `playFrom(index)` and `playAll()`. Form actions: `create`, `edit`, `delete`, `addTrack`, `removeTrack`.
-- UI copy: "Playlist" (never "Lista"), "Mezcla" (never "Mix"), "Modo claro". Total durations always go through `fmtDurationLong`.
 
 ## Styles
 
 The design system lives in `src/routes/layout.css` (`@theme` tokens plus `@utility` recipes) and in `src/lib/theme/` (`theme.css` for the static neutrals, `tokens.ts` for the dynamic tokens that depend on the user's hue). `scripts/check-tokens.mjs` (run as `npm run lint:tokens`, part of `lint`) fails on a stock radius, an `h-N w-N` pair, fractional quarter spacing, a literal hex/`rgba()`, or an arbitrary `-[…]` value outside its whitelist, so check that script before adding one.
 
 - **Radii:** always `rounded-tag/thumb/control/art/art-lg/panel/panel-lg` (or `rounded-full` for pills and circles). Never `rounded-sm/md/lg/xl/2xl/3xl` or a bare `rounded`.
-- **Square sizes:** use `size-*` instead of repeating `h-N w-N` (icons: `size-icon-xs/sm/md/lg/xl/2xl/3xl`; covers: `size-cover-xs` through `size-cover-hero`).
+- **Square sizes:** use `size-*` instead of repeating `h-N w-N` (icons: `size-icon-xs/sm/md/lg/xl`; covers: `size-cover-xs` through `size-cover-hero`).
-- **Typography:** use the recipes `text-display-1/2/3/4`, `text-eyebrow`, `text-body`, with tracking through `tracking-display`/`tracking-eyebrow` rather than a loose `tracking-[…]`.
+- **Typography:** use the recipes `text-display-1/2/3/4`, `text-eyebrow`, `text-body`, `text-count`, with tracking through `tracking-display`/`tracking-eyebrow` rather than a loose `tracking-[…]`.
 - **Spacing:** stick to the Tailwind scale in `.5` steps and avoid quarters like `.25`/`.75`, unless the semantic token calls for it (for example `mb-4.5` in `SectionHeading`).
 - **Colors:** always use `--mf-*`/`text-*`/`bg-*`/`border-*` from `theme.css`/`tokens.ts`. Never a literal hex or `rgba()` inside a `.svelte` file; those literals only belong in `theme.css`/`tokens.ts` as the source of truth.
 - **Inline `style="…"` and arbitrary `-[…]` values:** only the ones whitelisted in `scripts/check-tokens.mjs` (the stagger variable `--i`, tile hue, menu position, progress width, `text-[clamp(…)]`, `leading-[…]` on login's display type, `grid-cols-[auto_1fr]`, `max-h-[85dvh]`, `my-`/`py-[Ndvh]` for vertical centering, `transition-[filter]` on genre tiles, and `bg-[image:var(--mf-*)]`). Everything else should become a token.
 - Reach for these base components before creating a new one: `Artwork`, `Avatar`, `ListRow`, `MediaIdentity`, `TrackList`, `MediaCard`, `PageHeader`, `ContextMenu`, `ConfirmDialog`, `PlayButton`, `Slider`, `Logo`, `Chip`, `SegmentedControl`, `CoverForm`.
-- **Icon stroke:** one global rule (`svg.lucide { stroke-width: 1.5 }` in `layout.css`) sets the stroke for every icon. Never pass `strokeWidth` to an icon, since any CSS rule overrides the SVG attribute and it would do nothing. For a different stroke on one icon, use a Tailwind `stroke-*` utility.
+- Known and accepted gap (documented in `scripts/check-tokens.mjs`): icon `strokeWidth={n}` isn't unified yet. There are 13 different values spread across almost every component, and migrating them to `stroke-thin/regular/bold` recipes safely would require visually confirming that `lucide-svelte` actually respects `stroke-width` through CSS, so that was left out of the last pass.
-
-## App shell
-
-The shell in `src/routes/(app)/+layout.svelte` is a fixed `h-dvh` frame: Sidebar | (content column over PlayerDock) | Queue. Only the content column (`app-scroll`) scrolls, so nothing ever passes under the dock and the chrome can stay transparent over `app-backdrop`. Because the window never scrolls, scroll reset/restore on navigation is handled by `restoreScroll()` in `$lib/state/scroll.ts`; don't use `window.scrollTo`/`scrollY`.
 
 ## Motion
 
-Every animation follows one scale of three durations and one easing curve, all defined in `theme.css`. Fast (`--mf-motion-fast`, 150ms) is for hover, focus and press feedback: color, opacity and small scale changes. Plain `transition` or `transition-colors` already uses it because it is the Tailwind default, so never write `duration-150`. Base (`--mf-motion-base`, 200ms) is for things that appear on top of the page or move inside a control: modals, menus, the queue panel, `animate-pop`, `animate-fade` and the segmented control thumb. Slow (`--mf-motion-slow`, 300ms) is for content entering the page and larger movement: `animate-enter`, cover zoom on hover.
+Every animation follows one scale of three durations and one easing curve, all defined in `theme.css`. Fast (`--mf-motion-fast`, 150ms) is for hover, focus and press feedback: color, opacity and small scale changes. Plain `transition` or `transition-colors` already uses it because it is the Tailwind default, so never write `duration-150`. Base (`--mf-motion-base`, 200ms) is for things that appear on top of the page or move inside a control: modals, menus, the queue panel, `animate-pop`, `animate-fade` and the segmented control thumb. Slow (`--mf-motion-slow`, 300ms) is for content entering the page and larger movement: `animate-enter`, cover zoom on hover and the player dock padding.
 
 Entrances and movement always use `--mf-ease` (`ease-snappy` in Tailwind, `expoOut` in Svelte transitions), which feels immediate because most of the motion happens at the start. Color transitions keep the Tailwind default curve. Overlays must feel instant: the modal backdrop uses `transition:fade={{ duration: 200 }}` and the panel uses a local `pop` transition (opacity + scale + translateY, `expoOut`, 200ms) mirroring `animate-pop`'s keyframes — both directives so the modal fades and pops on close too, not just on open, and the whole thing settles in 200ms. Staggered lists use `--i` with 40ms steps capped at ten items.
 
-The only exceptions are looping indicators (equalizer bars, pulse, spin, sheen) and the accent hue crossfade in the root `+layout.svelte` (a random 2 to 4 seconds per song change), which is ambient and meant to be slow. Do not add new durations or curves; if something needs a different feel, pick the closest step of the scale. `prefers-reduced-motion` disables everything globally in `layout.css`.
+The only exceptions are looping indicators (equalizer bars, pulse, spin, sheen) and the accent hue crossfade in `+layout.svelte` (600ms), which is ambient and meant to be slow. Do not add new durations or curves; if something needs a different feel, pick the closest step of the scale. `prefers-reduced-motion` disables everything globally in `layout.css`.
 
 ## Auth
 
@@ -93,21 +73,12 @@ Environment variables live in `.env` (see `.env.example`): `ZITADEL_*`, `AUTH_RE
 
 ## Backend API
 
-Typed client via `openapi-fetch` over the `Musify.Api` OpenAPI spec. Inside a server `load` or action use the client in `$lib/server/api.ts`:
+Typed client via `openapi-fetch` over the `Musify.Api` OpenAPI spec. Inside a server `load` or action:
 
 ```ts
-const api = apiFor(event); // or apiFor({ fetch, locals }); adds the bearer token when there is a session
+import { createApiClient } from '$lib/server/api';
-const { data, error } = await api.GET('/tracks');
+const api = createApiClient({ fetch, accessToken: locals.accessToken ?? undefined });
+const { data, error: err } = await api.GET('/tracks');
 ```
 
-It returns `{ data, error }` (ErrorOr style) and never throws except on network errors. The types live in `src/lib/api/schema.d.ts` and get regenerated with `npm run gen:api` (this needs the dev API running at `API_BASE_URL`, which only exposes `/openapi/v1.json` in Development).
+It returns `{ data, error }` (ErrorOr style) and never throws. The types live in `src/lib/api/schema.d.ts` and get regenerated with `npm run gen:api` (this needs the dev API running at `API_BASE_URL`, which only exposes `/openapi/v1.json` in Development).
-
-Server helpers:
-
-- `api.ts` holds the client and error handling: `apiFor`, `unwrapOrError`, `failOnError` (turns an API error into a `fail(...)`), `requireData` (also narrows the response data) and `apiErrorDetail`.
-- `guards.ts` holds `requireUser`, `optionalUser` and `loginRedirect`. Keep them in pages and actions even though the `(app)` layout also redirects: page loads run in parallel with the layout load, and form actions skip it.
-- `mappers.ts` (`toTrack`, `toAlbum`, `toPlaylist`, `toMix`, `toPage`, `toCount`, `toListeningStats`, ...) turn DTOs into the domain types. Every load and `/api` endpoint goes through them, so `Number()` conversions on DTOs never reach routes or the client.
-- `actions/` holds `authedAction(handler)` (returns 401 without a token, reads the form and hands `{ api, form, params, locals, url }` to the handler) plus the shared `follow` and `playlist` actions.
-- `forms/` holds `fields.ts` (`formString`, `formFile`) and the form parsers (`parseAlbumForm`, `parsePlaylistForm`, `parseTrackUploadForm`); they validate with `LIMITS` from `$lib/validation`. `uploadOptionalCover` handles the optional cover upload.
-- `genres.ts` caches the genre list; `playbackConfig.ts` caches the anonymous listening setting.
-- Page sizes come from `$lib/config`; do not hardcode them.

web-player/README.md

@@ -31,4 +31,5 @@ Built and run as a container by the production stack — see
 [../deploy/README.md](../deploy/README.md). There the same variables come from
 `deploy/.env.prod` through compose instead of from `.env`.
 
-Conventions and the design system are documented in [CLAUDE.md](CLAUDE.md).
+Conventions and the design system are documented in [CLAUDE.md](CLAUDE.md) and
+in the `musify-web` skill.

web-player/docs/frontend-audit-plan.md

@@ -1,315 +0,0 @@
-# Plan de refactor tras la auditoría del frontend
-
-> **Cerrado.** Todas las partes están hechas; el plan activo es `frontend-structure-plan.md`.
-
-Plan de trabajo derivado de la auditoría del `web-player` (2026-09-24). Cada parte es un PR independiente, revisable por separado, que deja `npm run check` y `npm run lint` en verde. Antes de empezar una parte, mira el **Registro** del final.
-
-Leyenda de tamaño: **S** (< 1 h) · **M** (medio día) · **L** (1 día o más). Las partes marcadas con 🔗 dependen de cambios en `Musify.Api`.
-
-## Orden y dependencias
-
-```
-P0 Red de seguridad
- └─ P1 Seguridad ─ P2 Reproductor ─ P3 Bugs de páginas ─ P4 Código muerto
-                                                            └─ P5 Modelo Track único
-                                                                 ├─ P6 Capa de servidor ─ P7 Formularios y validación
-                                                                 │                         └─ P8 Rendimiento 🔗
-                                                                 └─ P9 Responsabilidades ─ P10 Componentes y páginas
-                                                                                            └─ P11 Consistencia ─ P12 Guardarraíles y docs
-```
-
-P1 a P4 son arreglos acotados y se pueden mergear en cualquier orden. De P5 en adelante el orden importa: cada parte simplifica la siguiente.
-
----
-
-## P0 · Red de seguridad (M)
-
-Objetivo: tener tests de las funciones puras antes de tocar lógica.
-
-- Añadir Vitest (`vitest`, script `npm run test`, incluido en `lint` o en CI).
-- Tests para lo que ya es puro: `fmtTime`, `fmtDurationLong`, `plural`, `albumMeta` (`utils/format.ts`), `findTopResult` (`data/search.ts`), `findConflict`, `genreHue` (`data/genres.ts`), `pickGreeting` (`server/greeting.ts`), `parseAlbumForm` (`server/albumForm.ts`), `appendUnique`, `shuffle`.
-- Extraer las operaciones de cola de `PlayerState` a funciones puras en `player/queue.ts` (`insertNext`, `append`, `move`, `nextIndex`, `previousIndex`) y testearlas. `PlayerState` pasa a llamarlas. Esto prepara P2.
-
-**Cierre:** `npm run test` en verde y cubre las funciones anteriores.
-
----
-
-## P1 · Seguridad (S)
-
-1. **Redirección abierta con `returnTo`.**
-   - Nueva función `safeReturnTo(value: string | null | undefined): string` en `$lib/server/auth.ts`: acepta solo rutas que empiecen por `/` y no por `//` ni `/\`; si no, devuelve `/`.
-   - Aplicarla en `routes/auth/+page.server.ts` (ambos usos), en `routes/auth/login/+server.ts` (antes de guardar la cookie) y en `routes/auth/callback/+server.ts` (al leer la cookie).
-2. **`SESSION_SECRET` obligatorio.** En `$lib/server/config.ts`, `sessionSecret` pasa por `required()` y exige una longitud mínima de 32 caracteres. Actualizar el comentario de `.env.example`.
-3. **Validar las entradas de los endpoints `/api`.**
-   - `api/likes/+server.ts`: no reenviar el body tal cual; leer `trackId`, comprobar que es un string no vacío y devolver 400 si no.
-   - `api/listens/[id]/progress/+server.ts`: envolver `request.json()` para devolver 400 con JSON inválido en vez de 500.
-   - `server/image.ts`: `encodeURIComponent(id)` al construir la URL de upstream.
-   - `api/tracks/+server.ts`: acotar `pageSize` con un máximo (`MAX_PAGE_SIZE` en `config.ts`).
-
-**Cierre:** `/auth?returnTo=https://example.com` acaba en `/`; arrancar sin `SESSION_SECRET` falla con un mensaje claro; tests de `safeReturnTo`.
-
----
-
-## P2 · Reproductor y cola (M)
-
-1. **Duplicados en la cola** (`player.svelte.ts` `playNext`/`appendToQueue`, `Queue.svelte`).
-   - `playNext` mueve la pista si ya estaba en la cola, en vez de duplicarla.
-   - `appendToQueue` omite las pistas que ya están pendientes.
-   - Con esto las claves `(track.id)` vuelven a ser únicas y `#index()` es fiable.
-2. **Fin de cola.** Con repetir desactivado, al terminar la última pista el reproductor se detiene en vez de volver al principio. Si más adelante se quiere "repetir todo", `repeat` pasará a `'off' | 'all' | 'one'` (queda fuera de este plan).
-3. **La cola se abre sola** (`+layout.svelte:44`). Abrirla solo la primera vez que empieza a sonar algo en la sesión (`currentId` pasa de `null` a un valor) y no volver a abrirla si el usuario la cierra.
-4. **Rollback de "Me gusta"** (`liked.svelte.ts:69`). En caso de error, revertir solo la entrada de ese id, no sustituir el mapa entero.
-5. **localStorage seguro.**
-   - Nuevo `$lib/utils/storage.ts` con `readStorage(key, fallback)` y `writeStorage(key, value)` envueltos en try/catch.
-   - Volumen: validar y acotar a 0–100 (hoy puede quedar `NaN`).
-   - Unificar claves: `musify.player.volume`, `musify.player.muted`, `musify.theme`.
-   - Persistir el volumen siempre, no solo cuando existe el elemento `<audio>`.
-
-**Cierre:** añadir la misma pista dos veces a la cola no rompe nada; la cola termina; tests de `player/queue.ts` actualizados; prueba manual en el Browser pane.
-
----
-
-## P3 · Bugs de páginas y datos (M)
-
-1. **Permisos en la playlist** (`playlists/[id]`).
-   - El `load` devuelve `isOwner`, comparando el propietario de la playlist con `locals.user.sub`. Si la API no expone el propietario, añadirlo al DTO 🔗.
-   - Mostrar Editar, Eliminar y "Quitar" solo al propietario. Añadir `BackLink` como en el álbum y la mezcla, y `section: '/playlists'` cuando sea propia.
-2. **Una sola fuente para las playlists del usuario.**
-   - `+layout.server.ts` carga las playlists del usuario con `PLAYLIST_PICKER_PAGE_SIZE` y devuelve también `totalItemCount`.
-   - La barra lateral muestra las 8 primeras y usa el total real en el contador.
-   - Los menús contextuales (inicio, explorar, mezcla) usan esa lista desde `page.data` y así explorar y mezcla dejan de pedirla aparte.
-3. **Playlist destacada de inicio.**
-   - Nuevo endpoint `api/playlists/[id]/tracks/+server.ts`, análogo al de álbumes. "Reproducir" y "Aleatorio" cargan la lista completa en ese momento.
-   - La meta muestra el total real. La duración se quita hasta que la API la devuelva (P8).
-   - La promesa se resuelve con `{#await}` en vez de con un `$effect` que copia a estado.
-4. **Borrar canción de la biblioteca con confirmación.** `ConfirmDialog` acepta `fields` (inputs ocultos) y `library` lo usa, igual que álbumes y playlists.
-5. **Explorar.**
-   - Usar `plural()` para el número de canciones de un álbum.
-   - Contadores de chips y "N coincidencias" a partir de `totalItemCount` de cada respuesta, no de lo cargado.
-6. **Enlace `/terms`** en la subida: quitar el enlace hasta que exista una página de términos (o crearla, si se decide).
-7. **`playbackConfig.ts`:** no guardar en caché cuando la respuesta trae `error`.
-8. **`ImageDropzone`:** liberar la URL anterior con `URL.revokeObjectURL` al cambiar de archivo y al desmontar.
-9. **Textos.**
-   - "Populares esta semana" duplica "Continuar escuchando": quitar la sección hasta que haya un endpoint real de más escuchadas (o renombrarla a "Escuchado recientemente").
-   - `+error.svelte`: quitar la promesa de modo sin conexión.
-   - "Retomalo" → "Retómalo"; "Modo blanco" → "Modo claro".
-
-**Cierre:** un no propietario no ve acciones de edición; la barra lateral cuenta bien; la destacada reproduce la lista completa.
-
----
-
-## P4 · Código muerto (S)
-
-Borrar sin sustituto:
-
-- `player.svelte.ts`: `playPlaylist`, `playlistTracks`, `playlists`, interfaz `Playlist`, getter `isPlaying`, `playNextItem` (usar `playNext([item])`).
-- `theme/palette.ts`: `Accent.gradient` (y con ello el tipo `Accent`, que queda en `string`).
-- `IconButton`: el mapa `TEXT` y la prop `tone` pasan a `plain` o por defecto; `muted` y `subtle` son idénticos.
-- `Artwork`: prop `fallback` y sus ramas `gradient` y `none`.
-- `MediaIdentity.badge`, `FollowButton.userId`, `EqBars.size` y `EqBars.barWidth`.
-- Acciones `follow` y `unfollow` en `explore/+page.server.ts` y en `user/[id]/[list=followList]/+page.server.ts`, con el `form?.message` que solo servía para ellas.
-- Utilidades `media-grid` y `text-count` de `layout.css` (y su mención en `CLAUDE.md`).
-- `TrackList.svelte`: el `use:enhance` redundante (queda `use:enhance`) y los `stopPropagation` de la línea 141.
-- `+page.server.ts` (inicio): el `redirect` previo a `requireUser`. `+layout.server.ts`: la rama `accountUrl = null`.
-- Clases que no hacen nada: `hover:text-fg-2` sobre `text-fg-2` (SegmentedControl, Sidebar, ArtistLink) y el `hidden sm:flex` anidado de `PlayerBar`.
-- Separadores vacíos (`<span></span>`, `<div class="flex-1">`) en `CoverForm` y `TopBar`: sustituir por `ml-auto`.
-- `sessionCookieOptions` deja de exportarse.
-
-**Cierre:** `grep` de cada símbolo sin resultados; la app se comporta igual.
-
----
-
-## P5 · Modelo `Track` único (L)
-
-Objetivo: una sola forma de pista, normalizada en la frontera del servidor. Es el cambio que más código quita.
-
-1. **Tipos de dominio** en `$lib/types.ts`:
-   ```ts
-   export interface Track {
-   	id: string;
-   	title: string;
-   	artist: string | null;
-   	ownerUserId: string | null;
-   	explicit: boolean;
-   	duration: number;
-   	listensCount: number;
-   }
-   export interface LikedTrack extends Track {
-   	likedAt: number;
-   }
-   ```
-   Más `Album` y `Playlist` normalizados (`trackCount: number`, `releaseYear: number | null`, ids como `string`).
-2. **Mappers de servidor** en `$lib/server/mappers.ts`: `toTrack`, `toAlbum`, `toPlaylist`, `toMixTrack` (sustituye a `mixItemTrack`). Hacen todas las conversiones `Number()` y `String()`. Todos los `load` y los endpoints `/api` que devuelven pistas los usan.
-3. **El reproductor usa `Track`.**
-   - Se eliminan `PlayerTrack`, `QueueItem`, `ApiTrackLike`, `LikeToggleInput` y `TrackListTrack` (que pasa a ser `Track & { date?: string | number }`).
-   - Se eliminan `toQueueItems`, `toQueueItem`, `trackFromQueueItem` y `toTrack` del cliente.
-   - `current` pasa a ser `Track | null` en vez del centinela `EMPTY` con `id: ''`.
-4. **Páginas.** Quitar todos los `Number(...)`, los `?? undefined` y los mapeos intermedios (`listTracks`, `songRows`, `spotlightRows`, `popularTracks`…).
-
-**Cierre:** `grep -rn "Number(" src/routes --include=*.svelte` vacío; `isExplicit` solo aparece en `mappers.ts`; tests de los mappers.
-
----
-
-## P6 · Capa de servidor (M)
-
-1. **Helpers en `$lib/server/api.ts`.**
-   - `apiFor(event)` sustituye los 15 `createApiClient({ fetch, accessToken: locals.accessToken ?? undefined })`.
-   - Exportar `type ApiClient` (hoy se redefine en `follows.ts`).
-   - `loginRedirect(url)`, usado por `requireUser`, `optionalUser` y `+layout.server.ts`.
-2. **Envoltorio de acciones** `authedAction(handler)`: comprueba el token (401 si falta), crea `api`, lee `form` y pasa `{ api, form, params, locals }`. Sustituye el bloque `requireAccessTokenAction` + `typeof` + `formData` + `createApiClient` de las ~10 acciones.
-3. **Lectura de formularios:** `formString(form, key)` y `formFile(form, key)` (devuelve `null` si el archivo viene vacío). Sustituyen los 17 `String(form.get(...) ?? '')` y los `instanceof File && size > 0`.
-4. **Nombres.**
-   - `unwrapOrFail` → `failOnError` (no desenvuelve nada).
-   - Desestructurar siempre como `const { data, error } = ...` y usar `catch (err)`.
-   - La acción `rename` de playlist pasa a `edit` y devuelve `{ edited: true }`, como la de álbum.
-5. **Sin aserciones no nulas:** quitar `urlsResult.data!` y `trackResult.data!` de `upload/+page.server.ts` usando el patrón de `failOnError` que estrecha el tipo.
-6. **`+layout.server.ts`:** una sola función para las tres cargas con fallback, sin `try/catch` duplicado (openapi-fetch solo lanza con error de red).
-7. **Tamaños de página:** todos los `pageSize` salen de `config.ts` (quitar `50`, `200`, `500` sueltos y el `PAGE_SIZE` local de `library`). Quitar el alias `EXPLORE_PAGE_SIZE as PAGE_SIZE`.
-
-**Cierre:** ninguna acción repite la plantilla de autenticación; `grep "createApiClient(" src/routes` vacío.
-
----
-
-## P7 · Formularios y validación compartida (M)
-
-1. **Límites en un único sitio:** `$lib/validation.ts` (compartido entre cliente y servidor):
-   ```ts
-   export const LIMITS = {
-   	playlistName: 100,
-   	playlistDescription: 300,
-   	albumTitle: 200,
-   	albumDescription: 256,
-   	trackTitle: 100
-   } as const;
-   ```
-   Antes de fijarlos, comprobar los validadores de `Musify.Api` y usar sus valores. `ALBUM_EARLIEST_YEAR` se mueve aquí.
-2. **Parsers de servidor** en `$lib/server/forms/`: `parseAlbumForm` (existente), `parsePlaylistForm` (nuevo, sustituye el código duplicado de `create` y `edit`), `parseTrackUploadForm` (sacado de `upload/+page.server.ts`). Todos validan con `LIMITS`.
-3. **Portadas:** `uploadOptionalCover(api, endpoint, file)` sustituye los 4 bloques `if (cover ...) uploadPresignedImage(...)`.
-4. **Formularios de cliente:** `AlbumForm`, `PlaylistForm` y la subida usan `LIMITS` en `maxlength` y en el contador. Añadir el contador que falta en `AlbumForm` para que los tres se comporten igual.
-5. `formatSize` de la subida pasa a `utils/format.ts`.
-
-**Cierre:** cambiar un límite en `LIMITS` actualiza cliente y servidor; tests de los parsers.
-
----
-
-## P8 · Rendimiento 🔗 (M, parte en backend)
-
-1. **Backend:** añadir `trackCount` y `durationSeconds` a la respuesta de playlist.
-2. **Frontend:**
-   - `playlists/+page.server.ts` deja de pedir hasta 500 pistas por playlist.
-   - `user/[id]/+page.server.ts` deja de hacer una petición por playlist.
-   - La destacada de inicio recupera la duración real.
-3. **Explorar:** cachear `/genres` en `$lib/server/genres.ts` (como `playbackConfig`, con TTL de unos minutos) y lanzar todas las peticiones en paralelo en vez de esperar primero a los géneros.
-4. **Añadir álbum a playlist** (`playlistActions.ts`): hoy hace un POST por pista en serie y se corta en 200. Pedir un endpoint de inserción múltiple 🔗; mientras tanto, paralelizar con un límite de concurrencia.
-
-**Cierre:** la página de playlists hace una sola petición a la API; el perfil hace dos.
-
----
-
-## P9 · Separación de responsabilidades en `lib/` (L)
-
-1. **Dividir `player.svelte.ts`:**
-   - `player/queue.ts`: operaciones de cola (de P0).
-   - `player/stream.ts`: `resolveStream(id)` (fetch de `/stream`, ticket, `listenId`) y `readErrorMessage`.
-   - `player/mediaSession.ts`: registro de acciones y sincronización de metadatos y estado.
-   - `player/progressClock.ts`: el bucle `requestAnimationFrame` de progreso suave.
-   - `player/actions.ts`: `playAllOrToggle`, `playShuffled`, `isQueueCurrent`.
-   - `player/player.svelte.ts`: solo el estado y la orquestación.
-2. **Acento como número.**
-   - Nuevo `theme/accent.svelte.ts`: caché, `extractAccent` y el tono actual como `number`.
-   - Ahí mismo vive el fundido de tono que hoy está en `+layout.svelte` (`animateThemeHue()`).
-   - Se elimina `parseHue` (ya no hay que leer el tono de una cadena `oklch(...)`).
-3. **Dividir `state/navigation.svelte.ts`:**
-   - `state/history.svelte.ts`: `trackNavigation`, `previousPage`.
-   - `state/scroll.ts`: `restoreScroll`.
-   - `utils/hrefs.ts`: `searchHref`, `genreHref` y las URLs de portada (`trackCover(id, size)`, `playlistCover(playlist, size)` con el `v=updatedAt`, `albumCover(id, size)`), que hoy se escriben a mano en más de 15 sitios.
-   - `components/layout/navLinks.ts`: `appNavLinks` e `isNavActive` (sustituye el `isActive` duplicado de Sidebar y TabsBar).
-4. **Menús.** `contextMenuPosition` y `MenuPosition` pasan a `utils/menuPosition.ts`, sin `preventDefault()` dentro (lo hace quien llama). `state/menus.svelte.ts` deja de importar de un componente.
-5. **Movimientos de archivos:**
-   - `data/collections.ts` → `utils/collections.ts`.
-   - `player/queuePanel.svelte.ts` y `state/playlists.svelte.ts` → `state/panels.svelte.ts` (`queuePanel`, `createPlaylistModal`).
-   - `data/search.ts`: claves internas (`tracks`, `albums`, `playlists`, `users`) y etiquetas aparte en un mapa de textos.
-6. Tipar `+layout.svelte` con `interface Props`.
-
-**Cierre:** `player.svelte.ts` por debajo de ~250 líneas; ningún archivo de `state/` importa de `components/`.
-
----
-
-## P10 · Componentes extraídos y páginas más finas (L)
-
-1. **Menú contextual.**
-   - `state/menu.svelte.ts` con `createMenu<T>()` genérico: sustituye `createTrackMenu` y el `albumMenu` hecho a mano de explorar.
-   - Componente `TrackContextMenu` que encapsula el bloque de 15 líneas repetido en inicio, explorar y mezcla. `AlbumContextMenu` para explorar.
-2. **`PlayAllButton {items}`** con el "Reproducir/Pausar" de álbum, playlist, mezcla, me gusta y la portada de inicio.
-3. **`createPagedList(fetcher)`** en `state/pagedList.svelte.ts` para la paginación infinita de explorar y de seguidores (estado, `appendUnique`, `hasMore` y un estado de error visible en vez de tragarse el fallo).
-4. **Primitivas.**
-   - `Button`, `IconButton`, `Chip` y `MenuItem` usan `<svelte:element this={href ? 'a' : 'button'}>` en vez de duplicar las dos ramas.
-   - Acción `use:onEscape` para `Modal`, `ContextMenu` y `AccountMenu`.
-   - `AccountMenu` incluye su propio disparador con el `Avatar`; `TopBar` y `MobileHeader` dejan de duplicarlo.
-   - `Artwork` y `Avatar` usan `{#key src}` en vez del `$effect` que reinicia `failed`.
-5. **Páginas.**
-   - Quitar los alias `const x = $derived(data.x)` y las funciones de una línea (`playSpotlight`, `shuffleSpotlight`, `openContextMenu`, `stepClass`…).
-   - Sustituir los `$effect` que copian `data` a estado local por `$derived` escribible cuando sea posible.
-   - Navegación con enlaces reales: `ListRow href` en vez de `onclick={() => goto(...)}`, y la destacada de inicio como `<a>`.
-   - `upload`: el indicador de pasos solo refleja estados reales (o se simplifica a "subiendo / listo").
-
-**Cierre:** ninguna página repite el bloque del menú ni el botón de reproducir; las tarjetas se pueden abrir con clic central.
-
----
-
-## P11 · Consistencia (M, mecánico)
-
-1. **Imports:** siempre `$lib/...`, nunca `../`. Se hace cumplir en P12.
-2. **Convenciones de nombres** (se documentan en `CLAUDE.md`):
-   - Mapas de variantes en constantes de módulo en mayúsculas (`SIZE`, `VARIANT`).
-   - Errores: `error` al desestructurar y `err` en `catch`.
-   - Manejadores de reproducción: `playFrom(index)`, `playAll()`.
-   - Acciones: `create`, `edit`, `delete`, `addTrack`, `removeTrack`.
-3. **Glosario de interfaz:** "Playlist" (nunca "Lista"), "Mezcla" (nunca "Mix"), "Modo claro". Duraciones totales siempre con `fmtDurationLong`.
-4. **Tokens.**
-   - Iconos siempre con `size-icon-*`; añadir `size-icon-2xs` si hace falta para los de 14 px.
-   - Nada de `size={16}` en iconos Lucide.
-   - No usar tokens de icono como espaciado (`pb-icon-md`, `gap-icon-md`).
-   - Anchos siempre con clase (`w-(--mf-sidebar-w)`), no con `style`.
-   - Nueva utilidad `focus-ring` usada por `Button`, `IconButton`, `Chip` y los enlaces interactivos.
-5. **Rutas:** mover `routes/+page.svelte` y `+page.server.ts` (inicio) dentro de `(app)`, para que el grupo tenga sentido: todo lo de la app dentro y `auth/` fuera.
-
-**Cierre:** `npm run lint` en verde con las reglas nuevas de P12.
-
----
-
-## P12 · Guardarraíles y documentación (S)
-
-1. **ESLint:**
-   - `no-restricted-imports` que prohíba `../*`.
-   - `@typescript-eslint/no-non-null-assertion`.
-   - `svelte/no-unused-props`.
-2. **`scripts/check-tokens.mjs`:** fallar con `size={N}` en iconos y con `size-N` sobre componentes Lucide.
-3. **Opcional:** `knip` para detectar exportaciones y archivos sin uso.
-4. **Documentación:**
-   - `CLAUDE.md`: nueva estructura de carpetas, helpers de servidor (`apiFor`, `authedAction`, mappers), convenciones de nombres y glosario.
-   - `docs/paginas.md`: está desactualizado (menciona el grupo `(marketing)` y la landing, que ya no existen).
-
-**Cierre:** las reglas nuevas fallan si se reintroduce cualquiera de los patrones eliminados.
-
----
-
-## Registro
-
-| Parte                       | Estado | PR / notas                                                                                                             |
-| --------------------------- | ------ | ---------------------------------------------------------------------------------------------------------------------- |
-| P0 Red de seguridad         | ✅     | Vitest + 37 tests; `player/queue.ts` extraído. `lint` ahora ejecuta `test`                                             |
-| P1 Seguridad                | ✅     | Hecho en la rama `claude/frontend-audit-plan-4f9432`                                                                   |
-| P2 Reproductor y cola       | ✅     | Sin probar en navegador (API caída)                                                                                    |
-| P3 Bugs de páginas          | ✅     | Backend: `ownerUserId` en playlist. Sin probar en navegador                                                            |
-| P4 Código muerto            | ✅     | Se mantiene el redirect a `/explore` de inicio (cubre escucha anónima)                                                 |
-| P5 Modelo Track único       | ✅     | `Paged<T>`, `Mix`, `PlaylistSummary` añadidos. Sin probar en navegador                                                 |
-| P6 Capa de servidor         | ✅     | `failOnError` + `requireData`; `parseAlbumForm` usa `formString`                                                       |
-| P7 Formularios y validación | ✅     | Límites según las columnas de BD del backend (playlist 50/256, pista 200)                                              |
-| P8 Rendimiento 🔗           | ✅     | Backend: `trackCount` y `durationSeconds` en playlist. Añadir álbum usa `POST /playlists/{id}/albums/{albumId}` (bulk) |
-| P9 Responsabilidades        | ✅     | `player.svelte.ts` queda en ~320 líneas                                                                                |
-| P10 Componentes y páginas   | ✅     | Quedan algunos alias `$derived(data.x)`; `{#key}` sustituido por `failedSrc`                                           |
-| P11 Consistencia            | ✅     |                                                                                                                        |
-| P12 Guardarraíles y docs    | ✅     | `knip` no añadido (opcional)                                                                                           |
-
-Leyenda: ⬜ pendiente · 🟡 en curso · ✅ hecho.

web-player/docs/frontend-structure-plan.md

@@ -1,185 +0,0 @@
-# Plan de estructura del frontend
-
-Plan derivado de la revisión de estructura del `web-player` (2026-09-24), hecha después de cerrar `frontend-audit-plan.md` (P0–P12). Cada parte es un PR independiente que deja `npm run check` y `npm run lint` en verde y no cambia el comportamiento visible. Antes de empezar una parte, mira el **Registro** del final.
-
-Leyenda de tamaño: **S** (< 1 h) · **M** (medio día) · **L** (1 día o más).
-
-## Orden y dependencias
-
-```
-E1 Layout del grupo (app)
- └─ E2 Carpeta shell
-     └─ E3 Frontera de ui/ ─ E6 Explorar en componentes
-
-E4 Ubicación de estados   (independiente)
-E5 Capa de servidor       (independiente)
-E7 Acento fuera del reproductor (después de E1)
-
-E9 Tests (antes o junto con E1 y E5)
-
-E8 Documentación (al final)
-```
-
-E1 → E2 → E3 van en orden porque tocan los mismos imports. E4 y E5 se pueden hacer en cualquier momento. Conviene hacer E9 primero, o al menos sus puntos 1 y 2, para que E1 y E5 muevan el código de sesión con tests que detecten si algo se rompe.
-
----
-
-## E1 · Layout del grupo `(app)` (M)
-
-Problema: el grupo `(app)` no tiene `+layout`. El shell y las cargas de la app están en la raíz, que distingue la pantalla de login a mano (`isAuthPage` en `+layout.svelte`, `PUBLIC_PATHS` en `+layout.server.ts`). Por eso `/auth` también consulta `playbackConfig`, y `+error.svelte` se pinta fuera del shell (un 404 dentro de la app pierde la barra lateral y el reproductor).
-
-1. **`routes/+layout.svelte`** se queda con lo global: fuentes, `theme.css`, `layout.css`, favicon, el `<style>` inicial del tema, `animateThemeHue` y `<DialogHost />`. Renderiza `children` sin envoltorio.
-2. **`routes/+layout.server.ts`** desaparece (o queda vacío). Si alguna ruta fuera de `(app)` necesita `user`, lo lee de `locals` en su propio `load`.
-3. **Nuevo `routes/(app)/+layout.server.ts`** con todo lo que hoy hay en la raíz: `getAllowAnonymousListening`, el guard (`loginRedirect` si no hay usuario ni escucha anónima), `accountUrl`, playlists del usuario, me gusta y última pista. Sin `PUBLIC_PATHS`.
-4. **Nuevo `routes/(app)/+layout.svelte`** con el shell: backdrop, `Sidebar`, `MobileHeader`, `TopBar`, `<main>` con el `{#key}`, `Queue`, `PlayerDock`, el modal de crear playlist, la hidratación de `liked` y `player`, la apertura automática de la cola y el atajo de la barra espaciadora. Desaparecen `isAuthPage` y la rama `!data.user && !data.allowAnonymousListening`, porque el guard ya ha redirigido.
-5. **Nuevo `routes/(app)/+error.svelte`** (el contenido del actual) para que los errores dentro de la app se vean con el shell. El `+error.svelte` de la raíz se queda como fallback mínimo para errores fuera del grupo.
-6. **No quitar** los `requireUser`/`optionalUser` de las páginas ni `authedAction`. Los `load` de página se ejecutan en paralelo con los del layout, y las acciones de formulario no ejecutan el `load` del layout, así que el guard del layout no basta.
-
-**Cierre:** `grep -rn "isAuthPage\|PUBLIC_PATHS" src` vacío; `/auth` no llama a la API; un 404 en `/albums/xxx` se ve dentro del shell; prueba manual con sesión, sin sesión y con escucha anónima.
-
----
-
-## E2 · Carpeta `shell` (S)
-
-Problema: hay dos carpetas `layout` con significados distintos (`components/layout/` es el shell de la app y `components/ui/layout/` son piezas para montar páginas). `AccountMenu` está en `ui/overlay/`, pero solo lo usan `TopBar` y `MobileHeader`.
-
-1. Renombrar `components/layout/` a `components/shell/` (`Sidebar`, `TopBar`, `TabsBar`, `MobileHeader`, `navLinks.ts`).
-2. Mover `components/ui/overlay/AccountMenu.svelte` a `components/shell/AccountMenu.svelte`.
-3. Actualizar imports en `(app)/+layout.svelte` y `components/player/PlayerDock.svelte`.
-
-**Cierre:** `grep -rn "components/layout/\|overlay/AccountMenu" src` vacío.
-
----
-
-## E3 · Frontera de `components/ui/` (M)
-
-Problema: `ui/` se presenta como el design system, pero cuatro componentes dependen del estado global de la app. `TrackList` y `PlayAllButton` importan `player`. `TrackContextMenu` y `AlbumContextMenu` importan `player`, y `AlbumContextMenu` también importa `$lib/data/albums`. El resto de `ui/media/` son componentes de presentación sin estado (reciben props), y así deben quedarse.
-
-1. **Nueva carpeta `components/music/`** para los componentes que conectan la interfaz con el estado de la app:
-   - `ui/media/TrackList.svelte` → `music/TrackList.svelte`
-   - `ui/media/PlayAllButton.svelte` → `music/PlayAllButton.svelte`
-   - `ui/overlay/TrackContextMenu.svelte` → `music/TrackContextMenu.svelte`
-   - `ui/overlay/AlbumContextMenu.svelte` → `music/AlbumContextMenu.svelte`
-2. **Regla de ESLint:** un bloque con `files: ['src/lib/components/ui/**']` y `no-restricted-imports` que prohíba `$lib/player/*`, `$lib/data/*`, `$lib/server/*`, `$lib/components/music/*`, `$lib/components/shell/*` y `$lib/components/player/*`. Hay que repetir en ese bloque el patrón `../*` del bloque general, porque la configuración de un override sustituye a la del bloque general, no se suma.
-3. Comprobar que la regla pasa sin excepciones. `ui/` puede seguir importando `$lib/state/*` (historial, diálogos), `$lib/utils/*`, `$lib/actions/*`, `$lib/theme/*` y `$lib/types`.
-
-**Cierre:** `npm run lint` en verde; si un componente de `ui/` importa `player`, el lint falla.
-
----
-
-## E4 · Ubicación de estados (S)
-
-1. `player/liked.svelte.ts` → `state/liked.svelte.ts`. Guarda los me gusta del usuario, no el estado del reproductor, y lo usan `Sidebar`, `TrackInfo`, el layout y las páginas.
-2. `data/recentlyPlayed.ts` → `player/recentlyPlayed.ts`. Solo mezcla `player.recentlyPlayed` con el historial, y hoy es el único archivo de `data/` que depende del reproductor.
-
-**Cierre:** `grep -rn "player/liked\|data/recentlyPlayed" src` vacío; `data/` no importa de `player/`.
-
----
-
-## E5 · Capa de servidor (S–M)
-
-Problema: `server/api.ts` mezcla el cliente de la API, los guards de sesión, la lectura de formularios y el envoltorio de acciones. Los parsers de `server/forms/` importan `api.ts` solo para usar `formString`/`formFile`.
-
-1. **`server/api.ts`** se queda con el cliente y el manejo de errores: `createApiClient`, `ApiClient`, `apiFor`, `unwrapOrError`, `apiErrorDetail`, `failOnError`, `requireData`.
-2. **Nuevo `server/guards.ts`:** `loginRedirect`, `requireUser`, `optionalUser` (14 imports en `routes/` más `(app)/+layout.server.ts`).
-3. **Nuevo `server/forms/fields.ts`:** `formString`, `formFile`. Los parsers de `forms/` lo importan desde ahí.
-4. **Nueva carpeta `server/actions/`:**
-   - `authedAction.ts` con `authedAction` y `ActionContext`.
-   - `followActions.ts` → `actions/follow.ts`.
-   - `playlistActions.ts` → `actions/playlist.ts`.
-
-**Cierre:** `server/forms/` no importa `server/api`; `api.ts` no importa `redirect` ni `RequestEvent` salvo para `apiFor`.
-
----
-
-## E6 · Explorar en componentes (M)
-
-Problema: `(app)/explore/+page.svelte` (393 líneas) resuelve tres vistas en una: la rejilla de géneros, la vista de un género y los resultados de búsqueda (mejor resultado y cuatro grupos).
-
-1. Sacar componentes junto a la página (SvelteKit ignora los archivos sin `+` dentro de `routes/`):
-   - `explore/GenreGrid.svelte`: la rejilla de géneros y el estado vacío.
-   - `explore/TopResult.svelte`: el snippet `topResultBody` y `playTopResult`.
-   - `explore/SearchResults.svelte`: los cuatro grupos, `capped`, `showGroup` y el `InfiniteScroll` de pistas.
-2. `+page.svelte` queda como selector de vista: cabecera, chips, mensaje de "sin resultados" y los dos menús contextuales.
-3. El estado compartido (`createPagedList`, `trackMenu`, `albumMenu`) se crea en la página y se pasa por props; los componentes no leen `page.data`.
-
-**Cierre:** `explore/+page.svelte` por debajo de ~150 líneas; ninguna vista nueva supera las ~150.
-
----
-
-## E7 · Acento fuera del reproductor (S)
-
-Problema: `player.svelte.ts` importa `theme/accent.svelte` y en `#announce` llama a `accent.follow(...)`, así que el estado del reproductor depende del tema visual.
-
-1. Quitar `accent` y `trackCover` de `player.svelte.ts`; `#announce` solo actualiza `mediaSession`.
-2. En `(app)/+layout.svelte`, un `$effect` que siga a `player.currentId` y llame a `accent.follow(trackCover(id, 'small'), () => player.currentId === id)`.
-3. Comprobar que la hidratación de la última pista también actualiza el acento (el efecto depende de `currentId`, así que debería).
-
-**Cierre:** `player/` no importa de `theme/`; el color cambia al cambiar de canción y al cargar la página con una última pista.
-
----
-
-## E8 · Documentación y restos (S)
-
-1. **`CLAUDE.md`:**
-   - Estructura de carpetas con `components/shell/`, `components/music/`, la regla de frontera de `ui/`, `state/liked.svelte.ts`, `server/guards.ts`, `server/forms/fields.ts` y `server/actions/`.
-   - Documentar lo que falta: `lib/actions/` (`clickOutside`, `onEscape`, `pressable`), `state/toggle.svelte.ts` y `theme/color.ts`.
-   - Corregir la referencia a `$lib/state/navigation.svelte.ts` en "App shell" (ahora es `restoreScroll` en `$lib/state/scroll.ts`) y describir el shell en `(app)/+layout.svelte`.
-   - La skill `musify-web` que cita la introducción no está en `web-player/.claude/skills`: añadirla o quitar la referencia.
-2. **Conversiones fuera de los mappers.** La regla de P5 dice que los `Number(...)` sobre DTOs solo se hacen en `server/mappers.ts`, pero quedan varios en `routes/`:
-   - `(app)/+page.server.ts`: las estadísticas de escucha (nuevo `toListeningStats`, con test) y `totalItemCount` de las playlists.
-   - `(app)/explore/+page.server.ts`: `albumsTotal` y `usersTotal`.
-   - `(app)/user/[id]/+page.server.ts`: `followersCount`.
-   - La carga de playlists del layout (que tras E1 está en `(app)/+layout.server.ts`): `totalItemCount`.
-
-   Los totales pueden salir de `toPage(...).totalItemCount` o de un helper `toCount` en los mappers.
-
-3. **Planes:** marcar `frontend-audit-plan.md` como cerrado (o archivarlo) y dejar este como el plan activo.
-
-**Cierre:** cada ruta citada en `CLAUDE.md` existe; `grep -rn "Number(" src/routes` solo devuelve lecturas de parámetros o formularios.
-
----
-
-## E9 · Tests de los arreglos y del código con efectos (M)
-
-Los tests se quedan junto al archivo que prueban (`x.ts` + `x.test.ts`); no se crea una carpeta `tests/`. Hoy cubren bien la lógica pura (formatos, mappers, parsers, cola, búsqueda), pero no el código con fetch, estado o tiempo, ni los arreglos de seguridad de P1 y P2, que pueden volver sin que nada falle.
-
-1. **Sesión y guards.**
-   - `server/auth.ts`: `encodeSession` → `decodeSession` devuelve la misma sesión; un token manipulado, cifrado con otra clave o vacío devuelve `null`. Para el secreto, usar `vi.mock('$env/dynamic/private')` con un `SESSION_SECRET` de prueba, no el `.env` local (en CI no existe).
-   - Guards (`requireUser`, `optionalUser`, `loginRedirect`; en `server/guards.ts` tras E5): redirigen a `/auth?returnTo=…` con la ruta y la query codificadas, y dejan pasar cuando toca.
-   - Tras E1, el `load` de `(app)/+layout.server.ts`: redirige sin sesión ni escucha anónima, devuelve datos vacíos en modo anónimo y no llama a la API sin usuario.
-2. **Endpoints `/api` (arreglos de P1).** Llamar al `RequestHandler` con un evento falso y un `fetch` simulado:
-   - `api/likes`: 401 sin token, 400 con `trackId` ausente, vacío o no string, 502 si la API falla.
-   - `api/listens/[id]/progress`: 400 con JSON inválido, con `playedSeconds` negativo, no finito o no numérico; 404 si la API devuelve 404.
-   - `api/tracks`: `pageSize` se limita a `MAX_PAGE_SIZE` y `pageNumber` inválido pasa a 1.
-3. **Rollback de "Me gusta" (`liked.svelte.ts`, arreglo de P2).** Con `fetch` simulado que falla: se revierte solo esa pista y se conservan los cambios hechos mientras tanto en otras. También los casos de dar y quitar el me gusta, y que `hydrate` solo se aplica una vez.
-4. **`ListenTracker`.** Con `vi.useFakeTimers()` y `fetch` simulado:
-   - Suma solo los avances de hasta 2,5 s; un salto mayor (seek) o hacia atrás no cuenta.
-   - `interrupt()` hace que el siguiente `tick` no sume.
-   - Envía a los 30 s y en `flush()`; no reenvía si no hay progreso nuevo.
-   - Si el envío falla, el siguiente `flush()` vuelve a enviar el total.
-   - `begin()` envía lo pendiente de la escucha anterior antes de empezar la nueva.
-5. **`createPagedList`.** Añade la página siguiente sin duplicados, actualiza `hasMore`, ignora un `loadMore` con otro en curso y, si falla, marca `error` y conserva los elementos. `reset` limpia el error.
-6. **`apiErrorDetail`.** Mensajes de `errors` (varios campos, arrays), después `detail`, después `title`, y `undefined` para valores que no son objeto o sin texto.
-
-Fuera de alcance, a propósito: tests de componentes (sobre todo presentación, ya vigilada por `check-tokens`), utilidades triviales (`storage`, `menuPosition`, `navLinks`), `mediaSession`, `progressClock`, `palette` (necesita canvas) y `player.svelte.ts` entero (depende de `<audio>`; su lógica está en `queue.ts`, que ya tiene tests). E2E con Playwright queda para cuando CI pueda levantar el backend y Zitadel.
-
-**Cierre:** cada punto anterior tiene su `*.test.ts` junto al módulo; `npm run test` en verde sin `.env` local; volver a introducir cualquiera de los bugs de P1/P2 cubiertos hace fallar un test.
-
----
-
-## Registro
-
-| Parte                           | Estado | PR / notas                               |
-| ------------------------------- | ------ | ---------------------------------------- |
-| E1 Layout del grupo (app)       | ✅     |                                          |
-| E2 Carpeta shell                | ✅     |                                          |
-| E3 Frontera de ui/              | ✅     | Regla de ESLint sobre `components/ui/**` |
-| E4 Ubicación de estados         | ✅     |                                          |
-| E5 Capa de servidor             | ✅     |                                          |
-| E6 Explorar en componentes      | ✅     | `+page.svelte` queda en ~180 líneas      |
-| E7 Acento fuera del reproductor | ✅     |                                          |
-| E8 Documentación y restos       | ✅     |                                          |
-| E9 Tests                        | ✅     | 121 tests, sin `.env` local              |
-
-Leyenda: ⬜ pendiente · 🟡 en curso · ✅ hecho.

web-player/docs/paginas.md

@@ -1,50 +1,128 @@
 # Musify, page guide
 
-Living document describing what each page of the web frontend contains. The design system (tokens, recipes, components) lives in the `musify-web` skill and in `CLAUDE.md`; here we describe **content and structure**, not styling.
+Living document describing what each page of the web frontend should contain. It works as a map for prioritizing features. The design system (tokens, recipes, components) lives in the `musify-web` skill; here we describe **content and structure**, not styling.
+
+Status legend: ✅ done · 🟡 partial / mockup · ⬜ pending.
+
+> **Note (app redesign):** the `Musify.dc.html` prototype is being ported over (an app with a sidebar, views, and a persistent player with a dynamic accent per track). The marketing landing page was removed. The sections below still describe the older design and are pending an update to match the app views (Home, Search, Library, Upload, Import, Downloads, Playlists). The **player** is already built as components in `$lib/components/player/`, with its theme in `$lib/theme/` (`theme.css` for the palette, `color.ts` for the accent and gradient).
+
+## Home (app) `/` 🟡
+
+- **Hero**: a greeting plus "Your music. No limits." with a color wash taken from the current track's hue.
+- **Quick access, meaning recently played** (`GET /users/{id}/listening-history` merged with `player.recentlyPlayed` via `mergeRecentlyPlayed`). Empty state with an icon and an "Explore" CTA.
+- **Your playlists**: mosaic cards for the user's playlists (sample data for now). Has an empty state.
+- **Resume on load**: the root layout fetches `GET /users/{id}/last-listened-track` and hydrates the player (`player.hydrate`) with it, paused, so the player bar isn't empty on a fresh session. Only applies when nothing is already loaded (won't override an in-progress session).
+
+### Pending backend work (ASP.NET) for Home
+
+- **Playlists by last listen**: add `lastPlayedAt` to the playlist (the schema currently only has `createdAt`/`updatedAt`) and allow sorting `GET /playlists/users/{userId}` by that field (for example `?sort=lastPlayed`), to show "your most recently played" playlists.
+- Tracks will need an **artist** and a **color/hue** (or a real cover to extract one from) for the artwork and the dynamic accent. Right now `TrackApplicationResponse` carries neither artist nor color.
 
 ## Route structure
 
-Everything the user sees after signing in lives under the `(app)` group (the group doesn't change the URL). `auth/` and `api/` sit outside it.
+Routes are grouped to separate the public experience from the authenticated one (the groups don't change the URL):
 
 ```
 src/routes/
-  (app)/
+  (marketing)/        Public, no session required
-    +page.svelte                  /                      Home
+    +page.svelte        /            Landing            ✅
-    explore/                      /explore               Search and genre discovery
+  (app)/              The app experience
-    liked/                        /liked                 Liked songs
+    explore/            /explore     Explore / search    ✅
-    library/                      /library               Your uploaded songs
+    upload/             /upload      Upload music         🟡 mockup
-    upload/                       /upload                Upload a song
+    library/             /library     Your library          ⬜
-    albums/                       /albums                Your albums
+    playlists/            /playlists   Your playlists         ⬜
-      [id]/                       /albums/:id            Album detail
+      [id]/                /playlists/:id  Playlist detail    ⬜
-    playlists/                    /playlists             Your playlists
+  auth  auth/login  auth/logout  auth/callback  Auth (page + endpoints)   ✅
-      [id]/                       /playlists/:id         Playlist detail
+  api/tracks/[id]/stream             Stream proxy         ✅
-    mixes/[id]/                   /mixes/:id             Generated mix
-    user/[id]/                    /user/:id              Public profile
-      [list=followList]/          /user/:id/followers|following
-  auth/  auth/login  auth/logout  auth/callback         Login screen and OIDC endpoints
-  api/                                                   Same origin JSON endpoints used by the client
 ```
 
-Global chrome on every app page: sidebar (desktop) or tab bar (mobile), top bar with search and account menu, the persistent player dock, and the queue panel.
+Global components (present on every page): **Navbar**, **Footer**, and **PlayerBar** (the fixed playback bar, shown while something is playing).
 
-## Pages
+---
 
-- **Home `/`**: a greeting, weekly listening stats, "continue listening" (recently played merged with the in-session history), the featured playlist with its first tracks (play and shuffle load the full list on demand), the user's mixes and playlists. Anonymous visitors are redirected to `/explore`.
+## 1. Landing `/` ✅ (marketing)
-- **Explore `/explore`**: genre tiles when there is no query, otherwise search results grouped by songs, albums, users and playlists with filter chips and counts taken from the API totals. Songs paginate with infinite scroll. Track and album context menus offer play next, add to queue and add to playlist.
-- **Liked `/liked`**: the songs the user liked, newest first, with unlike per row.
-- **Library `/library`**: the songs the user uploaded, with a confirmed delete.
-- **Upload `/upload`**: audio, cover, title, genres (incompatible genres are blocked) and explicit flag. The server reserves presigned URLs, uploads both files and creates the track; processing happens asynchronously in the backend.
-- **Albums `/albums`, `/albums/:id`**: list and create albums. The owner can edit, delete and add or remove tracks from their library.
-- **Playlists `/playlists`, `/playlists/:id`**: list and create playlists. The owner can edit, delete and remove tracks; everyone else gets a read only view.
-- **Mix `/mixes/:id`**: a generated mix with play, shuffle and a track menu.
-- **Profile `/user/:id`**: public playlists, follow button and links to the followers and following lists, which respect the profile's privacy.
-- **Auth `/auth`**: the login screen. Its buttons lead to `/auth/login`, which starts the Zitadel OIDC flow; `?mode=register` opens the sign up variant and `?returnTo=` (local paths only) sends the user back afterwards. `/auth/logout` ends the session and `/auth/callback` creates the encrypted `mf_session` cookie.
 
-## Data flow
+The entry page for logged out visitors. Its job is to sell the product and drive people to sign up or explore.
 
-Each page loads its data in `+page.server.ts` through the typed API client, and normalizes it with the mappers in `$lib/server/mappers.ts` so the client only ever sees the domain types in `$lib/types.ts`. Mutations are form actions built with `authedAction`. Client side pagination goes through the `/api/*` endpoints.
+- **Hero**: a status badge (beta), a title, a subtitle, a primary CTA (Start for free, leading to sign up) and a secondary one (Explore songs).
+- **Features**: three cards covering listening, playlists, and uploading.
+- **Suggested next steps**: a screenshots or demo section, social proof, a short FAQ.
 
-## Pending backend work
+## 2. Login / Auth ✅ (endpoints)
 
-- Sorting playlists by last listen (`lastPlayedAt`) for a "recently played playlists" shelf.
+`/auth` is Musify's login screen; its buttons lead to `/auth/login`, which kicks off the Zitadel OIDC flow and redirects. `?mode=register` starts on the sign up variant, and `?returnTo=` sends the user back to the route they came from once they're in. `/auth/logout` ends the session. `/auth/callback` exchanges the code and creates the encrypted `mf_session` cookie. The credentials UI itself is served by Zitadel, not by Musify.
-- An endpoint returning the most listened tracks, to bring back a "popular" section on Home.
+
+## 3. Explore / Search `/explore` ✅ (app)
+
+Discovery and search over the catalog.
+
+- **Search box**: a text input (`?q=`) that filters by name on the backend.
+- **Results count** and a **track grid** (2 to 4 columns): cover, title, date, and a play/pause button on hover that queues and plays through the global player.
+- **Pagination**: previous/next (`?page=`, 24 per page).
+- **Empty state**: no results, or an empty catalog.
+- **Suggested next steps**: filters (most recent, by user), loading skeletons, a real track cover (the listing API doesn't currently return the image key).
+
+## 4. Upload music `/upload` 🟡 mockup (app)
+
+Adding a new song. The real backend flow, for when it gets wired up:
+
+1. `POST /tracks/upload-urls` returns presigned URLs for cover and audio, plus `intentId`s.
+2. `PUT` each file to its presigned URL (a direct upload to storage).
+3. `POST /tracks` with `title`, `pictureIntentId`, `audioIntentId`.
+4. The backend processes the audio asynchronously (transcoding it to DASH).
+
+What the page needs:
+
+- **Audio zone**: drag and drop or a file picker, showing the file's name and size, with type (audio) and size validation.
+- **Cover**: an image picker with a square preview.
+- **Metadata**: title (required), with room for future fields like a description.
+- **Visible pipeline**: the Upload, Process, Publish steps and their status.
+- **Progress bar** for the upload and the processing state.
+- **States**: empty, file selected, uploading, processing, published, error.
+- **Requires a session** (once wired up: redirect to `/auth?returnTo=/upload`).
+
+## 5. Your library `/library` ⬜ (app)
+
+The authenticated user's personal panel, everything of theirs in one place.
+
+- **Tabs / sections**: "Your songs" (`GET /tracks/users/{userId}`) and "Your playlists" (`GET /playlists/users/{userId}`).
+- **Your songs**: a list with play, plus management actions (delete via `DELETE /tracks/{id}`, add to a playlist).
+- **Your playlists**: a grid of covers with a "Create playlist" button.
+- **Empty state** with a CTA to upload or create.
+- **Requires a session.**
+
+## 6. Playlists `/playlists` ⬜ (app)
+
+A listing of the user's playlists.
+
+- **Grid** of playlists (cover, name, track count), linking to the detail page.
+- **Create playlist**: a modal or page with a name, description, and cover (`POST /playlists`, cover via `POST /playlists/upload-picture`).
+- **Empty state** with a CTA.
+- **Requires a session.**
+
+## 7. Playlist detail `/playlists/[id]` ⬜ (app)
+
+- **Header**: a large cover, name, description, track count, and a "Play all" button.
+- **Track list** (`GET /playlists/{id}/tracks`, paginated): index, title, date, play, and remove from the playlist (`DELETE /playlists/{id}/tracks/{trackId}`).
+- **Owner actions**: edit (`PUT`), delete (`DELETE`) the playlist, reorder (a future addition).
+- **Add tracks**: from explore or the library (`POST /playlists/{id}/tracks/{trackId}`).
+
+## 8. User profile `/user/[id]` ⬜ (future)
+
+A public view of a user: avatar, name, their public songs and playlists (`GET /users/{id}`, `GET /tracks/users/{id}`, `GET /playlists/users/{id}`).
+
+---
+
+## Global player (PlayerBar) ✅
+
+A fixed bottom bar, visible while something is playing. Shows track info, transport controls (previous, play/pause, next), a progress bar, and volume control. Queues lists from any grid (`player.playQueue`). Plays DASH through the `/api/tracks/:id/stream` proxy, which requests a manifest and a signed ticket from the backend.
+
+## Available backend (summary)
+
+| Resource  | Endpoints                                                         |
+| --------- | ----------------------------------------------------------------- |
+| Tracks    | list/search, detail, by user, stream, create, delete, upload-urls |
+| Playlists | CRUD, playlist tracks, add/remove track, upload-picture           |
+| Users     | list/search, detail, create                                       |
+
+Typed client in `$lib/server/api.ts` (`openapi-fetch`, ErrorOr style). Use it inside `load`/server actions, never from the client. Types live in `src/lib/api/schema.d.ts`.

web-player/eslint.config.js

@@ -19,19 +19,6 @@ export default ts.config(
 				'error',
 				{ argsIgnorePattern: '^_', varsIgnorePattern: '^_' }
 			],
-			'@typescript-eslint/no-non-null-assertion': 'error',
-			'no-restricted-imports': [
-				'error',
-				{
-					patterns: [
-						{
-							group: ['../*'],
-							message: 'Use $lib/... instead of relative parent imports.'
-						}
-					]
-				}
-			],
-			'svelte/no-unused-props': 'error',
 			'svelte/no-navigation-without-resolve': 'off',
 			'svelte/prefer-svelte-reactivity': 'off'
 		}
@@ -48,34 +35,6 @@ export default ts.config(
 			'@typescript-eslint/no-unused-expressions': 'off'
 		}
 	},
-	{
-		files: ['src/lib/components/ui/**'],
-		rules: {
-			'no-restricted-imports': [
-				'error',
-				{
-					patterns: [
-						{
-							group: ['../*'],
-							message: 'Use $lib/... instead of relative parent imports.'
-						},
-						{
-							group: [
-								'$lib/player/*',
-								'$lib/data/*',
-								'$lib/server/*',
-								'$lib/components/music/*',
-								'$lib/components/shell/*',
-								'$lib/components/player/*'
-							],
-							message:
-								'components/ui is the presentation layer: it cannot depend on app state, data or other component layers.'
-						}
-					]
-				}
-			]
-		}
-	},
 	{
 		ignores: ['build/', '.svelte-kit/', 'static/', 'src/lib/api/schema.d.ts']
 	}

web-player/package-lock.json

@@ -36,8 +36,7 @@
 				"tailwindcss": "^4.3.0",
 				"typescript": "^6.0.3",
 				"typescript-eslint": "^8.64.0",
-				"vite": "^8.0.16",
+				"vite": "^8.0.16"
-				"vitest": "^5.0.1"
 			}
 		},
 		"node_modules/@emnapi/core": {
@@ -52,6 +51,17 @@
 				"tslib": "^2.4.0"
 			}
 		},
+		"node_modules/@emnapi/core/node_modules/@emnapi/wasi-threads": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
+			"integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==",
+			"license": "MIT",
+			"optional": true,
+			"peer": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/@emnapi/runtime": {
 			"version": "1.11.3",
 			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
@@ -64,12 +74,11 @@
 			}
 		},
 		"node_modules/@emnapi/wasi-threads": {
-			"version": "1.2.3",
+			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
+			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
-			"integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==",
+			"integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
 			"license": "MIT",
 			"optional": true,
-			"peer": true,
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
@@ -334,9 +343,9 @@
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.6.0",
+			"version": "1.5.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-			"integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
+			"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
 			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
@@ -359,24 +368,21 @@
 			}
 		},
 		"node_modules/@napi-rs/wasm-runtime": {
-			"version": "1.2.4",
+			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.4.tgz",
+			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
-			"integrity": "sha512-AJxoUD2/15ESHbvpcyjU274nsAPLuOtPHCk0vKJM5pj//Fg/B1FXNWjPnXTT9PymCYYiHo4zPj0ZomXBKhoy7g==",
+			"integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
 				"@tybys/wasm-util": "^0.10.3"
 			},
-			"engines": {
-				"node": "^20.19.0 || ^22.13.0 || >=23.5.0"
-			},
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/Brooooooklyn"
 			},
 			"peerDependencies": {
-				"@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4",
+				"@emnapi/core": "^1.7.1",
-				"@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4"
+				"@emnapi/runtime": "^1.7.1"
 			}
 		},
 		"node_modules/@oxc-project/types": {
@@ -625,16 +631,6 @@
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
-			"integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"tslib": "^2.4.0"
-			}
-		},
 		"node_modules/@rolldown/binding-win32-arm64-msvc": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.4.tgz",
@@ -1560,39 +1556,21 @@
 			}
 		},
 		"node_modules/@tybys/wasm-util": {
-			"version": "0.10.4",
+			"version": "0.10.3",
-			"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.4.tgz",
+			"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
-			"integrity": "sha512-W3c4gRigFS0T/Ma4qIYF3GDAc5AQdHb1yL5znJT1Zv1YaD9Kitx656wBjvr19qbiosmZT8lWDM5BEMynUqX65A==",
+			"integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@types/chai": {
-			"version": "5.2.3",
-			"resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
-			"integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/deep-eql": "*",
-				"assertion-error": "^2.0.1"
-			}
-		},
 		"node_modules/@types/cookie": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
 			"integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
 			"license": "MIT"
 		},
-		"node_modules/@types/deep-eql": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
-			"integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@types/esrecurse": {
 			"version": "4.3.1",
 			"resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz",
@@ -1865,64 +1843,6 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
-		"node_modules/@vitest/mocker": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-5.0.1.tgz",
-			"integrity": "sha512-6K1DoBNAPGvuOcSsGA4D6x+5zEEff/KmOOP3uetT2TrGpVfI+HRHRnJJfKi5ib/g1vx8IYHQD8s0pbJz8WQI7Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "0.3.31",
-				"@vitest/spy": "5.0.1",
-				"estree-walker": "^3.0.3",
-				"magic-string": "^1.2.3"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			},
-			"peerDependencies": {
-				"msw": "^2.4.9",
-				"vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"msw": {
-					"optional": true
-				},
-				"vite": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@vitest/mocker/node_modules/estree-walker": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-			"integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/estree": "^1.0.0"
-			}
-		},
-		"node_modules/@vitest/mocker/node_modules/magic-string": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.2.tgz",
-			"integrity": "sha512-vG+rjFRj1PqdIBozIxAGMjPlOhaVe+GXpbttY/iSK7rGcJRMlwNJO7dcUwmUqkymsFLJiNGI06t4D7Fr7yRC9g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/sourcemap-codec": "^1.6.0"
-			}
-		},
-		"node_modules/@vitest/spy": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-5.0.1.tgz",
-			"integrity": "sha512-rbto/mF/SGERxEgYOek7Xm6B9b+y+mVoo+f4b2LymYO8zM1b7uB5nHuhVMTP2hxdzgxvGiZYGxGIaMvL5y180Q==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			}
-		},
 		"node_modules/acorn": {
 			"version": "8.17.0",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
@@ -1971,16 +1891,6 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/assertion-error": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
-			"integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/axobject-query": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
@@ -2013,16 +1923,6 @@
 				"node": "18 || 20 || >=22"
 			}
 		},
-		"node_modules/chai": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
-			"integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
 		"node_modules/chokidar": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
@@ -2163,13 +2063,6 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/es-module-lexer": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz",
-			"integrity": "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/escape-string-regexp": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -2430,16 +2323,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/expect-type": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz",
-			"integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=12.0.0"
-			}
-		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -3124,9 +3007,9 @@
 			}
 		},
 		"node_modules/obug": {
-			"version": "2.2.1",
+			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/obug/-/obug-2.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz",
-			"integrity": "sha512-XrsrhT5sybtKI6wakr2SPOlGZWWYbUXZ7a0jT8/QOeAPau+1X/bSegNe5YR75oJmEZQbKningirmGOEJCIk61Q==",
+			"integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==",
 			"funding": [
 				"https://github.com/sponsors/sxzz",
 				"https://opencollective.com/debug"
@@ -3247,9 +3130,9 @@
 			"license": "ISC"
 		},
 		"node_modules/picomatch": {
-			"version": "4.0.7",
+			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
-			"integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
+			"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=12"
@@ -3690,13 +3573,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/siginfo": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-			"integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-			"dev": true,
-			"license": "ISC"
-		},
 		"node_modules/sirv": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz",
@@ -3720,20 +3596,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/stackback": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-			"integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/std-env": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz",
-			"integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -3898,26 +3760,6 @@
 				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"node_modules/tinybench": {
-			"version": "6.1.4",
-			"resolved": "https://registry.npmjs.org/tinybench/-/tinybench-6.1.4.tgz",
-			"integrity": "sha512-9APumHG7r4yOk4X4WlkmE71aZcv1gvin1czO3OQ1U9iJcFA5Ja/ygyb0vPOVHTthFozUYs8CLoLUlM8grb2lTQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=20.0.0"
-			}
-		},
-		"node_modules/tinyexec": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz",
-			"integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
 		"node_modules/tinyglobby": {
 			"version": "0.2.17",
 			"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
@@ -4134,99 +3976,6 @@
 				}
 			}
 		},
-		"node_modules/vitest": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/vitest/-/vitest-5.0.1.tgz",
-			"integrity": "sha512-iA95lQbKEkvrtTkdAgnWbXfbipWiiWe/hDl2P5tMi6WFwD76G0NxXAGp/M9EOcYupeGJRr6wppMc7CoA41TQjg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/chai": "^5.2.2",
-				"@vitest/mocker": "5.0.1",
-				"chai": "^6.2.2",
-				"es-module-lexer": "^2.3.2",
-				"expect-type": "^1.4.0",
-				"magic-string": "^1.2.3",
-				"obug": "^2.1.4",
-				"picomatch": "^4.0.7",
-				"std-env": "^4.2.0",
-				"tinybench": "6.1.4",
-				"tinyexec": "1.3.0",
-				"tinyglobby": "^0.2.17",
-				"why-is-node-running": "^2.3.0"
-			},
-			"bin": {
-				"vitest": "vitest.mjs"
-			},
-			"engines": {
-				"node": "^22.12.0 || ^24.0.0 || >=26.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/vitest"
-			},
-			"peerDependencies": {
-				"@edge-runtime/vm": "*",
-				"@opentelemetry/api": "^1.9.0",
-				"@types/node": "^22.0.0 || >=24.0.0",
-				"@vitest/browser-playwright": "5.0.1",
-				"@vitest/browser-preview": "5.0.1",
-				"@vitest/browser-webdriverio": "^5.0.0-beta.5 || >=5.0.0",
-				"@vitest/coverage-istanbul": "5.0.1",
-				"@vitest/coverage-v8": "5.0.1",
-				"@vitest/ui": "5.0.1",
-				"happy-dom": "*",
-				"jsdom": "*",
-				"vite": "^6.4.0 || ^7.0.0 || ^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@edge-runtime/vm": {
-					"optional": true
-				},
-				"@opentelemetry/api": {
-					"optional": true
-				},
-				"@types/node": {
-					"optional": true
-				},
-				"@vitest/browser-playwright": {
-					"optional": true
-				},
-				"@vitest/browser-preview": {
-					"optional": true
-				},
-				"@vitest/browser-webdriverio": {
-					"optional": true
-				},
-				"@vitest/coverage-istanbul": {
-					"optional": true
-				},
-				"@vitest/coverage-v8": {
-					"optional": true
-				},
-				"@vitest/ui": {
-					"optional": true
-				},
-				"happy-dom": {
-					"optional": true
-				},
-				"jsdom": {
-					"optional": true
-				},
-				"vite": {
-					"optional": false
-				}
-			}
-		},
-		"node_modules/vitest/node_modules/magic-string": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.2.tgz",
-			"integrity": "sha512-vG+rjFRj1PqdIBozIxAGMjPlOhaVe+GXpbttY/iSK7rGcJRMlwNJO7dcUwmUqkymsFLJiNGI06t4D7Fr7yRC9g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/sourcemap-codec": "^1.6.0"
-			}
-		},
 		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -4243,23 +3992,6 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/why-is-node-running": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
-			"integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"siginfo": "^2.0.0",
-				"stackback": "0.0.2"
-			},
-			"bin": {
-				"why-is-node-running": "cli.js"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/word-wrap": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",

web-player/package.json

@@ -11,11 +11,9 @@
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"gen:api": "npx -y openapi-typescript@7 http://localhost:5111/openapi/v1.json -o src/lib/api/schema.d.ts",
-		"test": "vitest run",
-		"test:watch": "vitest",
 		"format": "prettier --write .",
 		"lint:tokens": "node scripts/check-tokens.mjs",
-		"lint": "prettier --check . && eslint . && npm run lint:tokens && npm run test"
+		"lint": "prettier --check . && eslint . && npm run lint:tokens"
 	},
 	"devDependencies": {
 		"@eslint/js": "^10.0.1",
@@ -35,8 +33,7 @@
 		"tailwindcss": "^4.3.0",
 		"typescript": "^6.0.3",
 		"typescript-eslint": "^8.64.0",
-		"vite": "^8.0.16",
+		"vite": "^8.0.16"
-		"vitest": "^5.0.1"
 	},
 	"dependencies": {
 		"@fontsource-variable/bricolage-grotesque": "^5.3.0",

web-player/scripts/check-tokens.mjs

@@ -24,16 +24,12 @@ const PAIRED_HW = /\b(?:([a-z0-9-]+:))?h-([\d.]+)\s+\1w-\2\b/g;
 const QUARTER_STEP_SPACING = /\b[a-z-]+-\d+\.(25|75)\b/g;
 const HEX_COLOR = /#[0-9a-fA-F]{3,8}\b/g;
 const RGBA_LITERAL = /\brgba?\(/g;
-const LUCIDE_IMPORT = /import (\w+) from '@lucide\/svelte\/icons\/[\w-]+'/g;
-const ICON_PIXEL_SIZE = /\bsize=\{\d+\}/;
-const ICON_RAW_SIZE = /\bclass="[^"]*\bsize-\d[\w.]*/;
 
 let violations = [];
 
 for (const file of files) {
 	const content = readFileSync(file, 'utf8');
 	const lines = content.split('\n');
-	const icons = [...content.matchAll(LUCIDE_IMPORT)].map((m) => m[1]);
 
 	lines.forEach((line, i) => {
 		const lineNo = i + 1;
@@ -44,17 +40,6 @@ for (const file of files) {
 			}
 		}
 
-		for (const icon of icons) {
-			const tag = line.match(new RegExp(`<${icon}\\s[^>]*`));
-			if (!tag) continue;
-			if (ICON_PIXEL_SIZE.test(tag[0])) {
-				violations.push(`${file}:${lineNo} — icono con size={N}: usa una clase size-icon-*`);
-			}
-			if (ICON_RAW_SIZE.test(tag[0])) {
-				violations.push(`${file}:${lineNo} — icono con size-N: usa una clase size-icon-*`);
-			}
-		}
-
 		for (const match of line.matchAll(RAW_ROUNDED)) {
 			violations.push(`${file}:${lineNo} — radio de Tailwind sin tokenizar: \`${match[0]}\``);
 		}

web-player/src/app.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" class="scrollbar-stable">
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />

web-player/src/hooks.server.ts

@@ -1,16 +1,15 @@
 import type { Handle } from '@sveltejs/kit';
 import {
-	clearSessionCookie,
 	decodeSession,
 	encodeSession,
-	readSessionCookie,
 	refreshSession,
-	writeSessionCookie
+	sessionCookieOptions,
+	SESSION_COOKIE
 } from '$lib/server/auth';
 import { authConfig } from '$lib/server/config';
 
 export const handle: Handle = async ({ event, resolve }) => {
-	let session = await decodeSession(readSessionCookie(event.cookies));
+	let session = await decodeSession(event.cookies.get(SESSION_COOKIE));
 
 	if (
 		session &&
@@ -18,9 +17,13 @@ export const handle: Handle = async ({ event, resolve }) => {
 	) {
 		session = await refreshSession(session);
 		if (session) {
-			writeSessionCookie(event.cookies, await encodeSession(session), event.url);
+			event.cookies.set(
+				SESSION_COOKIE,
+				await encodeSession(session),
+				sessionCookieOptions(event.url)
+			);
 		} else {
-			clearSessionCookie(event.cookies);
+			event.cookies.delete(SESSION_COOKIE, { path: '/' });
 		}
 	}
 

web-player/src/lib/actions/onEscape.ts

@@ -1,17 +0,0 @@
-import type { Action } from 'svelte/action';
-
-export const onEscape: Action<HTMLElement, (() => void) | undefined> = (_node, handler) => {
-	function onKeydown(event: KeyboardEvent) {
-		if (event.key === 'Escape') handler?.();
-	}
-	window.addEventListener('keydown', onKeydown);
-
-	return {
-		update(next) {
-			handler = next;
-		},
-		destroy() {
-			window.removeEventListener('keydown', onKeydown);
-		}
-	};
-};

web-player/src/lib/components/layout/MobileHeader.svelte

@@ -3,10 +3,11 @@
 	import Upload from '@lucide/svelte/icons/upload';
 	import Folder from '@lucide/svelte/icons/folder';
 	import LogIn from '@lucide/svelte/icons/log-in';
-	import MenuItem from '$lib/components/ui/overlay/MenuItem.svelte';
+	import MenuItem from '../ui/overlay/MenuItem.svelte';
-	import AccountMenu from '$lib/components/shell/AccountMenu.svelte';
+	import AccountMenu from '../ui/overlay/AccountMenu.svelte';
-	import IconButton from '$lib/components/ui/primitives/IconButton.svelte';
+	import Avatar from '../ui/media/Avatar.svelte';
-	import Logo from '$lib/components/ui/primitives/Logo.svelte';
+	import IconButton from '../ui/primitives/IconButton.svelte';
+	import Logo from '../ui/primitives/Logo.svelte';
 
 	interface Props {
 		user: SessionUser | null;
@@ -25,6 +26,17 @@
 
 	{#if user}
 		<AccountMenu {user} {accountUrl} width="md">
+			{#snippet trigger({ toggle, open })}
+				<button
+					type="button"
+					onclick={toggle}
+					aria-label="Tu cuenta"
+					aria-expanded={open}
+					class="flex items-center rounded-full"
+				>
+					<Avatar name={user.name} src={user.picture} size="sm" />
+				</button>
+			{/snippet}
 			{#snippet extraItems({ close })}
 				<MenuItem icon={Folder} label="Canciones subidas" href="/library" onclick={close} />
 				<MenuItem icon={Upload} label="Subir música" href="/upload" onclick={close} />
@@ -32,7 +44,7 @@
 		</AccountMenu>
 	{:else}
 		<IconButton href="/auth/login" reload label="Iniciar sesión" shape="round" size="md">
-			<LogIn class="size-icon-lg" />
+			<LogIn class="size-icon-lg" strokeWidth={2} />
 		</IconButton>
 	{/if}
 </header>