donobu 5.36.0 → 5.36.1

package/dist/esm/reporter/render.js

@@ -982,17 +982,17 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
             tEnd: ns.endWallTime,
             children: buildNativeTree(ns.children),
         }));
-        const roots = buildNativeTree(nativeSteps);
-        // Place a node into the deepest container whose [t, tEnd] window
-        // contains its [tStart, tEnd]. Returns true on placement. Both native
-        // steps and AI invocations are eligible parents.
-        const placeNode = (nodes, leaf, tStart, tEnd) => {
+        let roots = buildNativeTree(nativeSteps);
+        // Place a leaf into the deepest container whose [t, tEnd] window
+        // contains its [tStart, tEnd]. Used for Donobu screenshots, which can
+        // never gain new children, so no absorption is needed.
+        const placeLeaf = (nodes, leaf, tStart, tEnd) => {
             for (const n of nodes) {
                 if (n.kind !== 'native' && n.kind !== 'ai') {
                     continue;
                 }
                 if (tStart >= n.t && tEnd <= n.tEnd) {
-                    if (!placeNode(n.children, leaf, tStart, tEnd)) {
+                    if (!placeLeaf(n.children, leaf, tStart, tEnd)) {
                         n.children.push(leaf);
                     }
                     return true;
@@ -1000,6 +1000,34 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
             }
             return false;
         };
+        // Place a container into the tree at the deepest level whose window
+        // contains it. Once placed, absorb any pre-existing siblings whose
+        // windows fall fully inside the container's window — this matters when
+        // a cached `page.ai` runs raw `expect(...)` calls that Playwright's
+        // `_steps` recorded as bare native steps at the parent level. Without
+        // absorption they'd render as siblings of the wrapper instead of
+        // children. Returns the (possibly rebuilt) `level` array.
+        const placeContainer = (level, container) => {
+            for (const n of level) {
+                if ((n.kind === 'native' || n.kind === 'ai') &&
+                    container.t >= n.t &&
+                    container.tEnd <= n.tEnd) {
+                    n.children = placeContainer(n.children, container);
+                    return level;
+                }
+            }
+            const remaining = [];
+            for (const child of level) {
+                if (child.t >= container.t && child.tEnd <= container.tEnd) {
+                    container.children.push(child);
+                }
+                else {
+                    remaining.push(child);
+                }
+            }
+            remaining.push(container);
+            return remaining;
+        };
         // AI invocations placed first, longer-window first so an outer cached
         // `page.ai` is in place before its inner `page.ai.assert` lands.
         const sortedInvocations = [...aiInvocations].sort((a, b) => b.endedAt - b.startedAt - (a.endedAt - a.startedAt));
@@ -1011,9 +1039,7 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
                 tEnd: inv.endedAt,
                 children: [],
             };
-            if (!placeNode(roots, node, inv.startedAt, inv.endedAt)) {
-                roots.push(node);
-            }
+            roots = placeContainer(roots, node);
         }
         for (const ss of stepScreenshots) {
             const d = {
@@ -1022,7 +1048,7 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
                 t: ss.startedAt,
                 tEnd: ss.completedAt,
             };
-            if (!placeNode(roots, d, ss.startedAt, ss.completedAt)) {
+            if (!placeLeaf(roots, d, ss.startedAt, ss.completedAt)) {
                 roots.push(d);
             }
         }

package/dist/reporter/render.js

@@ -982,17 +982,17 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
             tEnd: ns.endWallTime,
             children: buildNativeTree(ns.children),
         }));
-        const roots = buildNativeTree(nativeSteps);
-        // Place a node into the deepest container whose [t, tEnd] window
-        // contains its [tStart, tEnd]. Returns true on placement. Both native
-        // steps and AI invocations are eligible parents.
-        const placeNode = (nodes, leaf, tStart, tEnd) => {
+        let roots = buildNativeTree(nativeSteps);
+        // Place a leaf into the deepest container whose [t, tEnd] window
+        // contains its [tStart, tEnd]. Used for Donobu screenshots, which can
+        // never gain new children, so no absorption is needed.
+        const placeLeaf = (nodes, leaf, tStart, tEnd) => {
             for (const n of nodes) {
                 if (n.kind !== 'native' && n.kind !== 'ai') {
                     continue;
                 }
                 if (tStart >= n.t && tEnd <= n.tEnd) {
-                    if (!placeNode(n.children, leaf, tStart, tEnd)) {
+                    if (!placeLeaf(n.children, leaf, tStart, tEnd)) {
                         n.children.push(leaf);
                     }
                     return true;
@@ -1000,6 +1000,34 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
             }
             return false;
         };
+        // Place a container into the tree at the deepest level whose window
+        // contains it. Once placed, absorb any pre-existing siblings whose
+        // windows fall fully inside the container's window — this matters when
+        // a cached `page.ai` runs raw `expect(...)` calls that Playwright's
+        // `_steps` recorded as bare native steps at the parent level. Without
+        // absorption they'd render as siblings of the wrapper instead of
+        // children. Returns the (possibly rebuilt) `level` array.
+        const placeContainer = (level, container) => {
+            for (const n of level) {
+                if ((n.kind === 'native' || n.kind === 'ai') &&
+                    container.t >= n.t &&
+                    container.tEnd <= n.tEnd) {
+                    n.children = placeContainer(n.children, container);
+                    return level;
+                }
+            }
+            const remaining = [];
+            for (const child of level) {
+                if (child.t >= container.t && child.tEnd <= container.tEnd) {
+                    container.children.push(child);
+                }
+                else {
+                    remaining.push(child);
+                }
+            }
+            remaining.push(container);
+            return remaining;
+        };
         // AI invocations placed first, longer-window first so an outer cached
         // `page.ai` is in place before its inner `page.ai.assert` lands.
         const sortedInvocations = [...aiInvocations].sort((a, b) => b.endedAt - b.startedAt - (a.endedAt - a.startedAt));
@@ -1011,9 +1039,7 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
                 tEnd: inv.endedAt,
                 children: [],
             };
-            if (!placeNode(roots, node, inv.startedAt, inv.endedAt)) {
-                roots.push(node);
-            }
+            roots = placeContainer(roots, node);
         }
         for (const ss of stepScreenshots) {
             const d = {
@@ -1022,7 +1048,7 @@ function renderSteps(steps, stepScreenshots, nativeSteps, aiInvocations, outputD
                 t: ss.startedAt,
                 tEnd: ss.completedAt,
             };
-            if (!placeNode(roots, d, ss.startedAt, ss.completedAt)) {
+            if (!placeLeaf(roots, d, ss.startedAt, ss.completedAt)) {
                 roots.push(d);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "donobu",
-  "version": "5.36.0",
+  "version": "5.36.1",
   "description": "Create browser automations with an LLM agent and replay them as Playwright scripts.",
   "main": "dist/main.js",
   "module": "dist/esm/main.js",