@buoy-gg/route-events 7.0.35 → 7.0.38

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@buoy-gg/route-events?style=flat-square&labelColor=1c1c1c&color=10B981)](https://www.npmjs.com/package/@buoy-gg/route-events) [![npm downloads](https://img.shields.io/npm/dm/@buoy-gg/route-events?style=flat-square&labelColor=1c1c1c&color=10B981)](https://www.npmjs.com/package/@buoy-gg/route-events)
 
-**See every route in your app, watch navigation happen in real time, and jump to any screen from a full sitemap.**
+Inspect observed navigation events, browse supported routes, and navigate using the parameters your app requires.
 
 Part of [Buoy](https://github.com/Buoy-gg/buoy) — devtools that live inside your React Native app. Install it and it auto-appears in the floating menu from [`@buoy-gg/core`](https://www.npmjs.com/package/@buoy-gg/core).
 
@@ -14,6 +14,24 @@ Part of [Buoy](https://github.com/Buoy-gg/buoy) — devtools that live inside yo
 npm install @buoy-gg/core @buoy-gg/route-events
 ```
 
+## Before you start
+
+Use a development build with `@buoy-gg/core` and a Free or Pro Buoy account key. From your app’s directory, sign in:
+
+```bash
+npx --package=@buoy-gg/core buoy login
+```
+
+For Expo, initialize Buoy before rendering the menu:
+
+```tsx
+import { Buoy } from "@buoy-gg/core";
+
+Buoy.init({ licenseKey: process.env.EXPO_PUBLIC_BUOY_KEY });
+```
+
+The login command writes the Expo key to `.env.local`. For React Native CLI, pass the key from your app’s environment configuration; React Native does not load `.env.local` automatically. Mount `FloatingDevTools` inside the same providers as your screens and restart the development server after installation. The [Quick Start](https://buoy.gg/buoy/latest/docs/quick-start) shows the complete root component setup.
+
 ## Quick start
 
 ```tsx
@@ -31,25 +49,25 @@ export default function RootLayout() {
 }
 ```
 
-That's it. `FloatingDevTools` detects the package, mounts the route tracker for you, and the ROUTES tool shows up in the menu. It auto-detects whether you're on Expo Router or React Navigation and adapts.
+After account setup, open Routes and navigate between two known screens. Check their paths and parameters. Keep your existing navigator and providers; supported data differs between Expo Router and React Navigation. The event duration is time since the previous navigation, not screen render time.
 
 ## What you get
 
-- **Full sitemap** — browse every route in your app, searchable, with route types (static, dynamic, layout) labeled
-- **Jump to any screen** — tap a route in the sitemap and navigate straight to it, params and all
+- **Sitemap** — browse discovered routes, searchable, with route types (static, dynamic, layout) labeled
+- **Navigate** — select a supported route and supply its required parameters. App navigation guards still apply
 - **Live navigation stack** — watch the stack push, pop, and replace as you move through the app
 - **Navigation event timeline** — every navigation logged with path, params, timestamp, and time since the previous one
 - **Filtering & search** — filter events by pathname pattern, search across routes
-- **Zero setup** — no `<RouteTracker />` to place, no config; the core menu wires it automatically
+- **Tracker integration** — the core menu mounts the package’s route tracker
 - **Hooks for custom UIs** — `useRouteEvents`, `useRouteSitemap`, and `useNavigationStack` if you want the data without the modal
 
 ## Desktop & AI
 
-The same live session streams to [Buoy Desktop](https://github.com/Buoy-gg/Buoy-Desktop) (free, macOS/Windows/Linux) and to Claude Code or Cursor via the [Buoy MCP server](https://buoy.gg/buoy/latest/docs/mcp).
+To connect a React Native app to [Buoy Desktop](https://github.com/Buoy-gg/Buoy-Desktop) or MCP, install `@buoy-gg/external-sync` and follow the [Desktop connection guide](https://buoy.gg/buoy/latest/docs/desktop). Sign in to Desktop separately. [MCP setup](https://buoy.gg/buoy/latest/docs/mcp) also requires a process account and Pro access. Available remote actions depend on the tool and app integration.
 
-## Free vs Pro
+## Account and plan requirements
 
-Every tool is free. [Pro](https://buoy.gg/pricing) unlocks production builds, the MCP server, and unlimited capture. Every weekend, Pro features unlock free for anyone holding a key — including a free one (`npx buoy login`).
+Use a Free or Pro Buoy account. History limits and paid features vary by tool; see [pricing](https://buoy.gg/pricing). Production access requires Pro where supported. Development-only hooks and actions remain unavailable in release builds.
 
 ---
 

package/lib/commonjs/RouteTracker.js

@@ -10,6 +10,7 @@ var _useRouteObserver = require("./useRouteObserver");
 var _useRouteObserverReactNavigation = require("./useRouteObserverReactNavigation");
 var _useNavigationStack = require("./useNavigationStack");
 var _navigationStackStore = require("./stores/navigationStackStore");
+var _routeEventStore = require("./stores/routeEventStore");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
  * RouteTracker - A component to place inside your navigation tree
@@ -52,11 +53,20 @@ var _jsxRuntime = require("react/jsx-runtime");
  * ```
  */
 
+// Mounted at boot by FloatingDevTools, so this is where capture starts —
+// routeEventStore.hydrateBootCapture explains why the store needs it.
+function useBootCapture() {
+  (0, _react.useEffect)(() => {
+    _routeEventStore.routeEventStore.hydrateBootCapture();
+  }, []);
+}
 function ExpoRouteTracker() {
+  useBootCapture();
   (0, _useRouteObserver.useRouteObserver)();
   return null;
 }
 function ReactNavigationRouteTracker() {
+  useBootCapture();
   (0, _useRouteObserverReactNavigation.useRouteObserverReactNavigation)();
   return null;
 }

package/lib/commonjs/components/RouteEventItemCompact.js

@@ -131,43 +131,30 @@ const RouteEventItemCompact = exports.RouteEventItemCompact = /*#__PURE__*/(0, _
     });
   }, [isExpanded, event, visitNumber, routeTemplate]);
 
-  // Custom badge shows Go button (and badge text if present) when onNavigate is provided
-  const customBadge = (0, _react.useMemo)(() => {
+  // The Go button lives beside the row, not inside its touchable (see
+  // CompactRow.trailingAction), so a press never opens the row as well.
+  const goButton = (0, _react.useMemo)(() => {
     if (!onNavigate) return undefined;
-    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
-      style: styles.badgeContainer,
-      children: [badgeText && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-        style: [styles.badgeText, {
-          color: statusColor
-        }],
-        testID: `${testID}-badge`,
-        children: badgeText
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
-        style: styles.goButton,
-        onPress: e => {
-          e.stopPropagation();
-          onNavigate(event.pathname);
-        },
-        testID: `${testID}-go`,
-        accessibilityRole: "button",
-        accessibilityLabel: `Go to ${event.pathname}`,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-          style: styles.goButtonText,
-          children: "Go"
-        })
-      })]
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+      style: styles.goButton,
+      onPress: () => onNavigate(event.pathname),
+      testID: `${testID}-go`,
+      accessibilityRole: "button",
+      accessibilityLabel: `Go to ${event.pathname}`,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+        style: styles.goButtonText,
+        children: "Go"
+      })
     });
-  }, [onNavigate, event.pathname, badgeText, statusColor, testID]);
+  }, [onNavigate, event.pathname, testID]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.CompactRow, {
     statusDotColor: statusColor,
     statusLabel: statusLabel,
     statusSublabel: statusSublabel,
-    primaryText: event.pathname
-    // Use badgeText when no customBadge, otherwise badge is inside customBadge
-    ,
-    badgeText: onNavigate ? undefined : badgeText,
+    primaryText: event.pathname,
+    badgeText: badgeText,
     badgeColor: statusColor,
-    customBadge: customBadge,
+    trailingAction: goButton,
     bottomRightText: /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.RelativeTime, {
       timestamp: event.timestamp
     }),
@@ -183,11 +170,6 @@ const RouteEventItemCompact = exports.RouteEventItemCompact = /*#__PURE__*/(0, _
   });
 });
 const styles = _reactNative.StyleSheet.create({
-  badgeContainer: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 6
-  },
   badgeText: {
     fontSize: 11,
     fontWeight: "600",

package/lib/commonjs/components/RouteEventsModalWithTabs.js

@@ -11,6 +11,7 @@ var _safeReactNavigation = require("../utils/safeReactNavigation");
 var _sharedUi = require("@buoy-gg/shared-ui");
 var _license = require("@buoy-gg/license");
 var _useRouteEvents = require("../hooks/useRouteEvents");
+var _routeEventStore = require("../stores/routeEventStore");
 var _RouteEventDetail = require("./RouteEventDetail");
 var _RouteFilterViewV = require("./RouteFilterViewV2");
 var _RoutesSitemap = require("./RoutesSitemap");
@@ -138,6 +139,13 @@ function RouteEventsModalWithTabs({
 
   // isListening = enabled and store is listening
   const isListening = isListeningEnabled && isStoreListening;
+
+  // The switch above only governs THIS component's subscription; the store
+  // also holds one of its own from boot (routeEventStore.setBootCapture), so
+  // pausing here has to release that too or capture would never stop.
+  (0, _react.useEffect)(() => {
+    _routeEventStore.routeEventStore.setBootCapture(isListeningEnabled);
+  }, [isListeningEnabled]);
   const [showFilters, setShowFilters] = (0, _react.useState)(false);
   // Selected event drives the full-screen detail view (parity with the Events
   // tool). null = list view. visitNumber feeds the "Visited N times" section.

package/lib/commonjs/stores/routeEventStore.js

@@ -40,6 +40,45 @@ var _RouteObserver = require("../RouteObserver");
 class RouteEventStore extends _sharedUi.BaseEventStore {
   // Unsubscribe function for routeObserver
   routeObserverUnsubscribe = null;
+  // The store's own subscription — see setBootCapture.
+  bootCaptureRelease = null;
+  bootCaptureHydrated = false;
+
+  /**
+   * Capture from app launch, not from the first open of the tool.
+   *
+   * A BaseEventStore only listens while something subscribes to it, and for
+   * routes that was the open modal or a watching desktop — so every
+   * navigation before the tool was first opened was simply never recorded,
+   * and the Events tab opened on "No route events yet" after a session of
+   * navigating. (It looked fine on any machine with Buoy Desktop running,
+   * because the desktop's watch subscribed at boot.) Network and storage both
+   * capture from launch; this holds a subscription of the store's own so
+   * routes does too.
+   *
+   * The hold follows the tool's persisted monitoring switch: the modal calls
+   * this on every toggle, and `hydrateBootCapture` reads the persisted value
+   * at boot so a paused tool stays paused across a relaunch.
+   */
+  setBootCapture(enabled) {
+    if (enabled && !this.bootCaptureRelease) {
+      this.bootCaptureRelease = this.subscribeToEvents(() => {});
+    } else if (!enabled && this.bootCaptureRelease) {
+      this.bootCaptureRelease();
+      this.bootCaptureRelease = null;
+    }
+  }
+
+  /** Arm boot capture from the persisted monitoring switch (default on). */
+  hydrateBootCapture() {
+    if (this.bootCaptureHydrated) return;
+    this.bootCaptureHydrated = true;
+    void _sharedUi.persistentStorage.getItem(_sharedUi.devToolsStorageKeys.routeEvents.isMonitoring()).then(raw => {
+      // The modal may already have decided while the read was in flight.
+      if (this.bootCaptureRelease) return;
+      this.setBootCapture(raw !== "false");
+    }).catch(() => this.setBootCapture(true));
+  }
   constructor() {
     super({
       storeName: "route-events",

package/lib/commonjs/sync/routeEventsSyncAdapter.js

@@ -131,7 +131,21 @@ const routeEventsSyncAdapter = exports.routeEventsSyncAdapter = {
       // BaseEventStore is newest-FIRST, and the store only captures while
       // something is subscribed.
       const latest = _routeEventStore.routeEventStore.getEvents()[0];
-      if (latest) {
+
+      /**
+       * A RECORDED event only wins while the recorder is running.
+       *
+       * The store starts capturing when its first subscriber arrives and stops
+       * with the last one, so an app with Ask Buoy on the phone and no
+       * dashboard attached has NO route events at all — the stack fallback
+       * below is its normal path, not the fresh-launch edge case this code was
+       * written for. Worse, events left over from a closed capture window are
+       * stale the moment the user navigates again: a live QA session read
+       * `/(tabs)/menu` from an event six scenarios after the app had moved to
+       * `/cart`. The live stack cannot be stale, so it wins whenever nothing
+       * is recording.
+       */
+      if (latest && _routeEventStore.routeEventStore.isCapturing()) {
         return {
           path: latest.pathname,
           params: toWireParams(latest.params),
@@ -139,13 +153,12 @@ const routeEventsSyncAdapter = exports.routeEventsSyncAdapter = {
           source: "event"
         };
       }
-      // Nothing has navigated yet — which is exactly the state a freshly
-      // launched app is in, and exactly when a macro recorder needs to know
-      // where it is starting from. The live stack knows even when the history
-      // is empty, so falling back to it is the difference between a macro that
-      // can run from anywhere and one that only works if you happen to be on
-      // the screen it was recorded from.
-      const focused = _navigationStackStore.navigationStackStore.getStack().find(item => item.isFocused) ?? _navigationStackStore.navigationStackStore.getStack().slice(-1)[0];
+
+      // The live stack knows even when the history is empty, which is the
+      // difference between a macro that can run from anywhere and one that
+      // only works if you happen to be on the screen it was recorded from.
+      const stack = _navigationStackStore.navigationStackStore.getStack();
+      const focused = stack.find(item => item.isFocused) ?? stack[stack.length - 1];
       if (focused?.pathname) {
         return {
           path: focused.pathname,
@@ -154,6 +167,19 @@ const routeEventsSyncAdapter = exports.routeEventsSyncAdapter = {
           source: "stack"
         };
       }
+
+      // No live stack (no <RouteTracker/>) and the recorder is off: an old
+      // event is all there is. Say that it may be stale rather than passing it
+      // off as where the app is.
+      if (latest) {
+        return {
+          path: latest.pathname,
+          params: toWireParams(latest.params),
+          at: latest.timestamp,
+          source: "event",
+          stale: true
+        };
+      }
       return {
         path: null,
         params: {},

package/lib/commonjs/useNavigationStack.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.buildStack = buildStack;
 exports.useNavigationStack = useNavigationStack;
 var _react = require("react");
 var _safeReactNavigation = require("./utils/safeReactNavigation");
@@ -85,14 +86,39 @@ function buildNestedNavigateAction(path) {
 // ============================================================================
 
 /**
- * Recursively collect all routes from the navigation state tree
+ * Recursively collect the routes from the navigation state tree.
+ *
+ * FOCUS COMES FROM `state.index`, NEVER FROM POSITION. React Navigation names
+ * the focused route by index within `routes`; the array's order is declaration
+ * order. `buildStack` used to equate the two — "the last route in the collected
+ * list is the focused one" — and a hidden tab declared last (`href: null` on an
+ * expo-router `Tabs.Screen`) then became the reported current screen for the
+ * whole session. Measured on a real app: Home and Rewards both reported as a
+ * hidden Menu tab, in every turn of a 55-scenario QA run, because `menu` was
+ * declared last.
+ *
+ * TAB AND DRAWER SIBLINGS ARE NOT A STACK. They are alternative destinations
+ * that happen to be mounted at the same time; `canPop` and `popToIndex` never
+ * meant anything for them. Only the focused branch of a tab/drawer is
+ * collected, so what comes back is the stack you could actually pop.
  */
-function collectRoutesFromState(state, depth = 0, parentPath = "") {
-  if (!state || !state.routes) return [];
+function collectRoutesFromState(state, depth = 0, parentPath = "", onFocusedChain = true) {
+  if (!state || !Array.isArray(state.routes) || state.routes.length === 0) {
+    return [];
+  }
   const routes = [];
+
+  // An absent or out-of-range `index` is incomplete state (mid-rehydration, a
+  // partially built child). Fall back to the last route — a stack's top — and
+  // never to an arbitrary sibling.
+  const declaredIndex = typeof state.index === "number" ? state.index : NaN;
+  const focusedIndex = Number.isInteger(declaredIndex) && declaredIndex >= 0 && declaredIndex < state.routes.length ? declaredIndex : state.routes.length - 1;
+  const navigatorType = typeof state.type === "string" ? state.type : undefined;
+  const siblingsAreStack = navigatorType !== "tab" && navigatorType !== "drawer";
   for (let i = 0; i < state.routes.length; i++) {
+    if (!siblingsAreStack && i !== focusedIndex) continue;
     const route = state.routes[i];
-    const isFocused = i === state.index;
+    const isFocused = i === focusedIndex;
 
     // Build the path
     let pathname = route.name;
@@ -116,25 +142,30 @@ function collectRoutesFromState(state, depth = 0, parentPath = "") {
         });
       }
     }
+
+    // Descend the focused branch first: whatever it yields owns the focus, and
+    // this route only keeps it when nothing deeper claimed it.
+    const onChain = onFocusedChain && isFocused;
+    const nestedRoutes = onChain && route.state ? collectRoutesFromState(route.state, depth + 1, pathname, true) : [];
     routes.push({
       key: route.key,
       name: route.name,
       path: pathname,
       params: route.params || {},
-      state: route.state
+      state: route.state,
+      isFocused: onChain && nestedRoutes.length === 0
     });
-
-    // If this route has nested state and is focused, recurse
-    if (isFocused && route.state) {
-      const nestedRoutes = collectRoutesFromState(route.state, depth + 1, pathname);
-      routes.push(...nestedRoutes);
-    }
+    routes.push(...nestedRoutes);
   }
   return routes;
 }
 
 /**
- * Transform raw navigation state into display items
+ * Transform raw navigation state into display items.
+ *
+ * Exported for tests: the focus rule below is the one thing every route answer
+ * in the product rests on, and it was previously only reachable by extracting
+ * the function from source with the TypeScript AST.
  */
 function buildStack(navigationState, isExpo) {
   if (!navigationState) return [];
@@ -153,7 +184,14 @@ function buildStack(navigationState, isExpo) {
     // If we filtered everything out, just keep the last route
     const finalRoutes = filteredRoutes.length > 0 ? filteredRoutes : routes.slice(-1);
 
-    // The last route in the collected list is the focused one
+    /**
+     * Focus survives filtering. It is decided in `collectRoutesFromState` from
+     * `state.index`; the only case that falls back to the last item is one
+     * where the filter dropped the focused route itself (an internal expo
+     * layout), which is the one situation the old rule was ever right for.
+     */
+    const collectedFocus = finalRoutes.findIndex(route => route.isFocused);
+    const focusIndex = collectedFocus >= 0 ? collectedFocus : finalRoutes.length - 1;
     return finalRoutes.map((route, index) => {
       let cleanPath = route.path || `/${route.name}`;
       // Clean up Expo Router internal /__root prefix
@@ -169,7 +207,7 @@ function buildStack(navigationState, isExpo) {
         name: route.name,
         pathname: cleanPath,
         params: route.params || {},
-        isFocused: index === finalRoutes.length - 1,
+        isFocused: index === focusIndex,
         index,
         canPop: index > 0
       };

package/lib/module/RouteTracker.js

@@ -47,12 +47,23 @@ import { useRouteObserver } from "./useRouteObserver";
 import { useRouteObserverReactNavigation } from "./useRouteObserverReactNavigation";
 import { useNavigationStack } from "./useNavigationStack";
 import { navigationStackStore } from "./stores/navigationStackStore";
+import { routeEventStore } from "./stores/routeEventStore";
+
+// Mounted at boot by FloatingDevTools, so this is where capture starts —
+// routeEventStore.hydrateBootCapture explains why the store needs it.
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+function useBootCapture() {
+  useEffect(() => {
+    routeEventStore.hydrateBootCapture();
+  }, []);
+}
 function ExpoRouteTracker() {
+  useBootCapture();
   useRouteObserver();
   return null;
 }
 function ReactNavigationRouteTracker() {
+  useBootCapture();
   useRouteObserverReactNavigation();
   return null;
 }

package/lib/module/components/RouteEventItemCompact.js

@@ -7,14 +7,14 @@
  */
 
 import { memo, useMemo } from "react";
-import { View, Text, TouchableOpacity, StyleSheet } from "react-native";
+import { Text, TouchableOpacity, StyleSheet } from "react-native";
 import { CompactRow, RelativeTime, buoyColors, night, monoFont } from "@buoy-gg/shared-ui";
 import { RouteEventExpandedContent } from "./RouteEventExpandedContent";
 import { getRouteTemplate } from "../utils/routeTemplate";
 import { eventRowTestID } from "../utils/testIDs";
 
 // Route type for color coding
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 // Get route type for color coding
 function getRouteType(event) {
   if (event.pathname === "/") {
@@ -127,43 +127,30 @@ export const RouteEventItemCompact = /*#__PURE__*/memo(function RouteEventItemCo
     });
   }, [isExpanded, event, visitNumber, routeTemplate]);
 
-  // Custom badge shows Go button (and badge text if present) when onNavigate is provided
-  const customBadge = useMemo(() => {
+  // The Go button lives beside the row, not inside its touchable (see
+  // CompactRow.trailingAction), so a press never opens the row as well.
+  const goButton = useMemo(() => {
     if (!onNavigate) return undefined;
-    return /*#__PURE__*/_jsxs(View, {
-      style: styles.badgeContainer,
-      children: [badgeText && /*#__PURE__*/_jsx(Text, {
-        style: [styles.badgeText, {
-          color: statusColor
-        }],
-        testID: `${testID}-badge`,
-        children: badgeText
-      }), /*#__PURE__*/_jsx(TouchableOpacity, {
-        style: styles.goButton,
-        onPress: e => {
-          e.stopPropagation();
-          onNavigate(event.pathname);
-        },
-        testID: `${testID}-go`,
-        accessibilityRole: "button",
-        accessibilityLabel: `Go to ${event.pathname}`,
-        children: /*#__PURE__*/_jsx(Text, {
-          style: styles.goButtonText,
-          children: "Go"
-        })
-      })]
+    return /*#__PURE__*/_jsx(TouchableOpacity, {
+      style: styles.goButton,
+      onPress: () => onNavigate(event.pathname),
+      testID: `${testID}-go`,
+      accessibilityRole: "button",
+      accessibilityLabel: `Go to ${event.pathname}`,
+      children: /*#__PURE__*/_jsx(Text, {
+        style: styles.goButtonText,
+        children: "Go"
+      })
     });
-  }, [onNavigate, event.pathname, badgeText, statusColor, testID]);
+  }, [onNavigate, event.pathname, testID]);
   return /*#__PURE__*/_jsx(CompactRow, {
     statusDotColor: statusColor,
     statusLabel: statusLabel,
     statusSublabel: statusSublabel,
-    primaryText: event.pathname
-    // Use badgeText when no customBadge, otherwise badge is inside customBadge
-    ,
-    badgeText: onNavigate ? undefined : badgeText,
+    primaryText: event.pathname,
+    badgeText: badgeText,
     badgeColor: statusColor,
-    customBadge: customBadge,
+    trailingAction: goButton,
     bottomRightText: /*#__PURE__*/_jsx(RelativeTime, {
       timestamp: event.timestamp
     }),
@@ -179,11 +166,6 @@ export const RouteEventItemCompact = /*#__PURE__*/memo(function RouteEventItemCo
   });
 });
 const styles = StyleSheet.create({
-  badgeContainer: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 6
-  },
   badgeText: {
     fontSize: 11,
     fontWeight: "600",

package/lib/module/components/RouteEventsModalWithTabs.js

@@ -15,6 +15,7 @@ import { useIsPro } from "@buoy-gg/license";
 // Free tier limit for route events
 
 import { useRouteEvents } from "../hooks/useRouteEvents";
+import { routeEventStore } from "../stores/routeEventStore";
 import { RouteEventDetail } from "./RouteEventDetail";
 import { RouteFilterViewV2 } from "./RouteFilterViewV2";
 import { RoutesSitemap } from "./RoutesSitemap";
@@ -135,6 +136,13 @@ export function RouteEventsModalWithTabs({
 
   // isListening = enabled and store is listening
   const isListening = isListeningEnabled && isStoreListening;
+
+  // The switch above only governs THIS component's subscription; the store
+  // also holds one of its own from boot (routeEventStore.setBootCapture), so
+  // pausing here has to release that too or capture would never stop.
+  useEffect(() => {
+    routeEventStore.setBootCapture(isListeningEnabled);
+  }, [isListeningEnabled]);
   const [showFilters, setShowFilters] = useState(false);
   // Selected event drives the full-screen detail view (parity with the Events
   // tool). null = list view. visitNumber feeds the "Visited N times" section.

package/lib/module/stores/routeEventStore.js

@@ -21,7 +21,7 @@
  * ```
  */
 
-import { BaseEventStore } from "@buoy-gg/shared-ui";
+import { BaseEventStore, devToolsStorageKeys, persistentStorage } from "@buoy-gg/shared-ui";
 import { routeObserver } from "../RouteObserver";
 
 // Re-export types for convenience
@@ -37,6 +37,45 @@ import { routeObserver } from "../RouteObserver";
 class RouteEventStore extends BaseEventStore {
   // Unsubscribe function for routeObserver
   routeObserverUnsubscribe = null;
+  // The store's own subscription — see setBootCapture.
+  bootCaptureRelease = null;
+  bootCaptureHydrated = false;
+
+  /**
+   * Capture from app launch, not from the first open of the tool.
+   *
+   * A BaseEventStore only listens while something subscribes to it, and for
+   * routes that was the open modal or a watching desktop — so every
+   * navigation before the tool was first opened was simply never recorded,
+   * and the Events tab opened on "No route events yet" after a session of
+   * navigating. (It looked fine on any machine with Buoy Desktop running,
+   * because the desktop's watch subscribed at boot.) Network and storage both
+   * capture from launch; this holds a subscription of the store's own so
+   * routes does too.
+   *
+   * The hold follows the tool's persisted monitoring switch: the modal calls
+   * this on every toggle, and `hydrateBootCapture` reads the persisted value
+   * at boot so a paused tool stays paused across a relaunch.
+   */
+  setBootCapture(enabled) {
+    if (enabled && !this.bootCaptureRelease) {
+      this.bootCaptureRelease = this.subscribeToEvents(() => {});
+    } else if (!enabled && this.bootCaptureRelease) {
+      this.bootCaptureRelease();
+      this.bootCaptureRelease = null;
+    }
+  }
+
+  /** Arm boot capture from the persisted monitoring switch (default on). */
+  hydrateBootCapture() {
+    if (this.bootCaptureHydrated) return;
+    this.bootCaptureHydrated = true;
+    void persistentStorage.getItem(devToolsStorageKeys.routeEvents.isMonitoring()).then(raw => {
+      // The modal may already have decided while the read was in flight.
+      if (this.bootCaptureRelease) return;
+      this.setBootCapture(raw !== "false");
+    }).catch(() => this.setBootCapture(true));
+  }
   constructor() {
     super({
       storeName: "route-events",

package/lib/module/sync/routeEventsSyncAdapter.js

@@ -129,7 +129,21 @@ export const routeEventsSyncAdapter = {
       // BaseEventStore is newest-FIRST, and the store only captures while
       // something is subscribed.
       const latest = routeEventStore.getEvents()[0];
-      if (latest) {
+
+      /**
+       * A RECORDED event only wins while the recorder is running.
+       *
+       * The store starts capturing when its first subscriber arrives and stops
+       * with the last one, so an app with Ask Buoy on the phone and no
+       * dashboard attached has NO route events at all — the stack fallback
+       * below is its normal path, not the fresh-launch edge case this code was
+       * written for. Worse, events left over from a closed capture window are
+       * stale the moment the user navigates again: a live QA session read
+       * `/(tabs)/menu` from an event six scenarios after the app had moved to
+       * `/cart`. The live stack cannot be stale, so it wins whenever nothing
+       * is recording.
+       */
+      if (latest && routeEventStore.isCapturing()) {
         return {
           path: latest.pathname,
           params: toWireParams(latest.params),
@@ -137,13 +151,12 @@ export const routeEventsSyncAdapter = {
           source: "event"
         };
       }
-      // Nothing has navigated yet — which is exactly the state a freshly
-      // launched app is in, and exactly when a macro recorder needs to know
-      // where it is starting from. The live stack knows even when the history
-      // is empty, so falling back to it is the difference between a macro that
-      // can run from anywhere and one that only works if you happen to be on
-      // the screen it was recorded from.
-      const focused = navigationStackStore.getStack().find(item => item.isFocused) ?? navigationStackStore.getStack().slice(-1)[0];
+
+      // The live stack knows even when the history is empty, which is the
+      // difference between a macro that can run from anywhere and one that
+      // only works if you happen to be on the screen it was recorded from.
+      const stack = navigationStackStore.getStack();
+      const focused = stack.find(item => item.isFocused) ?? stack[stack.length - 1];
       if (focused?.pathname) {
         return {
           path: focused.pathname,
@@ -152,6 +165,19 @@ export const routeEventsSyncAdapter = {
           source: "stack"
         };
       }
+
+      // No live stack (no <RouteTracker/>) and the recorder is off: an old
+      // event is all there is. Say that it may be stale rather than passing it
+      // off as where the app is.
+      if (latest) {
+        return {
+          path: latest.pathname,
+          params: toWireParams(latest.params),
+          at: latest.timestamp,
+          source: "event",
+          stale: true
+        };
+      }
       return {
         path: null,
         params: {},

package/lib/module/useNavigationStack.js

@@ -82,14 +82,39 @@ function buildNestedNavigateAction(path) {
 // ============================================================================
 
 /**
- * Recursively collect all routes from the navigation state tree
+ * Recursively collect the routes from the navigation state tree.
+ *
+ * FOCUS COMES FROM `state.index`, NEVER FROM POSITION. React Navigation names
+ * the focused route by index within `routes`; the array's order is declaration
+ * order. `buildStack` used to equate the two — "the last route in the collected
+ * list is the focused one" — and a hidden tab declared last (`href: null` on an
+ * expo-router `Tabs.Screen`) then became the reported current screen for the
+ * whole session. Measured on a real app: Home and Rewards both reported as a
+ * hidden Menu tab, in every turn of a 55-scenario QA run, because `menu` was
+ * declared last.
+ *
+ * TAB AND DRAWER SIBLINGS ARE NOT A STACK. They are alternative destinations
+ * that happen to be mounted at the same time; `canPop` and `popToIndex` never
+ * meant anything for them. Only the focused branch of a tab/drawer is
+ * collected, so what comes back is the stack you could actually pop.
  */
-function collectRoutesFromState(state, depth = 0, parentPath = "") {
-  if (!state || !state.routes) return [];
+function collectRoutesFromState(state, depth = 0, parentPath = "", onFocusedChain = true) {
+  if (!state || !Array.isArray(state.routes) || state.routes.length === 0) {
+    return [];
+  }
   const routes = [];
+
+  // An absent or out-of-range `index` is incomplete state (mid-rehydration, a
+  // partially built child). Fall back to the last route — a stack's top — and
+  // never to an arbitrary sibling.
+  const declaredIndex = typeof state.index === "number" ? state.index : NaN;
+  const focusedIndex = Number.isInteger(declaredIndex) && declaredIndex >= 0 && declaredIndex < state.routes.length ? declaredIndex : state.routes.length - 1;
+  const navigatorType = typeof state.type === "string" ? state.type : undefined;
+  const siblingsAreStack = navigatorType !== "tab" && navigatorType !== "drawer";
   for (let i = 0; i < state.routes.length; i++) {
+    if (!siblingsAreStack && i !== focusedIndex) continue;
     const route = state.routes[i];
-    const isFocused = i === state.index;
+    const isFocused = i === focusedIndex;
 
     // Build the path
     let pathname = route.name;
@@ -113,27 +138,32 @@ function collectRoutesFromState(state, depth = 0, parentPath = "") {
         });
       }
     }
+
+    // Descend the focused branch first: whatever it yields owns the focus, and
+    // this route only keeps it when nothing deeper claimed it.
+    const onChain = onFocusedChain && isFocused;
+    const nestedRoutes = onChain && route.state ? collectRoutesFromState(route.state, depth + 1, pathname, true) : [];
     routes.push({
       key: route.key,
       name: route.name,
       path: pathname,
       params: route.params || {},
-      state: route.state
+      state: route.state,
+      isFocused: onChain && nestedRoutes.length === 0
     });
-
-    // If this route has nested state and is focused, recurse
-    if (isFocused && route.state) {
-      const nestedRoutes = collectRoutesFromState(route.state, depth + 1, pathname);
-      routes.push(...nestedRoutes);
-    }
+    routes.push(...nestedRoutes);
   }
   return routes;
 }
 
 /**
- * Transform raw navigation state into display items
+ * Transform raw navigation state into display items.
+ *
+ * Exported for tests: the focus rule below is the one thing every route answer
+ * in the product rests on, and it was previously only reachable by extracting
+ * the function from source with the TypeScript AST.
  */
-function buildStack(navigationState, isExpo) {
+export function buildStack(navigationState, isExpo) {
   if (!navigationState) return [];
   try {
     const routes = collectRoutesFromState(navigationState);
@@ -150,7 +180,14 @@ function buildStack(navigationState, isExpo) {
     // If we filtered everything out, just keep the last route
     const finalRoutes = filteredRoutes.length > 0 ? filteredRoutes : routes.slice(-1);
 
-    // The last route in the collected list is the focused one
+    /**
+     * Focus survives filtering. It is decided in `collectRoutesFromState` from
+     * `state.index`; the only case that falls back to the last item is one
+     * where the filter dropped the focused route itself (an internal expo
+     * layout), which is the one situation the old rule was ever right for.
+     */
+    const collectedFocus = finalRoutes.findIndex(route => route.isFocused);
+    const focusIndex = collectedFocus >= 0 ? collectedFocus : finalRoutes.length - 1;
     return finalRoutes.map((route, index) => {
       let cleanPath = route.path || `/${route.name}`;
       // Clean up Expo Router internal /__root prefix
@@ -166,7 +203,7 @@ function buildStack(navigationState, isExpo) {
         name: route.name,
         pathname: cleanPath,
         params: route.params || {},
-        isFocused: index === finalRoutes.length - 1,
+        isFocused: index === focusIndex,
         index,
         canPop: index > 0
       };

package/lib/typescript/RouteTracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteTracker.d.ts","sourceRoot":"","sources":["../../src/RouteTracker.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAiDH,wBAAgB,YAAY,gCAQ3B"}
+{"version":3,"file":"RouteTracker.d.ts","sourceRoot":"","sources":["../../src/RouteTracker.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AA4DH,wBAAgB,YAAY,gCAQ3B"}

package/lib/typescript/components/RouteEventItemCompact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteEventItemCompact.d.ts","sourceRoot":"","sources":["../../../src/components/RouteEventItemCompact.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAKzD,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,gBAAgB,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB;0DACsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AA6FD,eAAO,MAAM,qBAAqB,kEA0FhC,CAAC"}
+{"version":3,"file":"RouteEventItemCompact.d.ts","sourceRoot":"","sources":["../../../src/components/RouteEventItemCompact.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAKzD,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,gBAAgB,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB;0DACsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AA6FD,eAAO,MAAM,qBAAqB,kEA6EhC,CAAC"}

package/lib/typescript/components/RouteEventsModalWithTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteEventsModalWithTabs.d.ts","sourceRoot":"","sources":["../../../src/components/RouteEventsModalWithTabs.tsx"],"names":[],"mappings":"AA0DA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAGnE,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE;QACP,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;YACrB,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC;YAChC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;SAC/B,CAAC;QACF,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;QAC3B;;;;WAIG;QACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;QAC7C;;;;;WAKG;QACH,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5C,2EAA2E;QAC3E,aAAa,CAAC,EAAE,CACd,MAAM,EAAE,yBAAyB,EACjC,OAAO,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,KACzB,IAAI,CAAC;KACX,CAAC;CACH;AAgED,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,OAAO,EACP,MAAM,EACN,UAAU,EACV,2BAAmC,EACnC,MAAc,EACd,MAAM,GACP,EAAE,6BAA6B,sCAqmB/B;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,KAAK,GAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAM,+BAKlF"}
+{"version":3,"file":"RouteEventsModalWithTabs.d.ts","sourceRoot":"","sources":["../../../src/components/RouteEventsModalWithTabs.tsx"],"names":[],"mappings":"AA0DA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAGnE,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE;QACP,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;YACrB,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC;YAChC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;SAC/B,CAAC;QACF,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;QAC3B;;;;WAIG;QACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;QAC7C;;;;;WAKG;QACH,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5C,2EAA2E;QAC3E,aAAa,CAAC,EAAE,CACd,MAAM,EAAE,yBAAyB,EACjC,OAAO,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,KACzB,IAAI,CAAC;KACX,CAAC;CACH;AAgED,wBAAgB,wBAAwB,CAAC,EACvC,OAAO,EACP,OAAO,EACP,MAAM,EACN,UAAU,EACV,2BAAmC,EACnC,MAAc,EACd,MAAM,GACP,EAAE,6BAA6B,sCA4mB/B;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,KAAK,GAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAM,+BAKlF"}

package/lib/typescript/stores/routeEventStore.d.ts

@@ -31,6 +31,27 @@ export type RouteEventListener = (events: RouteChangeEvent[]) => void;
 export type RouteEventCallback = (event: RouteChangeEvent) => void;
 declare class RouteEventStore extends BaseEventStore<RouteChangeEvent> {
     private routeObserverUnsubscribe;
+    private bootCaptureRelease;
+    private bootCaptureHydrated;
+    /**
+     * Capture from app launch, not from the first open of the tool.
+     *
+     * A BaseEventStore only listens while something subscribes to it, and for
+     * routes that was the open modal or a watching desktop — so every
+     * navigation before the tool was first opened was simply never recorded,
+     * and the Events tab opened on "No route events yet" after a session of
+     * navigating. (It looked fine on any machine with Buoy Desktop running,
+     * because the desktop's watch subscribed at boot.) Network and storage both
+     * capture from launch; this holds a subscription of the store's own so
+     * routes does too.
+     *
+     * The hold follows the tool's persisted monitoring switch: the modal calls
+     * this on every toggle, and `hydrateBootCapture` reads the persisted value
+     * at boot so a paused tool stays paused across a relaunch.
+     */
+    setBootCapture(enabled: boolean): void;
+    /** Arm boot capture from the persisted monitoring switch (default on). */
+    hydrateBootCapture(): void;
     constructor();
     /**
      * Start listening to route changes from routeObserver

package/lib/typescript/stores/routeEventStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routeEventStore.d.ts","sourceRoot":"","sources":["../../../src/stores/routeEventStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAiB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGxE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,IAAI,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;AAEnE,cAAM,eAAgB,SAAQ,cAAc,CAAC,gBAAgB,CAAC;IAE5D,OAAO,CAAC,wBAAwB,CAA6B;;IAS7D;;OAEG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAQhC;;OAEG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAO/B;;OAEG;IACH,WAAW,IAAI,OAAO;IAKtB,WAAW,IAAI,OAAO;CAGvB;AAGD,eAAO,MAAM,eAAe,iBAAwB,CAAC;AAGrD,eAAO,MAAM,sBAAsB,GAAI,UAAU,kBAAkB,eACtB,CAAC;AAC9C,eAAO,MAAM,YAAY,GAAI,UAAU,kBAAkB,eACtB,CAAC;AACpC,eAAO,MAAM,cAAc,0BAAoC,CAAC;AAChE,eAAO,MAAM,gBAAgB,YAAsC,CAAC;AACpE,eAAO,MAAM,gBAAgB,eAAsC,CAAC"}
+{"version":3,"file":"routeEventStore.d.ts","sourceRoot":"","sources":["../../../src/stores/routeEventStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EACL,cAAc,EAGf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAiB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGxE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,IAAI,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;AAEnE,cAAM,eAAgB,SAAQ,cAAc,CAAC,gBAAgB,CAAC;IAE5D,OAAO,CAAC,wBAAwB,CAA6B;IAE7D,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,mBAAmB,CAAS;IAEpC;;;;;;;;;;;;;;;OAeG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAStC,0EAA0E;IAC1E,kBAAkB,IAAI,IAAI;;IAoB1B;;OAEG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAQhC;;OAEG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAO/B;;OAEG;IACH,WAAW,IAAI,OAAO;IAKtB,WAAW,IAAI,OAAO;CAGvB;AAGD,eAAO,MAAM,eAAe,iBAAwB,CAAC;AAGrD,eAAO,MAAM,sBAAsB,GAAI,UAAU,kBAAkB,eACtB,CAAC;AAC9C,eAAO,MAAM,YAAY,GAAI,UAAU,kBAAkB,eACtB,CAAC;AACpC,eAAO,MAAM,cAAc,0BAAoC,CAAC;AAChE,eAAO,MAAM,gBAAgB,YAAsC,CAAC;AACpE,eAAO,MAAM,gBAAgB,eAAsC,CAAC"}

package/lib/typescript/sync/routeEventsSyncAdapter.d.ts

@@ -66,16 +66,25 @@ export declare const routeEventsSyncAdapter: {
             params: Record<string, string | string[]>;
             at: number;
             source: "event";
+            stale?: undefined;
         } | {
             path: string;
             params: Record<string, any>;
             at: null;
             source: "stack";
+            stale?: undefined;
+        } | {
+            path: string;
+            params: Record<string, string | string[]>;
+            at: number;
+            source: "event";
+            stale: true;
         } | {
             path: null;
             params: {};
             at: null;
             source: null;
+            stale?: undefined;
         };
         /**
          * Navigate the device to a concrete path. The dashboard resolves any

package/lib/typescript/sync/routeEventsSyncAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routeEventsSyncAdapter.d.ts","sourceRoot":"","sources":["../../../src/sync/routeEventsSyncAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,QAAY,CAAC;AA4BrD;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,mEAAmE;IACnE,MAAM,EAAE,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC;IAC/B,6EAA6E;IAC7E,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,8EAA8E;IAC9E,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAWD;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB;;uBAEhB,sBAAsB;0BAKjB,MAAM,IAAI;;;QAkC9B;;;;;;;;WAQG;;;;;;;;;;;;;;;;;QAgCH;;;WAGG;4BACiB,OAAO;;;;;;;;;wCAsCK,OAAO;;;mCAUZ,OAAO;;;;;;;;;;CAuBrC,CAAC"}
+{"version":3,"file":"routeEventsSyncAdapter.d.ts","sourceRoot":"","sources":["../../../src/sync/routeEventsSyncAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,QAAY,CAAC;AA4BrD;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,mEAAmE;IACnE,MAAM,EAAE,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC;IAC/B,6EAA6E;IAC7E,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,8EAA8E;IAC9E,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAWD;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB;;uBAEhB,sBAAsB;0BAKjB,MAAM,IAAI;;;QAkC9B;;;;;;;;WAQG;;;;;;;;;;;;;;;;;;;;;;;;;;QAyDH;;;WAGG;4BACiB,OAAO;;;;;;;;;wCAsCK,OAAO;;;mCAUZ,OAAO;;;;;;;;;;CAuBrC,CAAC"}

package/lib/typescript/useNavigationStack.d.ts

@@ -38,6 +38,14 @@ export interface UseNavigationStackResult {
     goBack: () => void;
     popToTop: () => void;
 }
+/**
+ * Transform raw navigation state into display items.
+ *
+ * Exported for tests: the focus rule below is the one thing every route answer
+ * in the product rests on, and it was previously only reachable by extracting
+ * the function from source with the TypeScript AST.
+ */
+export declare function buildStack(navigationState: any, isExpo: boolean): StackDisplayItem[];
 /**
  * Access the current navigation stack.
  *

package/lib/typescript/useNavigationStack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNavigationStack.d.ts","sourceRoot":"","sources":["../../src/useNavigationStack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AA4BH,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,wBAAwB;IAEvC,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,YAAY,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAGpB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC;;;;;OAKG;IACH,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5D,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAuKD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,IAAI,wBAAwB,CAiM7D"}
+{"version":3,"file":"useNavigationStack.d.ts","sourceRoot":"","sources":["../../src/useNavigationStack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAiCH,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,wBAAwB;IAEvC,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,YAAY,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAGpB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC;;;;;OAKG;IACH,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5D,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAqJD;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAwDpF;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,IAAI,wBAAwB,CAiM7D"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@buoy-gg/route-events",
-  "version": "7.0.35",
-  "description": "Navigation devtool for React Native — live stack, full sitemap, jump to any screen. Expo Router & React Navigation. Part of Buoy devtools.",
+  "version": "7.0.38",
+  "description": "Inspect reported navigation state and supported route actions in React Native apps using Expo Router or React Navigation.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
   "types": "lib/typescript/index.d.ts",
@@ -26,12 +26,11 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@buoy-gg/floating-tools-core": "^7.0.35",
-    "@buoy-gg/shared-ui": "^7.0.35"
+    "@buoy-gg/floating-tools-core": "^7.0.38",
+    "@buoy-gg/shared-ui": "^7.0.38"
   },
   "peerDependencies": {
-    "@buoy-gg/license": "7.0.35",
-    "@react-native-async-storage/async-storage": "^2.0.0 || ^3.1.0",
+    "@buoy-gg/license": "7.0.38",
     "@react-navigation/native": "*",
     "expo-router": "*",
     "react": "*",
@@ -52,7 +51,7 @@
     "@types/react-native": "^0.73.0",
     "expo-router": "~5.0.7",
     "typescript": "~5.8.3",
-    "@buoy-gg/license": "^7.0.35"
+    "@buoy-gg/license": "^7.0.38"
   },
   "react-native-builder-bob": {
     "source": "src",