Merge pull request 'ci(release): bundle the latest release APK into non-tag :latest builds' (#100) from dev into main

Every main push moves :latest, but main builds don't build an APK — so the
in-app update channel silently vanished from :latest until the next tag.

Now the image-release job, on non-tag builds, pulls the most-recent
release's signed APK from the gitea API and reconstructs its exact
versionName (${TAG#v}.$(git rev-list --count TAG) — the same formula
android-release bakes in) for the version sidecar. No rebuild, just
rebundle; tag builds still bundle their own freshly-built APK. Checkout
gains fetch-depth:0 + fetch-tags so the commit count resolves. Degrades to
an empty client/ (404 update channel) — never a wrong version — if no
release / APK asset / tag count can be resolved.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.gitea/workflows/release.yml

@@ -2,8 +2,8 @@ name: release
 
 # Builds and pushes the minstrel container image to the Gitea registry.
 #
-#   push to main             → :main and :latest (no APK bundled)
+#   push to main             → :main and :latest (latest-release APK bundled)
-#   push tag vYYYY.MM.DD     → :vYYYY.MM.DD and :latest (APK bundled)
+#   push tag vYYYY.MM.DD     → :vYYYY.MM.DD and :latest (freshly-built APK bundled)
 #   workflow_dispatch        → manual trigger (same rules based on the ref)
 #
 # Release model: per-day CalVer tags (no trailing patch digit). The day's
@@ -20,6 +20,14 @@ name: release
 # happens in the same android-release job, so the Release-page download
 # link and the in-image bundled APK are both populated atomically.
 #
+# :latest always carries an APK. Because every main push also moves
+# :latest (not just tags), a main build with no APK would silently strip
+# the in-app update channel off :latest until the next release. So on
+# non-tag builds image-release pulls the MOST RECENT release's signed APK
+# and reconstructs its exact versionName (tag + commit-count, the same
+# formula android-release bakes in) for the version sidecar — no rebuild,
+# just rebundle. Tag builds keep bundling their own freshly-built APK.
+#
 # Android testing (lint + detekt + unit tests, debug APK upload on main)
 # lives in android.yml and runs independently on every push.
 
@@ -181,6 +189,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          # Full history + tags so non-tag :latest builds can resolve the
+          # latest release tag's commit count and reconstruct the bundled
+          # APK's exact versionName (see "Bundle latest release APK" below).
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Detect buildable project
         id: guard
@@ -221,9 +235,8 @@ jobs:
             | docker login git.fabledsword.com -u "${{ github.actor }}" --password-stdin
 
       - name: Download signed APK artifact
-        # Tag pushes only — android-release just produced this. Main
+        # Tag pushes only — android-release just produced this. Non-tag
-        # pushes skip and the image ships with empty client/ (the
+        # builds take the "Bundle latest release APK" path below instead.
-        # /api/client/version endpoint then returns 404 by design).
         if: steps.guard.outputs.ready == 'true' && startsWith(github.ref, 'refs/tags/v')
         uses: actions/download-artifact@v3
         with:
@@ -247,6 +260,42 @@ jobs:
           echo "${APK_VERSION_NAME}" > client/minstrel.apk.version
           ls -lh client/
 
+      - name: Bundle latest release APK (non-tag :latest builds)
+        # Main pushes don't build an APK, but they DO move :latest — so
+        # without this the in-app update channel would vanish from :latest
+        # until the next tag. Pull the most-recent release's signed APK and
+        # reconstruct its exact versionName (${TAG#v}.$(git rev-list --count
+        # TAG) — identical to android-release's formula) so the version
+        # sidecar the server hands clients matches the installed build.
+        # Degrades to an empty client/ (404 update channel) — never a wrong
+        # version — if no release / APK asset / tag-count can be resolved.
+        if: steps.guard.outputs.ready == 'true' && !startsWith(github.ref, 'refs/tags/v')
+        shell: bash
+        env:
+          CI_TOKEN: ${{ secrets.CI_TOKEN }}
+        run: |
+          set -eu
+          REPO="${GITHUB_REPOSITORY}"
+          REL_JSON="$(curl -fsSL -H "Authorization: token ${CI_TOKEN}" \
+            "https://git.fabledsword.com/api/v1/repos/${REPO}/releases/latest" || true)"
+          if [ -z "${REL_JSON}" ]; then
+            echo "::notice::no published release — image ships without bundled APK"; exit 0
+          fi
+          TAG="$(printf '%s' "${REL_JSON}" | grep -oP '"tag_name":\s*"\K[^"]+' | head -1)"
+          APK_URL="$(printf '%s' "${REL_JSON}" | grep -oP '"browser_download_url":\s*"\K[^"]+' | grep -E '\.apk$' | head -1)"
+          if [ -z "${TAG}" ] || [ -z "${APK_URL}" ]; then
+            echo "::notice::latest release '${TAG:-?}' has no APK asset — image ships without bundled APK"; exit 0
+          fi
+          COUNT="$(git rev-list --count "${TAG}" 2>/dev/null || true)"
+          if [ -z "${COUNT}" ]; then
+            echo "::notice::could not resolve commit count for ${TAG} (tag not fetched?) — skipping APK bundle"; exit 0
+          fi
+          VERSION_NAME="${TAG#v}.${COUNT}"
+          curl -fsSL -H "Authorization: token ${CI_TOKEN}" -o client/minstrel.apk "${APK_URL}"
+          echo "${VERSION_NAME}" > client/minstrel.apk.version
+          echo "::notice::bundled release APK ${TAG} as version ${VERSION_NAME}"
+          ls -lh client/
+
       - name: Build and push
         if: steps.guard.outputs.ready == 'true'
         run: |

web/src/lib/api/admin/tracks.test.ts

@@ -1,64 +0,0 @@
-import { afterEach, describe, expect, test, vi } from 'vitest';
-import { removeTrack } from './tracks';
-
-afterEach(() => {
-  vi.unstubAllGlobals();
-});
-
-function stubFetch(status: number, body: unknown, init: Partial<Response> = {}) {
-  const res = new Response(
-    body === null ? null : JSON.stringify(body),
-    { status, headers: { 'Content-Type': 'application/json' }, ...init }
-  );
-  const spy = vi.fn().mockResolvedValue(res);
-  vi.stubGlobal('fetch', spy);
-  return spy;
-}
-
-describe('removeTrack', () => {
-  test('DELETEs /api/admin/tracks/:id with no query string when unmonitor unset', async () => {
-    const spy = stubFetch(200, {
-      deleted_track_id: 't-1',
-      deleted_album_id: 'al-1'
-    });
-
-    const r = await removeTrack('t-1');
-    expect(r.deleted_track_id).toBe('t-1');
-    expect(r.deleted_album_id).toBe('al-1');
-    expect(r.deleted_artist_id).toBeUndefined();
-    expect(r.lidarr_unmonitor_failed).toBeUndefined();
-
-    const call = spy.mock.calls[0];
-    expect(call[0]).toBe('/api/admin/tracks/t-1');
-    expect((call[1] as RequestInit).method).toBe('DELETE');
-  });
-
-  test('appends ?unmonitor=true when option set', async () => {
-    const spy = stubFetch(200, {
-      deleted_track_id: 't-1',
-      lidarr_unmonitor_failed: true
-    });
-
-    const r = await removeTrack('t-1', { unmonitor: true });
-    expect(r.lidarr_unmonitor_failed).toBe(true);
-
-    const call = spy.mock.calls[0];
-    expect(call[0]).toBe('/api/admin/tracks/t-1?unmonitor=true');
-  });
-
-  test('omits the query string when unmonitor: false', async () => {
-    const spy = stubFetch(200, { deleted_track_id: 't-1' });
-
-    await removeTrack('t-1', { unmonitor: false });
-    const call = spy.mock.calls[0];
-    expect(call[0]).toBe('/api/admin/tracks/t-1');
-  });
-
-  test('surfaces not_found as ApiError', async () => {
-    stubFetch(404, { error: 'not_found' });
-
-    await expect(removeTrack('t-1')).rejects.toMatchObject({
-      code: 'not_found'
-    });
-  });
-});

web/src/lib/api/admin/tracks.ts

@@ -1,42 +0,0 @@
-import { apiFetch } from '$lib/api/client';
-
-export type RemoveTrackResult = {
-  deleted_track_id: string;
-  deleted_album_id?: string;
-  deleted_artist_id?: string;
-  /** Only present (always `true` when set) when the operator requested
-   * unmonitor=true AND the Lidarr unmonitor call failed. The destructive
-   * file + DB delete already succeeded — surface a follow-up toast so
-   * the operator knows to manually unmonitor in Lidarr. */
-  lidarr_unmonitor_failed?: true;
-};
-
-export type RemoveTrackOptions = {
-  /** When true, after the file + DB delete the server calls
-   * Lidarr.UnmonitorTrack so Lidarr won't search for a replacement.
-   * When false / omitted, no Lidarr call — Lidarr's monitoring will
-   * re-import on next scan, which is the operator's "find a replacement"
-   * path. */
-  unmonitor?: boolean;
-};
-
-/**
- * DELETE /api/admin/tracks/{id} — admin-only. Deletes the file from
- * disk and the DB row, cascading album/artist tidy-up. Optionally
- * unmonitors the track in Lidarr.
- *
- * On success returns the deleted track id plus optional album/artist
- * ids when their parent row was tidied up by the server-side cascade.
- * Caller is responsible for invalidating any TanStack Query keys the
- * deleted entities backed.
- */
-export async function removeTrack(
-  id: string,
-  options: RemoveTrackOptions = {}
-): Promise<RemoveTrackResult> {
-  const params = new URLSearchParams();
-  if (options.unmonitor) params.set('unmonitor', 'true');
-  const qs = params.toString();
-  const url = `/api/admin/tracks/${encodeURIComponent(id)}${qs ? '?' + qs : ''}`;
-  return (await apiFetch(url, { method: 'DELETE' })) as RemoveTrackResult;
-}

web/src/lib/components/CompactTrackCard.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
+  import { Plus } from 'lucide-svelte';
   import type { TrackRef } from '$lib/api/types';
   import { playQueue, enqueueTrack } from '$lib/player/store.svelte';
   import { FALLBACK_COVER, coverUrl } from '$lib/media/covers';
   import TrackMenu from './TrackMenu.svelte';
-  import CardActionCluster from './CardActionCluster.svelte';
+  import LikeButton from './LikeButton.svelte';
 
   // Horizontal compact track row — cover thumb on the left, title +
   // artist on the right. Mirrors Android's CompactTrackTile so the
@@ -42,7 +43,7 @@
     type="button"
     aria-label={`Play ${track.title}`}
     onclick={onClick}
-    class="flex w-full items-center gap-2 rounded-md p-1 pr-12 text-left
+    class="flex w-full items-center gap-2 rounded-md p-1 pr-24 text-left
            hover:bg-surface-hover focus-visible:ring-2 focus-visible:ring-accent"
   >
     <div class="h-12 w-12 flex-shrink-0 overflow-hidden rounded bg-surface-hover">
@@ -59,14 +60,29 @@
       <div class="truncate text-xs text-text-secondary">{track.artist_name}</div>
     </div>
   </button>
-  <CardActionCluster
+  <!-- Single inline cluster, vertically centred on the right. The shared
-    likeEntityType="track"
+       CardActionCluster splits Like+Add (top) and the menu (bottom) into
-    likeEntityId={track.id}
+       opposite corners — correct for the tall square Album/Artist cards but
-    onAdd={onAddToQueue}
+       it makes the two groups collide on this short one-line row. A compact
-    addLabel={`Add ${track.title} to queue`}
+       row keeps all three controls in one horizontal group instead. -->
+  <!-- svelte-ignore a11y_click_events_have_key_events -->
+  <!-- svelte-ignore a11y_no_static_element_interactions -->
+  <div
+    class="absolute right-2 top-1/2 z-10 flex -translate-y-1/2 items-center gap-0.5
+           opacity-0 transition-opacity duration-150
+           group-hover:opacity-100 focus-within:opacity-100"
+    onclick={(e) => e.stopPropagation()}
   >
-    {#snippet menu()}
+    <LikeButton entityType="track" entityId={track.id} size="sm" />
+    <button
+      type="button"
+      aria-label={`Add ${track.title} to queue`}
+      onclick={onAddToQueue}
+      class="rounded-full bg-surface p-1 text-text-secondary hover:text-text-primary
+             focus-visible:ring-2 focus-visible:ring-accent"
+    >
+      <Plus size={16} strokeWidth={1} />
+    </button>
     <TrackMenu {track} />
-    {/snippet}
+  </div>
-  </CardActionCluster>
 </div>

web/src/lib/components/CompactTrackCard.test.ts

@@ -10,10 +10,6 @@ vi.mock('$lib/api/likes', () => emptyLikesMock());
 
 vi.mock('$lib/api/quarantine', () => emptyQuarantineMock());
 
-vi.mock('$lib/api/admin/tracks', () => ({
-  removeTrack: vi.fn().mockResolvedValue({ deleted_track_id: 't1' })
-}));
-
 vi.mock('$lib/api/playlists', () => emptyPlaylistsMock());
 
 vi.mock('$lib/auth/store.svelte', () => ({

web/src/lib/components/PlayerBar.svelte

@@ -272,8 +272,12 @@
     data-testid="player-bar-desktop"
     class="hidden md:flex md:flex-row md:min-h-[108px] md:items-center md:gap-4 border-t border-border bg-surface md:px-4 md:py-1.5"
   >
-    <!-- Left: cover + title + artist + like + menu -->
+    <!-- Left: cover + title + artist + like + menu.
-    <div class="flex w-72 min-w-0 items-center gap-3">
+         basis-72 grow max-w-md: holds its 288px floor at the md breakpoint
+         (where the seek column is the flex-1 that absorbs the remainder), but
+         on wider screens it grows up to 448px instead of leaving the title
+         truncated while the seek bar hogs the slack. -->
+    <div class="flex basis-72 grow max-w-md min-w-0 items-center gap-3">
       <a
         href="/now-playing"
         aria-label="Open now playing"
@@ -318,7 +322,10 @@
         </button>
       </div>
     {:else}
-      <div class="flex flex-1 flex-col items-stretch gap-2">
+      <!-- max-w-xl + mx-auto caps the seek bar (and the transport row) at
+           576px and centres it, so on wide screens the extra width flows to
+           the title column on the left rather than stretching the scrubber. -->
+      <div class="flex flex-1 flex-col items-stretch gap-2 mx-auto w-full max-w-xl">
         <!-- Transport row -->
         <div class="flex items-center justify-center gap-3">
           <button

web/src/lib/components/PlaylistTrackRow.test.ts

@@ -21,10 +21,6 @@ vi.mock('$lib/api/likes', () => emptyLikesMock());
 
 vi.mock('$lib/api/quarantine', () => emptyQuarantineMock());
 
-vi.mock('$lib/api/admin/tracks', () => ({
-  removeTrack: vi.fn().mockResolvedValue({ deleted_track_id: 't-1' })
-}));
-
 vi.mock('$lib/player/store.svelte', () => ({
   playNext: vi.fn(),
   enqueueTrack: vi.fn(),

web/src/lib/components/RemoveTrackPopover.svelte

@@ -1,103 +0,0 @@
-<script lang="ts">
-  import { Trash2 } from 'lucide-svelte';
-  import { useQueryClient } from '@tanstack/svelte-query';
-  import { removeTrack } from '$lib/api/admin/tracks';
-  import { errMessage } from '$lib/api/errors';
-  import { qk } from '$lib/api/queries';
-  import type { TrackRef } from '$lib/api/types';
-
-  let {
-    track,
-    onClose
-  }: {
-    track: TrackRef;
-    onClose: () => void;
-  } = $props();
-
-  const queryClient = useQueryClient();
-
-  let unmonitor = $state(false);
-  let busy = $state(false);
-  let error = $state<string | null>(null);
-
-  async function confirm() {
-    busy = true;
-    error = null;
-    try {
-      const result = await removeTrack(track.id, { unmonitor });
-      // Invalidate caches for any vanished entity. The album/artist that
-      // contained the track is always touched; if the parent rows were
-      // tidied up by the server cascade, evict those too. Home payload
-      // surfaces albums/artists on the landing page so it always
-      // refreshes.
-      await queryClient.invalidateQueries({ queryKey: qk.album(track.album_id) });
-      await queryClient.invalidateQueries({ queryKey: qk.artist(track.artist_id) });
-      await queryClient.invalidateQueries({ queryKey: qk.home() });
-      if (result.deleted_album_id) {
-        await queryClient.invalidateQueries({ queryKey: qk.album(result.deleted_album_id) });
-      }
-      if (result.deleted_artist_id) {
-        await queryClient.invalidateQueries({ queryKey: qk.artist(result.deleted_artist_id) });
-      }
-      // Note: result.lidarr_unmonitor_failed is true when unmonitor was
-      // requested AND Lidarr couldn't be reached. The destructive part
-      // already succeeded; we still close the popover. A future toast
-      // surface (if any) can pick up the flag.
-      onClose();
-    } catch (e: unknown) {
-      error = errMessage(e);
-    } finally {
-      busy = false;
-    }
-  }
-</script>
-
-<div
-  role="dialog"
-  tabindex="-1"
-  aria-modal="false"
-  aria-labelledby="remove-track-popover-title"
-  class="absolute right-0 z-30 mt-1 w-72 rounded-lg border border-border bg-surface p-3 shadow-xl"
-  onclick={(e) => e.stopPropagation()}
-  onkeydown={(e) => { e.stopPropagation(); if (e.key === 'Escape') onClose(); }}
->
-  <h4 id="remove-track-popover-title" class="text-sm font-medium text-text-primary">
-    Remove "{track.title}" from your library?
-  </h4>
-  <p class="mt-1 text-xs text-text-muted">
-    This deletes the file from disk.
-  </p>
-
-  <label class="mt-3 flex items-start gap-2 text-sm text-text-primary">
-    <input
-      type="checkbox"
-      bind:checked={unmonitor}
-      class="mt-0.5 rounded border-border"
-    />
-    <span>Also stop Lidarr from finding a replacement</span>
-  </label>
-
-  {#if error}
-    <p class="mt-2 text-xs text-action-destructive">{error}</p>
-  {/if}
-
-  <div class="mt-3 flex justify-end gap-2">
-    <button
-      type="button"
-      class="rounded-md border border-border px-2.5 py-1 text-sm text-text-secondary hover:text-text-primary disabled:opacity-50"
-      onclick={onClose}
-      disabled={busy}
-    >
-      Cancel
-    </button>
-    <button
-      type="button"
-      onclick={confirm}
-      disabled={busy}
-      class="inline-flex items-center gap-1 rounded-md border border-border bg-surface px-2.5 py-1 text-sm text-action-destructive hover:bg-surface-hover disabled:opacity-50"
-    >
-      <Trash2 size={14} strokeWidth={1} />
-      {busy ? 'Removing…' : 'Remove'}
-    </button>
-  </div>
-</div>

web/src/lib/components/RemoveTrackPopover.test.ts

@@ -1,97 +0,0 @@
-import { afterEach, describe, expect, test, vi } from 'vitest';
-import { render, screen, fireEvent, waitFor } from '@testing-library/svelte';
-import { makeTrack } from '$test-utils/fixtures/track';
-
-const invalidateMock = vi.fn();
-vi.mock('@tanstack/svelte-query', async (orig) => {
-  const actual = (await orig()) as Record<string, unknown>;
-  return {
-    ...actual,
-    useQueryClient: () => ({ invalidateQueries: invalidateMock })
-  };
-});
-
-vi.mock('$lib/api/admin/tracks', () => ({
-  removeTrack: vi.fn()
-}));
-
-import RemoveTrackPopover from './RemoveTrackPopover.svelte';
-import { removeTrack } from '$lib/api/admin/tracks';
-
-const track = makeTrack({ title: 'Roygbiv' });
-
-afterEach(() => vi.clearAllMocks());
-
-describe('RemoveTrackPopover', () => {
-  test('renders the title and subtext', () => {
-    render(RemoveTrackPopover, { props: { track, onClose: vi.fn() } });
-    expect(screen.getByText(/remove "roygbiv" from your library/i)).toBeInTheDocument();
-    expect(screen.getByText(/this deletes the file from disk/i)).toBeInTheDocument();
-  });
-
-  test('renders the Lidarr unmonitor checkbox', () => {
-    render(RemoveTrackPopover, { props: { track, onClose: vi.fn() } });
-    const cb = screen.getByRole('checkbox', { name: /also stop lidarr/i });
-    expect(cb).toBeInTheDocument();
-    expect((cb as HTMLInputElement).checked).toBe(false);
-  });
-
-  test('Cancel button calls onClose without firing removeTrack', async () => {
-    const onClose = vi.fn();
-    render(RemoveTrackPopover, { props: { track, onClose } });
-    await fireEvent.click(screen.getByRole('button', { name: /cancel/i }));
-    expect(removeTrack).not.toHaveBeenCalled();
-    expect(onClose).toHaveBeenCalled();
-  });
-
-  test('Remove without checkbox calls removeTrack with unmonitor=false', async () => {
-    (removeTrack as ReturnType<typeof vi.fn>).mockResolvedValue({ deleted_track_id: 't1' });
-    const onClose = vi.fn();
-    render(RemoveTrackPopover, { props: { track, onClose } });
-    await fireEvent.click(screen.getByRole('button', { name: /^remove$/i }));
-    // confirm() chains 3-5 awaited invalidateQueries calls before onClose,
-    // each a separate microtask. waitFor polls until the side effects land.
-    await waitFor(() => expect(onClose).toHaveBeenCalled());
-    expect(removeTrack).toHaveBeenCalledWith('t1', { unmonitor: false });
-  });
-
-  test('Remove with checkbox checked calls removeTrack with unmonitor=true', async () => {
-    (removeTrack as ReturnType<typeof vi.fn>).mockResolvedValue({ deleted_track_id: 't1' });
-    const onClose = vi.fn();
-    render(RemoveTrackPopover, { props: { track, onClose } });
-    await fireEvent.click(screen.getByRole('checkbox', { name: /also stop lidarr/i }));
-    await fireEvent.click(screen.getByRole('button', { name: /^remove$/i }));
-    await waitFor(() => expect(onClose).toHaveBeenCalled());
-    expect(removeTrack).toHaveBeenCalledWith('t1', { unmonitor: true });
-  });
-
-  test('failed remove surfaces error via copyForCode and does not close', async () => {
-    (removeTrack as ReturnType<typeof vi.fn>).mockRejectedValue({ code: 'not_found' });
-    const onClose = vi.fn();
-    render(RemoveTrackPopover, { props: { track, onClose } });
-    await fireEvent.click(screen.getByRole('button', { name: /^remove$/i }));
-    await waitFor(() => expect(removeTrack).toHaveBeenCalled());
-    // The catch path runs synchronously after the rejected await; one more
-    // microtask boundary is enough.
-    await Promise.resolve();
-    expect(onClose).not.toHaveBeenCalled();
-  });
-
-  test('success invalidates album, artist and home queries', async () => {
-    (removeTrack as ReturnType<typeof vi.fn>).mockResolvedValue({
-      deleted_track_id: 't1',
-      deleted_album_id: 'a1',
-      deleted_artist_id: 'ar1'
-    });
-    render(RemoveTrackPopover, { props: { track, onClose: vi.fn() } });
-    await fireEvent.click(screen.getByRole('button', { name: /^remove$/i }));
-    // Wait for all three baseline invalidations (album, artist, home) plus
-    // the two cascade ones (deleted_album_id, deleted_artist_id) to land.
-    await waitFor(() => expect(invalidateMock.mock.calls.length).toBeGreaterThanOrEqual(5));
-    const keys = invalidateMock.mock.calls.map((c) => c[0].queryKey);
-    const flat = keys.map((k) => Array.isArray(k) ? k.join('|') : String(k));
-    expect(flat.some((k) => k.startsWith('album|a1'))).toBe(true);
-    expect(flat.some((k) => k.startsWith('artist|ar1'))).toBe(true);
-    expect(flat.some((k) => k === 'home')).toBe(true);
-  });
-});

web/src/lib/components/TrackMenu.svelte

@@ -1,30 +1,27 @@
 <script lang="ts">
   import {
     MoreVertical,
-    ListPlus,
+    ListVideo,
-    Plus,
+    ListMusic,
     Heart,
     HeartOff,
-    ListMusic,
+    ListPlus,
-    Album,
+    Radio,
     Disc3,
-    Flag,
+    User,
     EyeOff,
-    Eye,
+    Eye
-    Trash2
   } from 'lucide-svelte';
   import { goto } from '$app/navigation';
   import { useQueryClient } from '@tanstack/svelte-query';
   import FlagPopover from './FlagPopover.svelte';
-  import RemoveTrackPopover from './RemoveTrackPopover.svelte';
   import AddToPlaylistMenu from './AddToPlaylistMenu.svelte';
   import TrackMenuItem from './TrackMenuItem.svelte';
   import TrackMenuDivider from './TrackMenuDivider.svelte';
-  import { user } from '$lib/auth/store.svelte';
   import { createLikedIdsQuery, likeEntity, unlikeEntity } from '$lib/api/likes';
   import { createMyQuarantineQuery, unflagTrack } from '$lib/api/quarantine';
   import { qk } from '$lib/api/queries';
-  import { playNext, enqueueTrack } from '$lib/player/store.svelte';
+  import { playNext, enqueueTrack, playRadio } from '$lib/player/store.svelte';
   import type { TrackRef } from '$lib/api/types';
 
   let {
@@ -44,7 +41,6 @@
 
   let menuOpen = $state(false);
   let flagOpen = $state(false);
-  let removeOpen = $state(false);
   let addOpen = $state(false);
 
   const queryClient = useQueryClient();
@@ -63,8 +59,6 @@
     return rows.some((r) => r.track_id === track.id);
   });
 
-  const isAdmin = $derived(user.value?.is_admin === true);
-
   function toggleMenu(e: MouseEvent) {
     e.stopPropagation();
     menuOpen = !menuOpen;
@@ -73,7 +67,6 @@
   function closeAll() {
     menuOpen = false;
     flagOpen = false;
-    removeOpen = false;
     addOpen = false;
   }
 
@@ -87,6 +80,11 @@
     closeAll();
   }
 
+  function onStartRadio() {
+    playRadio(track.id);
+    closeAll();
+  }
+
   async function onToggleLike() {
     closeAll();
     if (liked) {
@@ -119,18 +117,8 @@
     goto(`/artists/${track.artist_id}`);
   }
 
-  function onFlag() {
-    menuOpen = false;
-    flagOpen = true;
-  }
-
-  function onRemoveOpen() {
-    menuOpen = false;
-    removeOpen = true;
-  }
-
   function onKeydown(e: KeyboardEvent) {
-    if (!menuOpen && !flagOpen && !removeOpen && !addOpen) return;
+    if (!menuOpen && !flagOpen && !addOpen) return;
     if (e.key === 'Escape') {
       e.preventDefault();
       closeAll();
@@ -161,9 +149,16 @@
       onclick={(e) => e.stopPropagation()}
       onkeydown={(e) => { e.stopPropagation(); if (e.key === 'Escape') menuOpen = false; }}
     >
+      <!-- Item set + order mirror Android's canonical TrackActionsSheet so
+           the kebab reads the same on both clients: queue group → like /
+           add-to-playlist / start-radio group → navigation group → hide.
+           "Start radio" is shown even under hideQueueActions (reseeding a
+           station from the current track is meaningful where play-next /
+           add-to-queue are not). No single-click destructive action lives
+           here — track removal is intentionally kept out of the kebab. -->
       {#if !hideQueueActions}
-        <TrackMenuItem icon={ListPlus} label="Play next" onclick={onPlayNext} />
+        <TrackMenuItem icon={ListVideo} label="Play next" onclick={onPlayNext} />
-        <TrackMenuItem icon={Plus} label="Add to queue" onclick={onAddToQueue} />
+        <TrackMenuItem icon={ListMusic} label="Add to queue" onclick={onAddToQueue} />
 
         <TrackMenuDivider />
       {/if}
@@ -174,32 +169,24 @@
         onclick={onToggleLike}
       />
       <TrackMenuItem
-        icon={ListMusic}
+        icon={ListPlus}
         label="Add to playlist…"
         onclick={() => { addOpen = true; menuOpen = false; }}
       />
+      <TrackMenuItem icon={Radio} label="Start radio" onclick={onStartRadio} />
 
       <TrackMenuDivider />
 
-      <TrackMenuItem icon={Album} label="Go to album" onclick={onGoToAlbum} />
+      <TrackMenuItem icon={Disc3} label="Go to album" onclick={onGoToAlbum} />
-      <TrackMenuItem icon={Disc3} label="Go to artist" onclick={onGoToArtist} />
+      <TrackMenuItem icon={User} label="Go to artist" onclick={onGoToArtist} />
 
       <TrackMenuDivider />
 
-      <TrackMenuItem icon={Flag} label="Flag this track…" onclick={onFlag} />
       <TrackMenuItem
         icon={hidden ? Eye : EyeOff}
         label={hidden ? 'Unhide' : 'Hide'}
         onclick={onToggleHide}
       />
-      {#if isAdmin}
-        <TrackMenuItem
-          icon={Trash2}
-          label="Remove from library"
-          onclick={onRemoveOpen}
-          danger
-        />
-      {/if}
     </div>
   {/if}
 
@@ -207,10 +194,6 @@
     <FlagPopover {track} onClose={closeAll} />
   {/if}
 
-  {#if removeOpen}
-    <RemoveTrackPopover {track} onClose={closeAll} />
-  {/if}
-
   {#if addOpen}
     <AddToPlaylistMenu tracks={[track]} onClose={() => (addOpen = false)} />
   {/if}

web/src/lib/components/TrackMenu.test.ts

@@ -25,19 +25,16 @@ vi.mock('$lib/api/likes', () => emptyLikesMock());
 
 vi.mock('$lib/api/quarantine', () => emptyQuarantineMock());
 
-vi.mock('$lib/api/admin/tracks', () => ({
-  removeTrack: vi.fn().mockResolvedValue({ deleted_track_id: 't1' })
-}));
-
 vi.mock('$lib/api/playlists', () => emptyPlaylistsMock());
 
 vi.mock('$lib/player/store.svelte', () => ({
   playNext: vi.fn(),
-  enqueueTrack: vi.fn()
+  enqueueTrack: vi.fn(),
+  playRadio: vi.fn()
 }));
 
 import TrackMenu from './TrackMenu.svelte';
-import { playNext, enqueueTrack } from '$lib/player/store.svelte';
+import { playNext, enqueueTrack, playRadio } from '$lib/player/store.svelte';
 
 const track = makeTrack({ title: 'Roygbiv' });
 
@@ -55,7 +52,7 @@ describe('TrackMenu', () => {
     expect(kebab.getAttribute('aria-expanded')).toBe('true');
   });
 
-  test('opening menu shows all 9 entries for an admin user', async () => {
+  test('opening menu shows all 8 entries', async () => {
     render(TrackMenu, { props: { track } });
     await fireEvent.click(screen.getByRole('button', { name: /track actions/i }));
 
@@ -63,19 +60,12 @@ describe('TrackMenu', () => {
     expect(screen.getByRole('menuitem', { name: /add to queue/i })).toBeInTheDocument();
     expect(screen.getByRole('menuitem', { name: /^like$/i })).toBeInTheDocument();
     expect(screen.getByRole('menuitem', { name: /add to playlist/i })).toBeInTheDocument();
+    expect(screen.getByRole('menuitem', { name: /start radio/i })).toBeInTheDocument();
     expect(screen.getByRole('menuitem', { name: /go to album/i })).toBeInTheDocument();
     expect(screen.getByRole('menuitem', { name: /go to artist/i })).toBeInTheDocument();
-    expect(screen.getByRole('menuitem', { name: /flag this track/i })).toBeInTheDocument();
     expect(screen.getByRole('menuitem', { name: /^hide$/i })).toBeInTheDocument();
-    expect(screen.getByRole('menuitem', { name: /remove from library/i })).toBeInTheDocument();
 
-    expect(screen.getAllByRole('menuitem')).toHaveLength(9);
+    // No "Remove from library" — destructive removal is intentionally absent.
-  });
-
-  test('"Remove from library" hidden for non-admin', async () => {
-    userState.current = { id: 'u2', username: 'normal', is_admin: false };
-    render(TrackMenu, { props: { track } });
-    await fireEvent.click(screen.getByRole('button', { name: /track actions/i }));
     expect(screen.queryByRole('menuitem', { name: /remove from library/i })).not.toBeInTheDocument();
     expect(screen.getAllByRole('menuitem')).toHaveLength(8);
   });
@@ -113,10 +103,17 @@ describe('TrackMenu', () => {
     expect(screen.queryByRole('menu')).not.toBeInTheDocument();
   });
 
-  test('clicking "Flag this track…" opens FlagPopover and closes menu', async () => {
+  test('"Start radio" dispatches playRadio(track.id)', async () => {
     render(TrackMenu, { props: { track } });
     await fireEvent.click(screen.getByRole('button', { name: /track actions/i }));
-    await fireEvent.click(screen.getByRole('menuitem', { name: /flag this track/i }));
+    await fireEvent.click(screen.getByRole('menuitem', { name: /start radio/i }));
+    expect(playRadio).toHaveBeenCalledWith(track.id);
+  });
+
+  test('clicking "Hide" opens the flag/quarantine popover and closes menu', async () => {
+    render(TrackMenu, { props: { track } });
+    await fireEvent.click(screen.getByRole('button', { name: /track actions/i }));
+    await fireEvent.click(screen.getByRole('menuitem', { name: /^hide$/i }));
     expect(screen.queryByRole('menu')).not.toBeInTheDocument();
     expect(
       screen.getByRole('dialog', { name: /flag this track as broken/i })

web/src/routes/now-playing/+page.svelte

@@ -16,6 +16,7 @@
   import { FALLBACK_COVER, coverUrl } from '$lib/media/covers';
   import { useSmoothPosition } from '$lib/player/smoothPosition.svelte';
   import LikeButton from '$lib/components/LikeButton.svelte';
+  import TrackMenu from '$lib/components/TrackMenu.svelte';
   import QueueList from '$lib/components/QueueList.svelte';
   import { pageTitle } from '$lib/branding';
 
@@ -78,6 +79,15 @@
       <ArrowLeft size={22} strokeWidth={1.5} />
     </button>
     <div class="ml-2 text-xs uppercase tracking-wide text-text-secondary">Now playing</div>
+    <!-- Full-screen Now Playing carries the same kebab as Android's
+         NowPlayingScreen (hideQueueActions — the menu's track IS the one
+         playing), so Start radio / Add to playlist / Hide etc. are reachable
+         here, not just from the mini-player bar. -->
+    {#if current}
+      <div class="ml-auto">
+        <TrackMenu track={current} hideQueueActions />
+      </div>
+    {/if}
   </header>
 
   {#if !current}

web/src/routes/playlists/[id]/playlist.test.ts

@@ -41,7 +41,6 @@ vi.mock('$lib/api/likes', () => ({
   unlikeEntity: vi.fn()
 }));
 vi.mock('$lib/api/quarantine', () => emptyQuarantineMock());
-vi.mock('$lib/api/admin/tracks', () => ({ removeTrack: vi.fn() }));
 
 import PlaylistDetailPage from './+page.svelte';
 import { createPlaylistQuery, deletePlaylist, refreshSystem } from '$lib/api/playlists';