react-native-audio-browser 0.2.0-next.2 → 0.2.0-next.20

package/ios/Browser/BrowserManager.swift

@@ -64,14 +64,11 @@ final class BrowserManager {
   private let router = SimpleRouter()
   private let httpClient = HttpClient()
 
-  // LRU cache for individual tracks - keyed by both url and src for O(1) lookup
-  private let trackCache = LRUCache<String, Track>(maxSize: 3000)
-
   // LRU cache for resolved content - keyed by path
   private let contentCache = LRUCache<String, ResolvedTrack>(maxSize: 20)
 
-  // Cache for search results
-  private var lastSearchQuery: String?
+  // Most recent search, keyed by `searchCacheKey`.
+  private var lastSearchKey: String?
   private var lastSearchResults: [Track]?
 
   // Resolver caching: request/browse thunks resolve once per content generation.
@@ -80,12 +77,12 @@ final class BrowserManager {
   var resolvedRequestLayer: TransformableRequestConfig?
   private var resolvedBrowseLayer: TransformableRequestConfig?
 
-  // Set of favorited track identifiers (src)
+  // Set of favorited track identities (id when non-blank, else src).
   private var favoriteIds: Set<String> = []
 
-  // Favorite match mode, propagated from the player's `favorite` capability.
-  // nil = favoriting disabled (no row hearts). Set via setFavoriteMatch.
-  private var favoriteMatch: FavoritesMatchMode?
+  // Whether favoriting is enabled, propagated from the player's `favorite`
+  // capability. false = no row hearts. Set via setFavoriteEnabled.
+  private var favoriteEnabled = false
 
   // Navigation tracking to prevent race conditions
   private var currentNavigationId: Int = 0
@@ -165,78 +162,46 @@ final class BrowserManager {
     onFavoritesChanged?()
   }
 
-  /// Sets the favorite match mode (propagated from the `favorite` capability).
-  /// nil disables row-heart hydration.
-  func setFavoriteMatch(_ match: FavoritesMatchMode?) {
-    favoriteMatch = match
+  /// Enables/disables favoriting (propagated from the `favorite` capability).
+  /// false disables row-heart hydration.
+  func setFavoriteEnabled(_ enabled: Bool) {
+    favoriteEnabled = enabled
   }
 
-  /// Optimistically reflects a local favorite toggle for `src` in the match set,
-  /// needing no consumer-specific id extraction: favoriting inserts `src` (which
-  /// matches itself under either mode). Removal mirrors `isFavorite`'s match
-  /// semantics — partial drops every id that is a path segment of `src` (the
-  /// channel uid, and self-heals stray ids); exact (or disabled) drops only
-  /// `src`, so unrelated exact favorites that happen to be a segment of `src`
-  /// aren't collaterally lost. The consumer reconciles `favoriteIds` to its
-  /// canonical ids on the next `setFavorites`; `isFavorite(src:)` gives the same
-  /// answer before and after, so the now-playing heart stays responsive.
-  func setFavorited(src: String, favorited: Bool) {
+  /// Optimistically reflects a local favorite toggle in the favorite set, keyed
+  /// by the track's identity (id when non-blank, else src). The consumer
+  /// reconciles `favoriteIds` to its canonical set on the next `setFavorites`;
+  /// `hydrateFavorite` gives the same answer before and after, so the
+  /// now-playing heart stays responsive.
+  func setFavorited(identity: String, favorited: Bool) {
     if favorited {
-      favoriteIds.insert(src)
-    } else if favoriteMatch == .partial {
-      favoriteIds = favoriteIds.filter { !BrowserPathHelper.containsSegment(src, $0) }
+      favoriteIds.insert(identity)
     } else {
-      favoriteIds.remove(src)
+      favoriteIds.remove(identity)
     }
   }
 
   /// Hydrates the favorited field on a track based on the favoriteIds set.
   /// No-op unless favoriting is enabled (the `favorite` capability). Only
-  /// playable (src-bearing) tracks are favoritable; the flag is set to true OR
-  /// false so non-favorited tracks still show an (empty) heart. Local
-  /// favoriteIds take precedence over API-provided values.
+  /// identity-bearing tracks (id or src) are favoritable; the flag is set to
+  /// true OR false so non-favorited tracks still show an (empty) heart. A
+  /// caller-set `favorited` wins — API/consumer-provided values are never
+  /// overwritten (matches Android and web).
   func hydrateFavorite(_ track: Track) -> Track {
-    guard let match = favoriteMatch, let src = track.src else { return track }
-
-    let isFavorited = isFavorite(src: src, match: match)
-
-    // Only create a new track if the favorited state differs
-    if track.favorited == isFavorited { return track }
-
-    return track.copying(favorited: isFavorited)
-  }
-
-  /// Whether `src` is favorited under the given match mode.
-  private func isFavorite(src: String, match: FavoritesMatchMode) -> Bool {
-    switch match {
-    case .exact:
-      favoriteIds.contains(src)
-    case .partial:
-      favoriteIds.contains { BrowserPathHelper.containsSegment(src, $0) }
-    }
+    // `identity` bridges a std::string out of the C++ track, so it is bound
+    // once here rather than computed again to answer "is it favorited".
+    guard favoriteEnabled, track.favorited == nil, let identity = track.identity else { return track }
+    return track.copying(favorited: favoriteIds.contains(identity))
   }
 
-  /// Hydrates favorites on all children of a ResolvedTrack.
+  /// Hydrates favorites on all tracks of a resolved page. Pages reach
+  /// hydration normalized (ADR 0010), so `sections` is the only structure
+  /// to walk.
   private func hydrateChildren(_ resolvedTrack: ResolvedTrack) -> ResolvedTrack {
-    guard let children = resolvedTrack.children else { return resolvedTrack }
-    let hydratedChildren = children.map { hydrateFavorite($0) }
-    return resolvedTrack.copying(children: hydratedChildren)
-  }
-
-  // MARK: - Track Cache
-
-  /// Cache a track by both url and src for O(1) lookup from either key.
-  private func cacheTrack(_ track: Track) {
-    if let url = track.url {
-      trackCache.set(url, value: track)
-    }
-    if let src = track.src {
-      trackCache.set(src, value: track)
-    }
-  }
-
-  private func cacheChildren(_ resolvedTrack: ResolvedTrack) {
-    resolvedTrack.children?.forEach { cacheTrack($0) }
+    guard let sections = resolvedTrack.sections else { return resolvedTrack }
+    return resolvedTrack.copying(sections: sections.map { section in
+      section.copying(children: section.children.map { hydrateFavorite($0) })
+    })
   }
 
   // MARK: - Navigation
@@ -253,12 +218,21 @@ final class BrowserManager {
     self.path = path
     content = nil // Clear for loading state
 
-    let resolved = try await resolve(path)
+    do {
+      let resolved = try await resolve(path)
 
-    // Only apply result if this is still the current navigation
-    guard navigationId == currentNavigationId else { return }
+      // Only apply result if this is still the current navigation
+      guard navigationId == currentNavigationId else { return }
 
-    content = resolved
+      content = resolved
+    } catch {
+      // A superseded navigation's failure is not the current page's failure.
+      // Every caller reports a throw unconditionally (and CarPlay presents it as
+      // a modal action sheet), so without this a slow /a that fails after a fast
+      // /b succeeded would show /a's error over /b's content.
+      guard navigationId == currentNavigationId else { return }
+      throw error
+    }
   }
 
   /// Resolves content for a path with optional caching.
@@ -276,14 +250,22 @@ final class BrowserManager {
     // Cache the resolved content for future navigation
     contentCache.set(normalizedPath, value: resolvedTrack)
 
-    // Cache children for track lookups
-    cacheChildren(resolvedTrack)
-
     return hydrateChildren(resolvedTrack)
   }
 
   /// Invalidates the content cache for a specific path.
-  func invalidateContentCache(_ path: String) {
+  ///
+  /// Expects a *container* path. A contextual path (`…?__trackId=…`) addresses
+  /// a child, not a cache entry — entries are keyed by the stripped parent — so
+  /// passing one used to remove nothing at all, silently. Android `require`s the
+  /// same precondition; this throws so the misuse surfaces identically on both
+  /// platforms instead of no-opping on one.
+  func invalidateContentCache(_ path: String) throws {
+    guard !BrowserPathHelper.isContextual(path) else {
+      throw BrowserError.invalidConfiguration(
+        "invalidateContentCache() expects a container path, not a contextual path: \(path)",
+      )
+    }
     contentCache.remove(path)
   }
 
@@ -292,6 +274,11 @@ final class BrowserManager {
   func clearContentCache() {
     contentCache.clear()
     layerGeneration += 1
+    // The search slot is content too: a locale switch or a re-auth changes
+    // titles, src, artwork and availability, and nothing else ever evicts it,
+    // so a repeated query returned pre-invalidation results forever.
+    lastSearchKey = nil
+    lastSearchResults = nil
   }
 
   /// Refreshes the current path by invalidating cache and re-resolving.
@@ -304,12 +291,19 @@ final class BrowserManager {
 
     let currentPath = path
     contentCache.remove(currentPath)
-    let resolved = try await resolve(currentPath, useCache: false)
 
-    // Only apply result if this is still the current navigation
-    guard navigationId == currentNavigationId else { return }
+    do {
+      let resolved = try await resolve(currentPath, useCache: false)
 
-    content = resolved
+      // Only apply result if this is still the current navigation
+      guard navigationId == currentNavigationId else { return }
+
+      content = resolved
+    } catch {
+      // Superseded refreshes stay silent, for the same reason as `navigate`.
+      guard navigationId == currentNavigationId else { return }
+      throw error
+    }
   }
 
   private func resolveUncached(_ path: String) async throws -> ResolvedTrack {
@@ -326,12 +320,18 @@ final class BrowserManager {
       )
     }
 
-    // Validate and transform children
-    if let children = resolvedTrack.children {
-      let transformed = try await transformChildren(
-        children, parentPath: path, routeEntry: routeEntry?.0,
+    // Normalize to the canonical sectioned shape (children sugar → one
+    // untitled section — ADR 0010), then validate and transform. The output
+    // never carries `children`.
+    if let sections = resolvedTrack.normalizedSections {
+      // Dev diagnostic (ADR 0011) — before the blocks are folded, while each
+      // level is still attributable. Every page passes here whatever its
+      // source, and only on a cache miss. No-op outside debug builds.
+      InertStyleDiagnostic.warn(path: path, pageStyle: resolvedTrack.style, sections: sections)
+      let transformed = try await transformSections(
+        sections, parentPath: path, routeEntry: routeEntry?.0,
       )
-      return resolvedTrack.copying(children: transformed)
+      return resolvedTrack.copying(sections: transformed, children: .some(nil))
     }
 
     return resolvedTrack
@@ -448,7 +448,7 @@ final class BrowserManager {
     )
   }
 
-  /// Resolves a browse route: a page object (`{title,url,children:[…]}`).
+  /// Resolves a browse route: a page object (`{title,path,children:[…]}`).
   /// The browse kind layer is the cached resolved layer (`resolvedBrowseLayer`),
   /// populated by `ensureLayersResolved()` inside `buildApiRequest`.
   private func resolveFromConfig(
@@ -469,8 +469,8 @@ final class BrowserManager {
     let nitroResult = result.toNitro()
 
     logger.debug("Resolved: \(nitroResult.title)")
-    if let children = nitroResult.children {
-      logger.debug("  children: \(children.count) tracks")
+    if let sections = nitroResult.normalizedSections {
+      logger.debug("  children: \(sections.reduce(0) { $0 + $1.children.count }) tracks")
     }
 
     return nitroResult
@@ -547,65 +547,51 @@ final class BrowserManager {
 
   // MARK: - Child Transformation
 
-  private func transformChildren(
-    _ children: [Track],
+  private func transformSections(
+    _ sections: [Section],
     parentPath: String,
     routeEntry: NativeRouteEntry?,
-  ) async throws -> [Track] {
-    var transformed: [Track] = []
-
-    for track in children {
-      // Validate track has stable identifier. A track carrying an imageRow is
-      // exempt: a url-less row is a pure preview — never selected, navigated
-      // to, or cached (its items carry their own identity).
-      if track.url == nil, track.src == nil, track.imageRow?.isEmpty != false {
-        throw BrowserError.invalidConfiguration(
-          "Track must have either 'url' or 'src' for stable identification: \(track.title)",
-        )
-      }
+  ) async throws -> [Section] {
+    var transformed: [Section] = []
+    // The contextual index is the flat page position — children concatenated
+    // in section order (ADR 0009/0010).
+    var flatIndex = 0
+
+    for section in sections {
+      var transformedChildren: [Track] = []
+
+      for track in section.children {
+        let index = flatIndex
+        flatIndex += 1
+
+        // Validate track has stable identifier.
+        if track.path == nil, track.src == nil {
+          throw BrowserError.invalidConfiguration(
+            "Track must have either 'path' or 'src' for stable identification: \(track.title)",
+          )
+        }
 
-      var transformedTrack = track
+        var transformedTrack = track
 
-      if track.src != nil, track.url == nil {
-        let contextualUrl = BrowserPathHelper.build(parentPath: parentPath, trackId: track.src!)
-        transformedTrack = track.copying(url: contextualUrl)
-      }
-
-      // Resolve artwork URL at browse-time (no size context)
-      let artworkConfig = routeEntry?.artwork ?? config.artwork
-      if let imageSource = await resolveArtworkUrl(track: transformedTrack, perRouteConfig: artworkConfig) {
-        transformedTrack = transformedTrack.copying(artworkSource: imageSource)
-      }
+        if track.src != nil, track.path == nil {
+          // src != nil guarantees a non-nil identity (id when non-blank, else src).
+          // The flat page position rides along as a duplicate-identity tie-breaker.
+          let contextualPath = BrowserPathHelper.build(
+            parentPath: parentPath, trackId: track.identity!, index: index,
+          )
+          transformedTrack = track.copying(path: contextualPath)
+        }
 
-      // Resolve artwork for image row items
-      if let imageRowItems = transformedTrack.imageRow {
-        var resolvedItems: [ImageRowItem] = []
-        for item in imageRowItems {
-          let itemImageSource = await resolveArtworkUrl(track: item.toTrack(), perRouteConfig: artworkConfig)
-          // Playable items get a contextual URL like any list row, so a
-          // thumbnail tap expands into its section's queue instead of a
-          // queue of one (ADR 0006).
-          let itemUrl = item.url ?? item.src.map {
-            BrowserPathHelper.build(parentPath: parentPath, trackId: $0)
-          }
-          resolvedItems.append(ImageRowItem(
-            id: item.id,
-            url: itemUrl,
-            src: item.src,
-            artwork: item.artwork,
-            artworkSource: itemImageSource,
-            title: item.title,
-            artist: item.artist,
-            album: item.album,
-            albumUrl: item.albumUrl,
-            live: item.live,
-            request: item.request,
-          ))
+        // Resolve artwork URL at browse-time (no size context)
+        let artworkConfig = routeEntry?.artwork ?? config.artwork
+        if let imageSource = await resolveArtworkUrl(track: transformedTrack, perRouteConfig: artworkConfig) {
+          transformedTrack = transformedTrack.copying(artworkSource: imageSource)
         }
-        transformedTrack = transformedTrack.copying(imageRow: resolvedItems)
+
+        transformedChildren.append(transformedTrack)
       }
 
-      transformed.append(transformedTrack)
+      transformed.append(section.copying(children: transformedChildren))
     }
 
     return transformed
@@ -621,16 +607,49 @@ final class BrowserManager {
     )
   }
 
-  /// Structured search. Emits `q` plus any of `mode`/`genre`/`artist`/`album`/
-  /// `title`/`playlist` that are set, mirroring Android's `executeSearchApiRequest`
-  /// and the web stub. Cached by `query`.
+  /// The query params a structured search sends: `q` plus whichever filters are
+  /// set. Mirrors Android's `executeSearchApiRequest` and the web stub.
+  ///
+  /// Single source of truth for "what distinguishes one search from another" —
+  /// the request sends exactly this, and the cache keys on exactly this, so a
+  /// field added here can't be forgotten in one place and silently serve one
+  /// search's results for another.
+  private static func searchQueryParams(_ params: SearchParams) -> [String: String] {
+    var query: [String: String] = ["q": params.query]
+    if let mode = params.mode { query["mode"] = mode.stringValue }
+    if params.reference == .my { query["reference"] = "my" }
+    if let genre = params.genre { query["genre"] = genre }
+    if let artist = params.artist { query["artist"] = artist }
+    if let album = params.album { query["album"] = album }
+    if let title = params.title { query["title"] = title }
+    if let playlist = params.playlist { query["playlist"] = playlist }
+    return query
+  }
+
+  /// The cache identity of a search. Sorted so key order is stable, and
+  /// `\u{1}`-delimited so two different param sets can't serialize alike.
+  private static func searchCacheKey(_ params: SearchParams) -> String {
+    searchQueryParams(params)
+      .sorted { $0.key < $1.key }
+      .map { "\($0.key)=\($0.value)" }
+      .joined(separator: "\u{1}")
+  }
+
+  /// Structured search, cached by the full parameter set.
+  ///
+  /// Voice intents reuse `query` across different structures —
+  /// `MediaIntentCriteria` falls back to the structured value when there is no
+  /// spoken name, so "play jazz" (genre) and a text search for "jazz" arrive
+  /// with an identical `query` — hence `searchCacheKey` rather than `query`.
   func search(_ params: SearchParams) async throws -> ResolvedTrack {
     let query = params.query
+    let cacheKey = Self.searchCacheKey(params)
 
-    // Check cache - re-hydrate favorites since they may have changed
-    if query == lastSearchQuery, let results = lastSearchResults {
-      let hydratedResults = results.map { hydrateFavorite($0) }
-      return makeSearchResult(query: query, results: hydratedResults)
+    // Check cache - hydrate favorites on the way out, since they may have
+    // changed since the search ran (the slot holds the raw results for exactly
+    // this reason — see below).
+    if cacheKey == lastSearchKey, let results = lastSearchResults {
+      return makeSearchResult(query: query, results: results)
     }
 
     guard let routes = config.routes else {
@@ -655,18 +674,9 @@ final class BrowserManager {
       // Seed the search config's static path onto the base — a layer's static
       // path never applies (carried from the base; only a transform may change
       // it). Matches the web stub's fetchSearchResults and Android.
-      var queryParams: [String: String] = ["q": query]
-      if let mode = params.mode { queryParams["mode"] = mode.stringValue }
-      if params.reference == .my { queryParams["reference"] = "my" }
-      if let genre = params.genre { queryParams["genre"] = genre }
-      if let artist = params.artist { queryParams["artist"] = artist }
-      if let album = params.album { queryParams["album"] = album }
-      if let title = params.title { queryParams["title"] = title }
-      if let playlist = params.playlist { queryParams["playlist"] = playlist }
-
       let request = try await buildApiRequest(
         kind: nil, searchConfig, path: searchConfig.path ?? "", params: ["q": query],
-        initialQuery: queryParams,
+        initialQuery: Self.searchQueryParams(params),
       )
       logger.debug("Searching via API: \(request.url)")
       let jsonTracks: [JsonTrack] = try await httpClient.requestJson(request, as: [JsonTrack].self)
@@ -675,17 +685,15 @@ final class BrowserManager {
       throw BrowserError.contentNotFound(path: Self.searchRoutePath)
     }
 
-    // Hydrate favorites in results
-    let hydratedResults = results.map { hydrateFavorite($0) }
-
-    // Cache results
-    lastSearchQuery = query
-    lastSearchResults = hydratedResults
-
-    // Cache individual tracks
-    hydratedResults.forEach { cacheTrack($0) }
+    // Cache the RAW results, never the hydrated ones: hydration is one-shot
+    // (`hydrateFavorite` skips a track whose `favorited` is already set), so a
+    // hydrated slot would serve the favorites as they were at first search
+    // forever. The content cache keys on the same rule — it stores the
+    // unhydrated resolve and hydrates in `resolve()`.
+    lastSearchKey = cacheKey
+    lastSearchResults = results
 
-    return makeSearchResult(query: query, results: hydratedResults)
+    return makeSearchResult(query: query, results: results)
   }
 
   /// Search and return playable tracks for "play «X»" voice intents, drilling
@@ -693,37 +701,44 @@ final class BrowserManager {
   /// station. Decision in `SearchDrillIn.playable`; mirrors Android's
   /// `searchPlayable`.
   func searchPlayable(_ params: SearchParams) async throws -> [Track]? {
-    let children = try await (search(params).children) ?? []
-    return try await SearchDrillIn.playable(from: children) { [self] url in
-      logger.debug("First search result is browsable-only, resolving: \(url)")
-      return try await (resolve(url).children) ?? []
+    // Voice search never matches a disabled track (Track.disabled) — filtered
+    // before drill-in so an unavailable first result can't capture the play.
+    let children = try await ((search(params).flattenedChildren) ?? [])
+      .filter { $0.disabled != true }
+    return try await SearchDrillIn.playable(from: children) { [self] path in
+      logger.debug("First search result is browsable-only, resolving: \(path)")
+      return try await ((resolve(path).flattenedChildren) ?? []).filter { $0.disabled != true }
     }
   }
 
+  /// Wraps raw search results as a resolved page, hydrating favorites on the
+  /// way out — the single exit for `search`, so an unhydrated search page can't
+  /// be emitted (the same funnel `resolve()` gets from `hydrateChildren`).
   private func makeSearchResult(query: String, results: [Track]) -> ResolvedTrack {
+    // Search results are a flat list; as a resolved page they are one
+    // untitled section (ADR 0010).
     ResolvedTrack(
-      url: BrowserPathHelper.createSearchPath(query),
-      children: results,
+      path: BrowserPathHelper.createSearchPath(query),
+      style: nil,
+      sections: [.untitled(results.map { hydrateFavorite($0) })],
+      children: nil,
       carPlaySiriListButton: nil,
       id: nil,
       src: nil,
       artwork: nil,
       artworkSource: nil, request: nil,
-      artworkCarPlayTinted: nil,
       title: "Search: \(query)",
       subtitle: nil,
       artist: nil,
-      albumUrl: nil,
+      albumPath: nil,
       album: nil,
       description: nil,
       genre: nil,
       duration: nil,
-      style: nil,
-      childrenStyle: nil,
+      disabled: nil,
       favorited: nil,
-      groupTitle: nil,
       live: nil,
-      imageRow: nil,
+      icyCharset: nil,
     )
   }
 
@@ -740,7 +755,8 @@ final class BrowserManager {
     }
 
     let resolved = try await resolveRouteEntry(tabsEntry, path: Self.tabsRoutePath, params: [:])
-    let tabTracks = resolved.children ?? []
+    // Tabs are a flat list, not a page — a sectioned tabs source flattens.
+    let tabTracks = resolved.flattenedChildren ?? []
 
     tabs = tabTracks
     return tabTracks
@@ -748,38 +764,39 @@ final class BrowserManager {
 
   // MARK: - Queue Expansion (for CarPlay/external controllers)
 
-  /// Expands a contextual URL to a full queue of playable tracks.
-  func expandQueueFromContextualUrl(_ url: String) async throws -> (tracks: [Track], selectedIndex: Int)? {
-    guard BrowserPathHelper.isContextual(url) else { return nil }
+  /// Expands a contextual path to a full queue of playable tracks.
+  func expandQueueFromContextualPath(_ path: String) async throws -> (tracks: [Track], selectedIndex: Int)? {
+    guard BrowserPathHelper.isContextual(path) else { return nil }
 
-    let parentPath = BrowserPathHelper.stripTrackId(url)
-    guard let trackId = BrowserPathHelper.extractTrackId(url) else { return nil }
+    let parentPath = BrowserPathHelper.stripTrackId(path)
+    guard let trackId = BrowserPathHelper.extractTrackId(path) else { return nil }
 
-    logger.debug("Expanding queue from contextual URL")
-    logger.debug("  url: \(url)")
+    logger.debug("Expanding queue from contextual path")
+    logger.debug("  path: \(path)")
     logger.debug("  parentPath: \(parentPath)")
     logger.debug("  trackId: \(trackId)")
 
     // Resolve the parent container
     let resolved = try await resolve(parentPath, useCache: true)
-    guard let children = resolved.children else { return nil }
-
-    // Queue scope is the tapped section, not the whole page (ADR 0006). An
-    // id that no longer appears on the page aborts the expansion — the
-    // caller falls back to the stored single track (matching Android);
-    // silently queueing the changed list would resume the wrong station.
-    let sectionTracks: [Track]
-    switch SectionScope.section(of: children, containing: trackId) {
-    case .imageRow(let items):
-      sectionTracks = items.map { $0.toTrack() }
-    case .run(let tracks):
-      sectionTracks = tracks
-    case nil:
+    guard let sections = resolved.normalizedSections else { return nil }
+
+    // Queue scope is the tapped section, not the whole page (ADR 0006). The
+    // stamped flat index pins which section (and which copy) was tapped when
+    // the same identity appears more than once; it is only a tie-breaker —
+    // a stale index falls back to the first identity match. An id that no
+    // longer appears on the page at all aborts the expansion — the caller
+    // falls back to the stored single track (matching Android); silently
+    // queueing the changed list would resume the wrong station.
+    let tappedIndex = BrowserPathHelper.extractIndex(path)
+    guard let scoped = SectionScope.scoped(in: sections, containing: trackId, tappedIndex: tappedIndex) else {
       return nil
     }
+    let sectionTracks = scoped.section.children
+    let tappedOffset = scoped.tappedOffset
 
-    // Filter to playable tracks (have src)
-    let playableTracks = sectionTracks.filter { $0.src != nil }
+    // Filter to playable tracks (have src). A disabled track is unavailable —
+    // queue expansion excludes it, so auto-advance never meets one.
+    let playableTracks = sectionTracks.filter { $0.src != nil && $0.disabled != true }
     guard !playableTracks.isEmpty else { return nil }
 
     logger.debug("Found \(playableTracks.count) playable tracks")
@@ -787,10 +804,18 @@ final class BrowserManager {
       logger.debug("  [\(index)] \(track.title) - src: \(track.src ?? "nil")")
     }
 
-    // Find selected track index
-    // Unreachable in practice (the section was found BY this id), but a miss
-    // must abort rather than silently start the queue at the wrong track.
-    guard let selectedIndex = playableTracks.firstIndex(where: { $0.src == trackId }) else {
+    // Find selected track index: the pinned copy when the stamp survived,
+    // else the first identity match. A miss must abort rather than silently
+    // start the queue at the wrong track (unreachable in practice — the
+    // section was found BY this id).
+    let selectedIndex: Int
+    if let tappedOffset, sectionTracks[tappedOffset].src != nil, sectionTracks[tappedOffset].disabled != true {
+      selectedIndex =
+        sectionTracks.prefix(through: tappedOffset)
+          .count(where: { $0.src != nil && $0.disabled != true }) - 1
+    } else if let index = playableTracks.firstIndex(where: { $0.identity == trackId }) {
+      selectedIndex = index
+    } else {
       return nil
     }
     logger.debug("Selected track index: \(selectedIndex)")