react-native-audio-browser 0.2.0-next.3 → 0.2.0-next.30

package/lib/module/web/TrackPlayer/QueuePlayer.js

@@ -18,35 +18,56 @@ export class QueuePlayer extends Player {
     // was a silent pause) and armed load()'s auto-play with phantom intent.
     // Cleared before the state lands so consumers observe the native order
     // (intent → state → queueEnded), independent of onQueueEnded overrides.
-    // Per-track ends that advance the queue keep the intent.
-    if (state === State.Ended && this.endsQueue()) {
-      this.playWhenReady = false;
+    if (state !== State.Ended) {
+      super.applyState(state);
+      return;
     }
-    super.applyState(state);
 
-    // dispatch() already gates on _isStopped before reaching applyState, so a
-    // natural end while stopped never advances the queue.
-    if (state === State.Ended) {
+    // A track ending mid-queue is not an `ended` playback state: ExoPlayer
+    // reaches STATE_ENDED only at the end of the *playlist*, and an advance
+    // between items stays READY/BUFFERING. Web loads one track at a time, so
+    // the element's own `ended` arrives every time — reporting it flashed a
+    // terminal state, and dropped `PlayingState.playing` to false, between
+    // every pair of tracks. Repeat-one counts as mid-queue for the same
+    // reason: native reports nothing there either.
+    if (this.endsQueue()) {
+      // The real end: the intent goes with it, and the state is genuinely ended.
+      this.playWhenReady = false;
+      super.applyState(state);
+      // dispatch() already gates on _isStopped before reaching applyState, so a
+      // natural end while stopped never advances the queue.
       this.onTrackEnded();
+      return;
     }
+
+    // Suppressing `ended` is only safe when something takes over the state. A
+    // handler that declines to advance — the sleep timer set to end-of-track —
+    // leaves nothing to move it, and the player would sit reporting `playing`
+    // with nothing playing. Report the end in that case, as before.
+    if (!this.onTrackEnded()) super.applyState(state);
   }
 
   /** True when a natural end has nowhere to go: not repeating, no next track. */
   endsQueue() {
     return this.queue.repeatMode !== RepeatMode.Track && this.queue.repeatMode !== RepeatMode.Queue && this.queue.nextIndex() === undefined;
   }
+
+  /**
+   * @returns whether it started another load, and so owns the playback state
+   *   from here. `false` means the caller still has to report the end itself.
+   */
   onTrackEnded() {
     if (this.queue.repeatMode === RepeatMode.Track) {
-      if (this.queue.currentIndex !== undefined) {
-        this.goToIndex(this.queue.currentIndex);
-      }
-      return;
+      if (this.queue.currentIndex === undefined) return false;
+      this.goToIndex(this.queue.currentIndex);
+      return true;
     }
     if (this.endsQueue()) {
       this.onQueueEnded();
-      return;
+      return false;
     }
     this.skipToNext();
+    return true;
   }
 
   /**

package/lib/module/web/TrackPlayer/QueuePlayer.js.map

@@ -1 +1 @@
-{"version":3,"names":["Player","QueueManager","RepeatMode","State","QueuePlayer","queue","applyState","state","Ended","endsQueue","playWhenReady","onTrackEnded","repeatMode","Track","Queue","nextIndex","undefined","currentIndex","goToIndex","onQueueEnded","skipToNext","index","initialPosition","track","getTrack","onLoaded","_track","seekTo","load","_isStopped","play","add","tracks","insertBeforeIndex","insert","skip","Error","wrapAroundFirstIndex","skipToPrevious","previousIndex","wrapAroundLastIndex","setShuffleEnabled","enabled","getShuffleEnabled","shuffleEnabled","setRepeatMode","mode","getRepeatMode","remove","indexes","outcome","kind","current","stop","onComplete","reset","clear","removeUpcomingTracks","removeUpcoming","move","fromIndex","toIndex"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/QueuePlayer.ts"],"mappings":";;AAKA,SAASA,MAAM,QAAQ,UAAU;AACjC,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,SAASC,UAAU,QAAQ,cAAc;AACzC,SAASC,KAAK,QAAQ,SAAS;;AAE/B;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,WAAW,SAASJ,MAAM,CAAC;EAC5BK,KAAK,GAAG,IAAIJ,YAAY,CAAC,CAAC;EAE1BK,UAAUA,CAACC,KAAoB,EAAE;IACzC;IACA;IACA;IACA;IACA;IACA;IACA,IAAIA,KAAK,KAAKJ,KAAK,CAACK,KAAK,IAAI,IAAI,CAACC,SAAS,CAAC,CAAC,EAAE;MAC7C,IAAI,CAACC,aAAa,GAAG,KAAK;IAC5B;IAEA,KAAK,CAACJ,UAAU,CAACC,KAAK,CAAC;;IAEvB;IACA;IACA,IAAIA,KAAK,KAAKJ,KAAK,CAACK,KAAK,EAAE;MACzB,IAAI,CAACG,YAAY,CAAC,CAAC;IACrB;EACF;;EAEA;EACQF,SAASA,CAAA,EAAY;IAC3B,OACE,IAAI,CAACJ,KAAK,CAACO,UAAU,KAAKV,UAAU,CAACW,KAAK,IAC1C,IAAI,CAACR,KAAK,CAACO,UAAU,KAAKV,UAAU,CAACY,KAAK,IAC1C,IAAI,CAACT,KAAK,CAACU,SAAS,CAAC,CAAC,KAAKC,SAAS;EAExC;EAEUL,YAAYA,CAAA,EAAG;IACvB,IAAI,IAAI,CAACN,KAAK,CAACO,UAAU,KAAKV,UAAU,CAACW,KAAK,EAAE;MAC9C,IAAI,IAAI,CAACR,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE;QACzC,IAAI,CAACE,SAAS,CAAC,IAAI,CAACb,KAAK,CAACY,YAAY,CAAC;MACzC;MACA;IACF;IACA,IAAI,IAAI,CAACR,SAAS,CAAC,CAAC,EAAE;MACpB,IAAI,CAACU,YAAY,CAAC,CAAC;MACnB;IACF;IACA,IAAI,CAACC,UAAU,CAAC,CAAC;EACnB;;EAEA;AACF;AACA;AACA;AACA;EACYD,YAAYA,CAAA,EAAG,CAAC;EAEhBD,SAASA,CAACG,KAAa,EAAEC,eAAwB,EAAE;IAC3D,MAAMC,KAAK,GAAG,IAAI,CAAClB,KAAK,CAACmB,QAAQ,CAACH,KAAK,CAAC;IAExC,IAAI,CAACE,KAAK,EAAE;;IAEZ;IACA,MAAME,QAAQ,GAAIC,MAAa,IAAK;MAClC,IAAIJ,eAAe,KAAKN,SAAS,EAAE;QACjC,IAAI,CAACW,MAAM,CAACL,eAAe,CAAC;MAC9B;IACF,CAAC;IAED,IAAI,IAAI,CAACjB,KAAK,CAACY,YAAY,KAAKI,KAAK,EAAE;MACrC,IAAI,CAAChB,KAAK,CAACY,YAAY,GAAGI,KAAK;MAC/B,IAAI,CAACO,IAAI,CAACL,KAAK,EAAEE,QAAQ,CAAC;IAC5B,CAAC,MAAM,IAAI,IAAI,CAACI,UAAU,EAAE;MAC1B;MACA,IAAI,CAACD,IAAI,CAACL,KAAK,EAAEE,QAAQ,CAAC;IAC5B,CAAC,MAAM;MACL;MACA,IAAI,CAACE,MAAM,CAACL,eAAe,IAAI,CAAC,CAAC;MACjC,IAAI,IAAI,CAACZ,aAAa,EAAE;QACtB,IAAI,CAACoB,IAAI,CAAC,CAAC;MACb;IACF;EACF;EAEOC,GAAGA,CAACC,MAAe,EAAEC,iBAA0B,EAAQ;IAC5D,IAAI,CAAC5B,KAAK,CAAC6B,MAAM,CAACF,MAAM,EAAEC,iBAAiB,CAAC;IAE5C,IAAI,IAAI,CAAC5B,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE;MACzC,IAAI,CAACE,SAAS,CAAC,CAAC,CAAC;IACnB;EACF;EAEOiB,IAAIA,CAACd,KAAa,EAAEC,eAAwB,EAAQ;IACzD,IAAI,IAAI,CAACjB,KAAK,CAACmB,QAAQ,CAACH,KAAK,CAAC,KAAKL,SAAS,EAAE;MAC5C,MAAM,IAAIoB,KAAK,CAAC,qBAAqB,CAAC;IACxC;IAEA,IAAI,CAAClB,SAAS,CAACG,KAAK,EAAEC,eAAe,CAAC;EACxC;EAEOF,UAAUA,CAACE,eAAwB,EAAQ;IAChD,IAAI,IAAI,CAACjB,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE;IAE3C,MAAMD,SAAS,GACb,IAAI,CAACV,KAAK,CAACU,SAAS,CAAC,CAAC,IAAI,IAAI,CAACV,KAAK,CAACgC,oBAAoB,CAAC,CAAC;IAC7D,IAAItB,SAAS,KAAKC,SAAS,EAAE;IAE7B,IAAI,CAACE,SAAS,CAACH,SAAS,EAAEO,eAAe,CAAC;EAC5C;EAEOgB,cAAcA,CAAChB,eAAwB,EAAQ;IACpD,IAAI,IAAI,CAACjB,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE;IAE3C,MAAMuB,aAAa,GACjB,IAAI,CAAClC,KAAK,CAACkC,aAAa,CAAC,CAAC,IAAI,IAAI,CAAClC,KAAK,CAACmC,mBAAmB,CAAC,CAAC;IAChE,IAAID,aAAa,KAAKvB,SAAS,EAAE;IAEjC,IAAI,CAACE,SAAS,CAACqB,aAAa,EAAEjB,eAAe,CAAC;EAChD;EAEOmB,iBAAiBA,CAACC,OAAgB,EAAQ;IAC/C,IAAI,CAACrC,KAAK,CAACoC,iBAAiB,CAACC,OAAO,CAAC;EACvC;EAEOC,iBAAiBA,CAAA,EAAY;IAClC,OAAO,IAAI,CAACtC,KAAK,CAACuC,cAAc;EAClC;EAEOpB,QAAQA,CAACH,KAAa,EAAqB;IAChD,OAAO,IAAI,CAAChB,KAAK,CAACmB,QAAQ,CAACH,KAAK,CAAC;EACnC;EAEOwB,aAAaA,CAACC,IAAoB,EAAQ;IAC/C,IAAI,CAACzC,KAAK,CAACO,UAAU,GAAGkC,IAAI;EAC9B;EAEOC,aAAaA,CAAA,EAAmB;IACrC,OAAO,IAAI,CAAC1C,KAAK,CAACO,UAAU;EAC9B;EAEOoC,MAAMA,CAACC,OAAiB,EAAQ;IACrC,MAAMC,OAAO,GAAG,IAAI,CAAC7C,KAAK,CAAC2C,MAAM,CAACC,OAAO,CAAC;IAC1C,QAAQC,OAAO,CAACC,IAAI;MAClB,KAAK,YAAY;MACjB,KAAK,MAAM;QACT;MACF,KAAK,QAAQ;QACX,IAAI,CAACjC,SAAS,CAACgC,OAAO,CAAC7B,KAAK,CAAC;QAC7B;MACF,KAAK,SAAS;QACZ,IAAI,CAAC+B,OAAO,GAAGpC,SAAS;QACxB,IAAI,CAACqC,IAAI,CAAC,CAAC;QACX;IACJ;EACF;EAEOA,IAAIA,CAACC,UAAuB,EAAQ;IACzC,KAAK,CAACD,IAAI,CAACC,UAAU,CAAC;EACxB;EAEOC,KAAKA,CAAA,EAAS;IACnB;IACA;IACA;IACA,IAAI,CAAClD,KAAK,CAACmD,KAAK,CAAC,CAAC;IAClB,IAAI,CAACJ,OAAO,GAAGpC,SAAS;IACxB,IAAI,CAACqC,IAAI,CAAC,CAAC;EACb;EAEOI,oBAAoBA,CAAA,EAAS;IAClC,IAAI,CAACpD,KAAK,CAACqD,cAAc,CAAC,CAAC;EAC7B;EAEOC,IAAIA,CAACC,SAAiB,EAAEC,OAAe,EAAQ;IACpD,IAAI,CAACxD,KAAK,CAACsD,IAAI,CAACC,SAAS,EAAEC,OAAO,CAAC;EACrC;AACF","ignoreList":[]}
+{"version":3,"names":["Player","QueueManager","RepeatMode","State","QueuePlayer","queue","applyState","state","Ended","endsQueue","playWhenReady","onTrackEnded","repeatMode","Track","Queue","nextIndex","undefined","currentIndex","goToIndex","onQueueEnded","skipToNext","index","initialPosition","track","getTrack","onLoaded","_track","seekTo","load","_isStopped","play","add","tracks","insertBeforeIndex","insert","skip","Error","wrapAroundFirstIndex","skipToPrevious","previousIndex","wrapAroundLastIndex","setShuffleEnabled","enabled","getShuffleEnabled","shuffleEnabled","setRepeatMode","mode","getRepeatMode","remove","indexes","outcome","kind","current","stop","onComplete","reset","clear","removeUpcomingTracks","removeUpcoming","move","fromIndex","toIndex"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/QueuePlayer.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/browser/BrowserManager.js

@@ -1,11 +1,13 @@
 "use strict";
 
+import { getTrackIdentity } from '../../utils/getTrackIdentity';
 import { assertedNotNullish } from '../../utils/validation';
 import { RequestConfigBuilder } from '../http/RequestConfigBuilder';
 import { SimpleRouter } from '../SimpleRouter';
 import { BrowserPathHelper } from '../util/BrowserPathHelper';
 import { assertBrowsePageShape } from './assertBrowsePageShape';
 import { parseSearchResponse } from './parseSearchResponse';
+import { flattenSections, flattenedChildren, normalizePage, sectionContaining } from './sections';
 
 /**
  * Manages browser navigation, route resolution, and content loading.
@@ -123,14 +125,11 @@ export class BrowserManager {
     // Determine initial path
     let initialPath = value.path;
 
-    // If no path specified, try to get first tab URL
+    // If no path specified, try to get first tab path
     if (!initialPath) {
       const tabsRoute = value.routes?.find(r => r.path === '__tabs__');
-      if (tabsRoute?.browseStatic?.children?.[0]?.url) {
-        initialPath = tabsRoute.browseStatic.children[0].url;
-      } else {
-        initialPath = '/';
-      }
+      const staticTabs = tabsRoute?.browseStatic ? flattenedChildren(tabsRoute.browseStatic) : [];
+      initialPath = staticTabs[0]?.path ?? '/';
     }
     if (initialPath) {
       void this.navigate(initialPath);
@@ -146,16 +145,16 @@ export class BrowserManager {
   }
 
   /**
-   * Navigates to a track's URL.
+   * Navigates to a track's path.
    */
   async navigateTrack(track) {
     this.navigationErrorManager.clearNavigationError();
-    const url = track.url;
-    if (!url) {
-      console.warn('Track has no URL to navigate to');
+    const path = track.path;
+    if (!path) {
+      console.warn('Track has no path to navigate to');
       return;
     }
-    await this.navigate(url);
+    await this.navigate(path);
   }
 
   /**
@@ -208,28 +207,15 @@ export class BrowserManager {
         return;
       }
 
-      // Add contextual URLs to non-search content (matches Android behavior where
-      // search() bypasses the resolve() contextual URL logic).
-      // Shallow copy to avoid mutating the original config object (e.g., browseStatic
-      // from routes), which would break search that reads from the same source.
-      if (content?.children && !isSearchPath) {
+      // Resolution returns canonical sectioned pages; add contextual paths
+      // to non-search content (matches Android behavior where search()
+      // bypasses the resolve() contextual-path logic). Copies avoid mutating
+      // the original config object (e.g., browseStatic from routes), which
+      // would break search that reads from the same source.
+      if (content?.sections && !isSearchPath) {
         content = {
           ...content,
-          children: content.children.map(track => {
-            // If track has src, always add/update contextual URL with current path context
-            // This matches Android's BrowserManager.kt:436-441
-            if (track.src) {
-              const contextualUrl = `${path}?__trackId=${encodeURIComponent(track.src)}`;
-              return {
-                ...track,
-                url: contextualUrl
-              };
-            }
-            // Return a shallow copy in attempt to avoid mutating original config objects
-            return {
-              ...track
-            };
-          })
+          sections: this.addContextualPaths(path, content.sections)
         };
       }
 
@@ -274,13 +260,45 @@ export class BrowserManager {
     }
   }
 
+  /**
+   * Stamps contextual paths onto a page's sections. A playable track gets a
+   * contextual path carrying its identity (id ?? src) so the queue can be
+   * re-expanded from it later, plus its flat page position (children
+   * concatenated in section order — ADR 0009/0010) as a duplicate-identity
+   * tie-breaker. Non-playable tracks are shallow-copied to avoid mutating
+   * original config objects (e.g., browseStatic from routes).
+   */
+  addContextualPaths(path, sections) {
+    let index = 0;
+    return sections.map(section => ({
+      ...section,
+      children: section.children.map(track => {
+        const flatIndex = index++;
+        const identity = getTrackIdentity(track);
+        if (track.src && identity) {
+          return {
+            ...track,
+            path: BrowserPathHelper.build(path, identity, flatIndex)
+          };
+        }
+        return {
+          ...track
+        };
+      })
+    }));
+  }
+
   /**
    * Resolves search content from a search path.
-   * Returns a ResolvedTrack with raw children (no contextual URLs).
+   * Returns a canonical sectioned page — one untitled section of raw search
+   * results (no contextual URLs), like the native `makeSearchResult`.
    * Matches Android's BrowserManager.search() which bypasses resolve() entirely.
    *
+   * A failed search propagates, so `navigate` turns it into a navigation error
+   * the way it does a failed browse resolve.
+   *
    * @param searchPath The search path (format: /__search?q=query)
-   * @returns ResolvedTrack containing search results as children
+   * @returns ResolvedTrack containing search results as one untitled section
    */
   async resolveSearchContent(searchPath) {
     // Extract query from search path
@@ -308,23 +326,17 @@ export class BrowserManager {
     }
     // Handle request config-based search via the shared layered fetch.
     else if (searchRoute.searchConfig) {
-      try {
-        searchResults = await this.fetchSearchResults(searchRoute.searchConfig, {
-          q: query
-        });
-      } catch (error) {
-        console.error('Search failed:', error);
-        return undefined;
-      }
+      searchResults = await this.fetchSearchResults(searchRoute.searchConfig, {
+        q: query
+      });
     }
 
-    // Create ResolvedTrack with raw children
-    // Search callbacks should return fresh tracks without contextual URLs (like Android)
-    return {
-      url: searchPath,
+    // Search callbacks should return fresh tracks without contextual paths (like Android)
+    return normalizePage({
+      path: searchPath,
       title: `Search: ${query}`,
       children: searchResults
-    };
+    });
   }
 
   /**
@@ -333,10 +345,13 @@ export class BrowserManager {
    * Matches Android's artwork URL transformation with full Track access.
    */
   async transformArtworkForContent(content) {
+    // No short-circuit on a missing artwork config: Android gates per *track*
+    // (`artworkConfig == null && track.artwork == null`), so a track carrying a
+    // plain `artwork` URL still gets an `artworkSource`. Returning early here
+    // meant an app with no `artwork` block never populated the field at all —
+    // `resolveArtworkSourceAsync` already handles the no-config case the way
+    // `resolveArtworkUrl` does on Android.
     const artworkConfig = this._configuration.artwork;
-    if (!artworkConfig) {
-      return content;
-    }
     // The shared request layer applies to artwork too — use the resolved layer
     // (resolver result or static config) so a resolver-only config still works.
     await this.ensureLayersResolved();
@@ -345,30 +360,35 @@ export class BrowserManager {
     // Transform parent artwork
     const parentArtworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(content, requestConfig, artworkConfig);
 
-    // Transform children artwork
-    let transformedChildren;
-    if (content.children) {
-      transformedChildren = await Promise.all(content.children.map(async track => {
-        const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
-        if (artworkSource && !track.artworkSource) {
-          return {
-            ...track,
-            artworkSource
-          };
-        }
-        return track;
-      }));
+    // Transform children artwork, section by section
+    const transformTrack = async track => {
+      const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
+      if (artworkSource && !track.artworkSource) {
+        return {
+          ...track,
+          artworkSource
+        };
+      }
+      return track;
+    };
+    let transformedSections;
+    if (content.sections) {
+      transformedSections = await Promise.all(content.sections.map(async section => ({
+        ...section,
+        children: await Promise.all(section.children.map(transformTrack))
+      })));
     }
     return {
       ...content,
       artworkSource: parentArtworkSource ?? content.artworkSource,
-      children: transformedChildren ?? content.children
+      sections: transformedSections ?? content.sections
     };
   }
 
   /**
    * Resolves content from a route using browseCallback, browseStatic, or browseConfig.
-   * Single source of truth for route resolution logic.
+   * Single source of truth for route resolution logic. Returns canonical
+   * sectioned pages (normalizePage) — consumers never see authored `children`.
    *
    * @param route The route configuration to resolve
    * @param path The path being navigated to
@@ -388,19 +408,20 @@ export class BrowserManager {
         this.navigationErrorManager.setNavigationError('callback-error', result.error, path);
         return undefined;
       }
-      return result;
+      return normalizePage(result);
     }
 
-    // Handle static ResolvedTrack route
+    // Handle static ResolvedTrack route (normalizePage also copies, so the
+    // config object itself is never handed out)
     if (route.browseStatic) {
-      return route.browseStatic;
+      return normalizePage(route.browseStatic);
     }
 
     // Handle request config-based route via the layered request → browse → route
     // chain (matches native's resolveRouteEntry → resolveFromConfig).
     if (route.browseConfig) {
       try {
-        return await this.resolveFromConfig(this._configuration.browse, route.browseConfig, path, routeParams);
+        return normalizePage(await this.resolveFromConfig(this._configuration.browse, route.browseConfig, path, routeParams));
       } catch (error) {
         console.error(`Failed to resolve ${errorContext}:`, error);
         this.handleNavigationError(error, path);
@@ -410,6 +431,22 @@ export class BrowserManager {
     return undefined;
   }
 
+  /**
+   * Ensures the request layer is resolved for the current generation and
+   * returns it — the resolver's result when a `requestResolver` is configured,
+   * else the static `request`.
+   *
+   * Consumers outside the browse path (media URL building, artwork) must reach
+   * the request layer through this rather than reading `configuration.request`,
+   * or a resolver-only config silently loses its baseUrl, headers and transform
+   * exactly where a credential is needed. Mirrors Android's
+   * `BrowserManager.resolvedRequestConfig()`, which carries the same warning.
+   */
+  async resolvedRequestConfig() {
+    await this.ensureLayersResolved();
+    return this._resolvedRequest;
+  }
+
   /**
    * Ensures the request/browse layer configs are resolved for the current
    * generation. Any present resolver is invoked once per generation and the
@@ -474,7 +511,7 @@ export class BrowserManager {
    * `request → search` chain (search is its own kind — no browse layer). The
    * query params are seeded on the base so they survive both the static merge
    * and a search `transform`. Shared by `resolveSearchContent` (navigating to a
-   * search path) and `SearchManager` (the voice/`onSearch` API), so the ladder
+   * search path) and `SearchManager` (the voice/`search` API), so the ladder
    * isn't duplicated. Errors propagate to the caller.
    */
   async fetchSearchResults(searchConfig, queryParams) {
@@ -489,6 +526,8 @@ export class BrowserManager {
 
   /**
    * Resolves content for a specific path using configured routes.
+   * Like the native resolve pipelines, the returned page is canonical
+   * sectioned shape — `children` sugar is normalized away at this seam.
    */
   async resolveContent(path) {
     const routes = this._configuration.routes;
@@ -530,9 +569,9 @@ export class BrowserManager {
     // there's no content.
     if (this._configuration.request || this._configuration.requestResolver || this._configuration.browse || this._configuration.browseResolver) {
       try {
-        return await this.resolveFromConfig(this._configuration.browse, undefined, path, {
+        return normalizePage(await this.resolveFromConfig(this._configuration.browse, undefined, path, {
           path
-        });
+        }));
       } catch (error) {
         console.error('Failed to resolve default browse content:', error);
         this.handleNavigationError(error, path);
@@ -551,12 +590,14 @@ export class BrowserManager {
       return [];
     }
     const result = await this.resolveRouteContent(tabsRoute, '/', {}, 'Tabs');
-    const tabs = result?.children ?? [];
+    // Tabs are a flat list, not a page — a sectioned tabs source flattens.
+    const tabs = result ? flattenSections(result.sections) : [];
 
     // Transform artwork URLs on tabs via the async resolver so the shared
     // request layer (incl. its transform) applies, matching content/search.
+    // Gated per track inside the resolver, as on Android — see
+    // `transformArtworkForContent`.
     const artworkConfig = this._configuration.artwork;
-    if (!artworkConfig) return tabs;
     // Resolved request layer (resolver or static), matching content/search.
     await this.ensureLayersResolved();
     const requestConfig = this._resolvedRequest;
@@ -582,35 +623,65 @@ export class BrowserManager {
   /**
    * Expands a queue from a contextual URL.
    * Resolves the parent container to get all siblings.
-   * Matches Android's BrowserManager.expandQueueFromContextualUrl() behavior.
+   * Matches Android's BrowserManager.expandQueueFromContextualPath() behavior.
    *
-   * @param contextualUrl The contextual URL (format: /path?__trackId=trackSrc)
+   * @param contextualPath The contextual path (format: /path?__trackId=trackSrc)
    * @returns Object with tracks and selectedIndex, or undefined if expansion fails
    */
-  async expandQueueFromContextualUrl(contextualUrl) {
-    const trackId = BrowserPathHelper.extractTrackId(contextualUrl);
+  async expandQueueFromContextualPath(contextualPath) {
+    const trackId = BrowserPathHelper.extractTrackId(contextualPath);
     if (!trackId) return undefined;
     try {
       // Resolve the parent container to get all siblings
-      const parentPath = BrowserPathHelper.stripTrackId(contextualUrl);
+      const parentPath = BrowserPathHelper.stripTrackId(contextualPath);
       const parentResolvedTrack = await this.resolveContent(parentPath);
-      const children = parentResolvedTrack?.children;
-      if (!children || children.length === 0) {
+      const rawSections = parentResolvedTrack?.sections;
+      if (!rawSections || rawSections.every(s => s.children.length === 0)) {
         console.warn('Parent has no children, cannot expand queue');
         return undefined;
       }
 
-      // Filter to only playable tracks (tracks with src)
-      const playableTracks = children.filter(track => track.src != null);
+      // Stamp contextual paths so queued tracks carry their own queue context
+      // (navigate() stamps the displayed page the same way).
+      const sections = this.addContextualPaths(parentPath, rawSections);
+
+      // 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; a stale index
+      // falls back to the first identity match. An identity that no longer
+      // appears on the page aborts the expansion — the caller falls back to
+      // the single track.
+      const tappedIndex = BrowserPathHelper.extractIndex(contextualPath);
+      const scoped = sectionContaining(sections, trackId, tappedIndex);
+      if (!scoped) {
+        console.warn(`Track with identity='${trackId}' not found on parent page`);
+        return undefined;
+      }
+
+      // Filter to only playable tracks (tracks with src). A disabled track is
+      // unavailable — queue expansion excludes it, so auto-advance never
+      // meets one (Track.disabled).
+      const isQueueable = track => track.src != null && track.disabled !== true;
+      const playableTracks = scoped.tracks.filter(isQueueable);
       if (playableTracks.length === 0) {
-        console.warn('Parent has no playable tracks, cannot expand queue');
+        console.warn('Section has no playable tracks, cannot expand queue');
         return undefined;
       }
 
-      // Find the index of the selected track in the playable tracks array
-      const selectedIndex = playableTracks.findIndex(track => track.src === trackId);
+      // Selected position: the pinned copy when the stamp survived, else
+      // the first identity match.
+      let selectedIndex = -1;
+      if (scoped.tappedOffset !== undefined) {
+        const tapped = scoped.tracks[scoped.tappedOffset];
+        if (tapped != null && isQueueable(tapped)) {
+          selectedIndex = scoped.tracks.slice(0, scoped.tappedOffset + 1).filter(isQueueable).length - 1;
+        }
+      }
+      if (selectedIndex < 0) {
+        selectedIndex = playableTracks.findIndex(track => getTrackIdentity(track) === trackId);
+      }
       if (selectedIndex < 0) {
-        console.warn(`Track with src='${trackId}' not found in playable children`);
+        console.warn(`Track with identity='${trackId}' not found in playable children`);
         return undefined;
       }
 
@@ -626,7 +697,7 @@ export class BrowserManager {
         selectedIndex
       };
     } catch (error) {
-      console.error(`Error expanding queue from contextual URL: ${contextualUrl}`, error);
+      console.error(`Error expanding queue from contextual path: ${contextualPath}`, error);
       return undefined;
     }
   }
@@ -643,19 +714,23 @@ export class BrowserManager {
    * @returns Object with expanded tracks and starting index
    */
   async resolveMediaItemsForPlayback(tracks, startIndex, startPositionMs, searchQuery) {
-    // Single track: check for search context or contextual URL
+    // Single track: check for search context or contextual path
     if (tracks.length === 1) {
       const track = assertedNotNullish(tracks[0]);
-      const trackUrl = track.url;
+      const trackPath = track.path;
 
       // If search query present, expand search results
       if (searchQuery) {
-        // Execute search (will hit cache if already performed)
+        // Execute search (will hit cache if already performed). Disabled
+        // tracks never play, so they never enter a search-built queue
+        // (Track.disabled — mirrors both native platforms).
         const searchResults = await this.resolveSearchContent(BrowserPathHelper.createSearchPath(searchQuery));
-        const searchTracks = searchResults?.children;
-        if (searchTracks && searchTracks.length > 0) {
-          // Find the selected track in search results
-          const selectedIdx = searchTracks.findIndex(t => t.url === trackUrl || t.src === track.src);
+        const searchTracks = flattenSections(searchResults?.sections).filter(t => t.disabled !== true);
+        if (searchTracks.length > 0) {
+          // Find the selected track in search results by path or identity
+          // (matches Android's three-way mediaId match)
+          const identity = getTrackIdentity(track);
+          const selectedIdx = searchTracks.findIndex(t => t.path === trackPath || identity !== undefined && getTrackIdentity(t) === identity);
           if (selectedIdx >= 0) {
             return {
               tracks: searchTracks,
@@ -666,14 +741,14 @@ export class BrowserManager {
         }
       }
 
-      // Check if contextual URL - expand from parent
+      // Check if contextual path - expand from parent
       // Note: The queueSourcePath optimization is handled by the caller (NativeAudioBrowser.navigateTrackAsync)
       // which has access to the existing queue and can skip to the track directly.
       // This matches Android where MediaSessionCallback handles the optimization before calling
       // BrowserManager.resolveMediaItemsForPlayback.
-      if (trackUrl && BrowserPathHelper.isContextual(trackUrl)) {
-        const parentPath = BrowserPathHelper.stripTrackId(trackUrl);
-        const expanded = await this.expandQueueFromContextualUrl(trackUrl);
+      if (trackPath && BrowserPathHelper.isContextual(trackPath)) {
+        const parentPath = BrowserPathHelper.stripTrackId(trackPath);
+        const expanded = await this.expandQueueFromContextualPath(trackPath);
         if (expanded) {
           // Store source path for optimization by caller on next invocation
           this._queueSourcePath = parentPath;
@@ -695,13 +770,13 @@ export class BrowserManager {
   }
 
   /**
-   * Gets the default navigation path (first tab URL or '/').
+   * Gets the default navigation path (first tab path or '/').
    */
   getDefaultPath() {
     // Try to get first tab as default path
     if (this._tabs && this._tabs.length > 0) {
       const firstTab = this._tabs[0];
-      return firstTab?.url ?? '/';
+      return firstTab?.path ?? '/';
     }
     return '/';
   }