[pull] main from aidenybai:main

.github/workflows/test-perf.yml

@@ -82,16 +82,44 @@ jobs:
         run: |
           BASE_SHA="${{ github.event.pull_request.base.sha }}"
           git fetch origin "$BASE_SHA" --depth=1
-          if git cat-file -e "$BASE_SHA:packages/react-grab/src" 2>/dev/null; then
-            git checkout "$BASE_SHA" -- packages/react-grab/src
-            echo "swapped=true" >> "$GITHUB_OUTPUT"
-            echo "Swapped react-grab/src to base revision $BASE_SHA"
-          else
+          if ! git cat-file -e "$BASE_SHA:packages/react-grab/src" 2>/dev/null; then
             echo "Base ref lacks packages/react-grab/src; skipping baseline run."
             echo "swapped=false" >> "$GITHUB_OUTPUT"
+            exit 0
           fi
+          git checkout "$BASE_SHA" -- packages/react-grab/src
+          echo "Swapped react-grab/src to base revision $BASE_SHA"
 
+          # Base src builds against whatever this job installed, so a dependency
+          # change leaves it importing exports the new version dropped and the
+          # fixture's dev server never starts. Swapping the manifests too keeps
+          # the baseline a measurement of the base ref instead of a mix that
+          # cannot build, and it is the comparison a dependency bump wants.
+          if git diff --quiet "$BASE_SHA" HEAD -- '*package.json' pnpm-lock.yaml; then
+            echo "swapped=true" >> "$GITHUB_OUTPUT"
+            echo "deps_swapped=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          # Manifests the PR adds have no base revision to restore, and leaving
+          # them would make the base lockfile fail its frozen check.
+          git diff --name-only --diff-filter=A "$BASE_SHA" HEAD -- '*package.json' | xargs -r rm -f
+          git checkout "$BASE_SHA" -- '*package.json' pnpm-lock.yaml
+          if pnpm install; then
+            echo "swapped=true" >> "$GITHUB_OUTPUT"
+            echo "deps_swapped=true" >> "$GITHUB_OUTPUT"
+            echo "Swapped dependencies to base revision $BASE_SHA"
+            exit 0
+          fi
+          echo "Base dependencies failed to install; skipping baseline run."
+          git checkout HEAD -- packages/react-grab/src '*package.json' pnpm-lock.yaml
+          pnpm install
+          echo "swapped=false" >> "$GITHUB_OUTPUT"
+
+      # The baseline is a measurement, not a gate: the base ref is already tested
+      # by its own CI, so a baseline that cannot build or run must not block this
+      # PR. diff-perf-runs.mjs reports the missing comparison instead.
       - name: Run paired shard against base ref src
+        continue-on-error: true
         if: github.event_name == 'pull_request' && steps.swap-base.outputs.swapped == 'true'
         env:
           PERF_LABEL: baseline
@@ -108,7 +136,12 @@ jobs:
 
       - name: Restore react-grab src to HEAD
         if: github.event_name == 'pull_request' && steps.swap-base.outputs.swapped == 'true'
-        run: git checkout HEAD -- packages/react-grab/src
+        run: |
+          git checkout HEAD -- packages/react-grab/src
+          if [ "${{ steps.swap-base.outputs.deps_swapped }}" = "true" ]; then
+            git checkout HEAD -- '*package.json' pnpm-lock.yaml
+            pnpm install
+          fi
 
       - name: Run paired shard against HEAD src
         env:

packages/react-grab/package.json

@@ -109,7 +109,7 @@
   },
   "dependencies": {
     "@react-grab/cli": "workspace:*",
-    "bippy": "^0.6.1"
+    "bippy": "^0.7.2"
   },
   "devDependencies": {
     "@babel/core": "^7.29.0",

packages/react-grab/src/core/context.ts

@@ -3,6 +3,7 @@ import {
   isInstrumentationActive,
   getDisplayName,
   getLatestFiber,
+  isFiber,
   isCompositeFiber,
   traverseFiber,
   type Fiber,
@@ -259,10 +260,10 @@ export interface ResolvedSource extends SourceLocation {
 const pickNearestSourceFrame = (frames: StackFrame[]): StackFrame | null => frames[0] ?? null;
 
 const getSourceComponentName = (
-  fiber: Fiber | undefined,
+  fiber: Fiber["_debugOwner"],
   isNextProject: boolean,
 ): string | null => {
-  if (!fiber || !isCompositeFiber(fiber)) return null;
+  if (!isFiber(fiber) || !isCompositeFiber(fiber)) return null;
   return toSourceComponentName(getDisplayName(fiber.type), isNextProject);
 };
 

packages/react-grab/src/core/element-anchors.ts

@@ -1,10 +1,4 @@
-import {
-  getFiberFromHostInstance,
-  getLatestFiber,
-  getNearestHostFibers,
-  isHostFiber,
-  type Fiber,
-} from "bippy";
+import { getFiberFromHostInstance, getLatestFiber, isHostFiber, type Fiber } from "bippy";
 import { indexInParent } from "../utils/index-in-parent.js";
 import { isShadowRoot } from "../utils/is-shadow-root.js";
 import { isElementNode } from "../utils/is-element-node.js";
@@ -55,15 +49,37 @@ const resolveLiveAnchor = (anchor: ElementAnchor): Element | null => {
     return candidate && candidate.tagName === anchorTagName ? candidate : null;
   }
 
-  for (const hostFiber of getNearestHostFibers(latestParentFiber)) {
-    const node = hostFiber.stateNode;
-    // The tag match keeps recovery from latching onto an unrelated host when the
-    // original element type is gone. Same-tag siblings under a shared composite
-    // ancestor can't be told apart and resolve to the first match, which still
-    // leaves the selection on a valid node instead of dropping it.
-    if (isElementNode(node) && node.isConnected && node.tagName === anchorTagName) {
-      return node;
+  return findNearestHostElementWithTag(latestParentFiber, anchorTagName);
+};
+
+// Walks the nearest host fibers below `parentFiber` (stopping at each host
+// boundary, like bippy's removed getNearestHostFibers) for a connected element
+// with the anchor's tag. The tag match keeps recovery from latching onto an
+// unrelated host when the original element type is gone. Same-tag siblings
+// under a shared composite ancestor can't be told apart and resolve to the
+// first match, which still leaves the selection on a valid node instead of
+// dropping it.
+const findNearestHostElementWithTag = (
+  parentFiber: Fiber,
+  anchorTagName: string,
+): Element | null => {
+  let fiber: Fiber | null = parentFiber.child;
+  while (fiber) {
+    if (isHostFiber(fiber)) {
+      const node = fiber.stateNode;
+      if (isElementNode(node) && node.isConnected && node.tagName === anchorTagName) {
+        return node;
+      }
+    } else if (fiber.child) {
+      fiber = fiber.child;
+      continue;
+    }
+    while (fiber !== parentFiber && !fiber.sibling) {
+      fiber = fiber.return;
+      if (!fiber) return null;
     }
+    if (fiber === parentFiber) return null;
+    fiber = fiber.sibling;
   }
   return null;
 };

packages/react-grab/src/utils/freeze-updates.ts

@@ -19,10 +19,6 @@ import { RecoverableError } from "../errors.js";
 import { reportRecoverableError } from "./report-recoverable-error.js";
 import { IS_DEMO } from "./runtime-mode.js";
 
-interface FiberRootLike extends FiberRoot {
-  current: Fiber | null;
-}
-
 interface PendingUpdate {
   next: PendingUpdate | null;
   action: unknown;
@@ -91,9 +87,8 @@ const pendingStateUpdates: Array<() => void> = [];
 const pausedQueueStates = new WeakMap<HookQueue, PausedQueueState>();
 const pausedContextStates = new WeakMap<ContextDependency, PausedContextState>();
 const renderersWithPatchedDispatcher = new WeakSet<ReactRenderer>();
-const typedFiberRoots = _fiberRoots as Set<FiberRootLike>;
-const pausedFiberRoots = new Set<FiberRootLike>();
-const fiberRootRenderers = new WeakMap<FiberRootLike, ReactRenderer>();
+const pausedFiberRoots = new Set<FiberRoot>();
+const fiberRootRenderers = new WeakMap<FiberRoot, ReactRenderer>();
 
 instrument({
   name: "react-grab-freeze-updates",
@@ -112,17 +107,17 @@ const isDomRenderer = (renderer: ReactRenderer): boolean => {
   }
 };
 
-const getFiberRoot = (fiber: Fiber): FiberRootLike | null => {
+const getFiberRoot = (fiber: Fiber): FiberRoot | null => {
   let current: Fiber | null = fiber;
   while (current.return) {
     current = current.return;
   }
-  return (current.stateNode ?? null) as FiberRootLike | null;
+  return (current.stateNode ?? null) as FiberRoot | null;
 };
 
-const findHostInstance = (fiberRoot: FiberRootLike): object | null => {
+const findHostInstance = (fiberRoot: FiberRoot): object | null => {
   const root = fiberRoot.current;
-  let fiber = root;
+  let fiber: Fiber | null = root;
   while (fiber) {
     const stateNode = fiber.stateNode;
     if (
@@ -146,7 +141,7 @@ const findHostInstance = (fiberRoot: FiberRootLike): object | null => {
   return null;
 };
 
-const resolveFiberRootRenderer = (fiberRoot: FiberRootLike): ReactRenderer | null => {
+const resolveFiberRootRenderer = (fiberRoot: FiberRoot): ReactRenderer | null => {
   const renderer = fiberRootRenderers.get(fiberRoot);
   if (renderer) return isDomRenderer(renderer) ? renderer : null;
 
@@ -172,7 +167,7 @@ const resolveFiberRootRenderer = (fiberRoot: FiberRootLike): ReactRenderer | nul
   return null;
 };
 
-const isDomFiberRoot = (fiberRoot: FiberRootLike): boolean => {
+const isDomFiberRoot = (fiberRoot: FiberRoot): boolean => {
   const stateNode = fiberRoot.current?.stateNode;
   if (!stateNode || typeof stateNode !== "object") return false;
   const containerInfo = Reflect.get(stateNode, "containerInfo");
@@ -185,16 +180,16 @@ const isDomFiberRoot = (fiberRoot: FiberRootLike): boolean => {
 
 // Collects React fiber roots, preferring bippy's tracked set but falling back
 // to a DOM walk when the app mounted before bippy instrumented the renderers.
-const collectFiberRoots = (): Set<FiberRootLike> => {
-  if (typedFiberRoots.size > 0) {
-    const domFiberRoots = new Set<FiberRootLike>();
-    for (const fiberRoot of typedFiberRoots) {
+const collectFiberRoots = (): Set<FiberRoot> => {
+  if (_fiberRoots.size > 0) {
+    const domFiberRoots = new Set<FiberRoot>();
+    for (const fiberRoot of _fiberRoots) {
       if (isDomFiberRoot(fiberRoot)) domFiberRoots.add(fiberRoot);
     }
     return domFiberRoots;
   }
 
-  const collectedRoots = new Set<FiberRootLike>();
+  const collectedRoots = new Set<FiberRoot>();
 
   const traverseDOM = (element: Element): void => {
     const fiber = getFiberFromHostInstance(element);
@@ -601,7 +596,7 @@ const installDispatcherPatching = (renderer: ReactRenderer): void => {
 };
 
 const scheduleReactUpdate = (
-  fiberRoots: Set<FiberRootLike>,
+  fiberRoots: Set<FiberRoot>,
   scheduledFreezeSessionId: number,
 ): void => {
   queueMicrotask(() => {