@agent-native/core 0.183.0 → 0.184.0-nightly-20260921210811

package/corpus/templates/content/app/components/editor/DocumentToolbar.tsx

@@ -52,10 +52,30 @@ import {
   useState,
   type Ref,
   type ReactNode,
+  type SVGProps,
 } from "react";
 import { useLocation, useNavigate } from "react-router";
 import { toast } from "sonner";
 
+function IconSuggestEdits(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      fill="none"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth="1.5"
+      viewBox="0 0 24 24"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path d="M21.9165 10.5001C21.9351 10.6557 21.9495 10.8127 21.9598 10.9708C22.0134 11.801 22.0134 12.6608 21.9598 13.491C21.6856 17.7333 18.3536 21.1126 14.1706 21.3906C12.7435 21.4855 11.2536 21.4853 9.8294 21.3906C9.33896 21.358 8.8044 21.241 8.34401 21.0514C7.83177 20.8404 7.5756 20.7349 7.44544 20.7509C7.31527 20.7669 7.1264 20.9062 6.74868 21.1847C6.08268 21.6758 5.24367 22.0286 3.99943 21.9983C3.37026 21.983 3.05568 21.9753 2.91484 21.7352C2.77401 21.4951 2.94941 21.1627 3.30021 20.4979C3.78674 19.5759 4.09501 18.5204 3.62791 17.6747C2.82343 16.4667 2.1401 15.0361 2.04024 13.491C1.98659 12.6608 1.98659 11.801 2.04024 10.9708C2.31441 6.7285 5.64639 3.34925 9.8294 3.07119C11.0318 2.99126 12.2812 2.97868 13.5 3.0338" />
+      <path d="M8.5 15.0001H15.5M8.5 10.0001H11" />
+      <path d="M20.8684 2.43946L21.5607 3.13183C22.1465 3.71761 22.1465 4.66736 21.5607 5.25315L17.9333 8.94881C17.648 9.23416 17.283 9.42652 16.8863 9.50061L14.6381 9.98865C14.2832 10.0657 13.9671 9.75054 14.0431 9.39537L14.5217 7.16005C14.5958 6.76336 14.7881 6.39836 15.0735 6.11301L18.747 2.43946C19.3328 1.85368 20.2826 1.85368 20.8684 2.43946Z" />
+    </svg>
+  );
+}
+
 // The share controller + dialog surface stays out of the editor's first-load
 // bundle; it loads the first time the Share flow opens.
 const ShareButton = lazy(() =>
@@ -1185,7 +1205,12 @@ export function DocumentToolbar({
                       }, 50);
                     }}
                   >
-                    <IconPencil className="me-2 h-4 w-4" />
+                    <IconSuggestEdits
+                      aria-hidden="true"
+                      className="me-2 shrink-0"
+                      height={16}
+                      width={16}
+                    />
                     {t(
                       suggesting
                         ? "editor.toolbar.stopSuggesting"

package/corpus/templates/design/.generated/bridge/editor-chrome.generated.ts

@@ -10880,15 +10880,19 @@ export const editorChromeBridgeScript: string = `"use strict";
           container
         );
       }
-      var placementCandidates = children.concat(excluded || []);
-      var hasExplicitPlacement = placementCandidates.some(function(child) {
-        var childStyles = window.getComputedStyle(child);
-        return childStyles.gridColumnStart !== "auto" || childStyles.gridColumnEnd !== "auto" || childStyles.gridRowStart !== "auto" || childStyles.gridRowEnd !== "auto" || childStyles.order !== "0";
-      });
       var singleSource = excluded && excluded.length === 1 ? excluded[0] : null;
       var singleSourceStyles = singleSource ? window.getComputedStyle(singleSource) : null;
       var singleSourceColumn = singleSource && trackLayout ? gridItemAxisPlacement(singleSource, trackLayout, "column") : null;
       var singleSourceRow = singleSource && trackLayout ? gridItemAxisPlacement(singleSource, trackLayout, "row") : null;
+      var sourceHasAuthoredPlacement = Boolean(
+        excluded?.some(function(source) {
+          var columnPlacement = trackLayout ? gridItemAxisPlacement(source, trackLayout, "column") : null;
+          var rowPlacement = trackLayout ? gridItemAxisPlacement(source, trackLayout, "row") : null;
+          return Boolean(
+            columnPlacement?.hasAuthoredPlacement || rowPlacement?.hasAuthoredPlacement
+          );
+        })
+      );
       var hasAuthoredSingleCellSourcePlacement = Boolean(
         singleSource && singleSource.parentElement === container && singleSourceStyles && singleSourceStyles.gridColumnStart !== "auto" && singleSourceStyles.gridColumnStart.indexOf("span") !== 0 && singleSourceStyles.gridRowStart !== "auto" && singleSourceStyles.gridRowStart.indexOf("span") !== 0 && (singleSourceStyles.gridColumnEnd === "auto" || singleSourceColumn?.span === 1) && (singleSourceStyles.gridRowEnd === "auto" || singleSourceRow?.span === 1)
       );
@@ -10896,7 +10900,7 @@ export const editorChromeBridgeScript: string = `"use strict";
       while (hit && hit.parentElement && hit.parentElement !== container) {
         hit = hit.parentElement;
       }
-      if (trackLayout && hasExplicitPlacement && !hasAuthoredSingleCellSourcePlacement) {
+      if (trackLayout && !hasAuthoredSingleCellSourcePlacement) {
         var column = trackLayout.columnBounds.findIndex(function(bound) {
           return clientX >= bound.start && clientX <= bound.end;
         });
@@ -10949,7 +10953,10 @@ export const editorChromeBridgeScript: string = `"use strict";
             },
             guideMode: displaced ? "grid-line" : "grid-cell",
             guidePlacement: pointer <= midpoint + 0.5 ? "before" : "after",
-            gridCell: { column, row },
+            // Column auto-flow derives placement from source order. Persisting
+            // measured coordinates here would freeze responsive auto-flow into
+            // explicit gridColumn/gridRow styles.
+            ...autoFlow[0] === "column" && !sourceHasAuthoredPlacement ? {} : { gridCell: { column, row } },
             gridDisplacement: displaced
           };
         }
@@ -11431,7 +11438,7 @@ export const editorChromeBridgeScript: string = `"use strict";
           );
           if (rootChildSlot) return rootChildSlot;
         }
-        if (parent && parent !== document.body && isAutoLayoutElement(parent) && cursor.getAttribute("data-an-primitive") !== "frame" && !isTextBearingLeaf(parent) && !forceNestedAutoLayout && !isTemplateCloneElement(cursor)) {
+        if (parent && parent !== document.body && isAutoLayoutElement(parent) && cursor.getAttribute("data-an-primitive") !== "frame" && (!isContainerDropTarget(cursor) || cursor.tagName.toLowerCase() !== "section" || isTemplateCloneElement(cursor)) && !isTextBearingLeaf(parent) && !forceNestedAutoLayout && !isTemplateCloneElement(cursor)) {
           var directChildSlot = nearestChildInsertionTarget(
             parent,
             clientX,
@@ -11459,7 +11466,7 @@ export const editorChromeBridgeScript: string = `"use strict";
             dropMode: "absolute-container"
           };
         }
-        if (cursor !== document.body && isContainerDropTarget(cursor) && !(!forceNestedAutoLayout && parent && parent !== document.body && isAutoLayoutElement(parent) && cursor.getAttribute("data-an-primitive") !== "frame")) {
+        if (cursor !== document.body && isContainerDropTarget(cursor) && !(!forceNestedAutoLayout && parent && parent !== document.body && isAutoLayoutElement(parent) && cursor.getAttribute("data-an-primitive") !== "frame" && (cursor.tagName.toLowerCase() !== "section" || isTemplateCloneElement(cursor)))) {
           if (!isAutoLayoutElement(cursor)) {
             if (cursor === el.parentElement) return null;
             return {
@@ -11829,6 +11836,7 @@ export const editorChromeBridgeScript: string = `"use strict";
       var start = gridLinePosition(startValue, layout, axis);
       var end = gridLinePosition(endValue, layout, axis);
       var authoredSpan = endValue.trim().match(/^span\\s+(\\d+)$/) || startValue.trim().match(/^span\\s+(\\d+)$/);
+      var hasAuthoredPlacement = authoredSpan !== null || startValue.trim() !== "auto" && startValue.trim() !== "" || endValue.trim() !== "auto" && endValue.trim() !== "" || styles.order !== "0";
       var geometricRange = layout ? gridTrackRangeForRect(
         el.getBoundingClientRect(),
         axis === "column" ? layout.columnBounds : layout.rowBounds,
@@ -11839,6 +11847,7 @@ export const editorChromeBridgeScript: string = `"use strict";
       if (start === null && end !== null && authoredSpan) start = end - span;
       return {
         authoredStart: start,
+        hasAuthoredPlacement,
         start: start ?? (geometricRange ? geometricRange.start + 1 : null),
         span
       };
@@ -12091,6 +12100,7 @@ export const editorChromeBridgeScript: string = `"use strict";
         }
         var sourceColumn = gridItemAxisPlacement(el, sourceGridLayout, "column");
         var sourceRow = gridItemAxisPlacement(el, sourceGridLayout, "row");
+        var sourceHasAuthoredPlacement = sourceColumn.hasAuthoredPlacement || sourceRow.hasAuthoredPlacement;
         var columnStart = sourceColumn.start ?? NaN;
         var columnSpan = sourceColumn.span;
         var columnEnd = columnStart + columnSpan;
@@ -12169,6 +12179,18 @@ export const editorChromeBridgeScript: string = `"use strict";
             });
           };
           targetDisplacements.forEach(function(displaced) {
+            var displacedColumnPlacement = gridItemAxisPlacement(
+              displaced,
+              targetGridLayout,
+              "column"
+            );
+            var displacedRowPlacement = gridItemAxisPlacement(
+              displaced,
+              targetGridLayout,
+              "row"
+            );
+            var displacedHasAuthoredPlacement = displacedColumnPlacement.hasAuthoredPlacement || displacedRowPlacement.hasAuthoredPlacement;
+            if (!displacedHasAuthoredPlacement) return;
             var displacedRange = gridTrackRangeForRect(
               displaced.getBoundingClientRect(),
               targetGridLayout.columnBounds,
@@ -12235,14 +12257,16 @@ export const editorChromeBridgeScript: string = `"use strict";
             displaced.style.gridRow = \`\${displacementPlacement.row} / \${displacementPlacement.rowEnd}\`;
           });
         }
-        el.style.gridColumn = \`\${target.gridCell.column + 1} / \${target.gridCell.column + 1 + columnSpan}\`;
-        el.style.gridRow = \`\${target.gridCell.row + 1} / \${target.gridCell.row + 1 + rowSpan}\`;
-        target.gridPlacement = {
-          column: target.gridCell.column + 1,
-          columnEnd: target.gridCell.column + 1 + columnSpan,
-          row: target.gridCell.row + 1,
-          rowEnd: target.gridCell.row + 1 + rowSpan
-        };
+        if (sourceHasAuthoredPlacement) {
+          el.style.gridColumn = \`\${target.gridCell.column + 1} / \${target.gridCell.column + 1 + columnSpan}\`;
+          el.style.gridRow = \`\${target.gridCell.row + 1} / \${target.gridCell.row + 1 + rowSpan}\`;
+          target.gridPlacement = {
+            column: target.gridCell.column + 1,
+            columnEnd: target.gridCell.column + 1 + columnSpan,
+            row: target.gridCell.row + 1,
+            rowEnd: target.gridCell.row + 1 + rowSpan
+          };
+        }
       }
       rebaseAbsoluteMemberForContainerDrop(el, target);
       var persistenceAnchor = target.persistenceAnchor || target.anchor;

package/corpus/templates/design/app/components/design/MultiScreenCanvas.tsx

@@ -3741,15 +3741,19 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
         // become negative or otherwise out of range. The parent window drag
         // listener has the real board point then; stale iframe coordinates
         // must not clear a valid board target.
-        if (
-          sourceScreenId !== boardFileId &&
-          !isPointerInsideSourceIframe({
-            iframeX,
-            iframeY,
-            viewportW,
-            viewportH,
-          })
-        ) {
+        const localPointerInside = isPointerInsideSourceIframe({
+          iframeX,
+          iframeY,
+          viewportW,
+          viewportH,
+          frameWidth:
+            renderedFrameGeometryRef.current[sourceScreenId]?.width ??
+            frameGeometryRef.current[sourceScreenId]?.width,
+          frameHeight:
+            renderedFrameGeometryRef.current[sourceScreenId]?.height ??
+            frameGeometryRef.current[sourceScreenId]?.height,
+        });
+        if (sourceScreenId !== boardFileId && !localPointerInside) {
           const previewPoint =
             boardPointFromParentPointer(
               iframeX,
@@ -3813,12 +3817,8 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
             crossScreenDragMsgRef.current?.styleSnapshotCaptureFailed === true,
         };
 
-        const pointerInsideSourceIframe = isPointerInsideSourceIframe({
-          iframeX,
-          iframeY,
-          viewportW,
-          viewportH,
-        });
+        const pointerInsideSourceIframe =
+          sourceScreenId === boardFileId || localPointerInside;
         const sourceIsBoard = sourceScreenId === boardFileId;
         // Regular screen iframes are finite artboards, so an in-bounds pointer
         // means the source bridge should keep handling the drag. The board
@@ -3911,6 +3911,12 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
             iframeY: msg.iframeY!,
             viewportW: msg.viewportW!,
             viewportH: msg.viewportH!,
+            frameWidth:
+              renderedFrameGeometryRef.current[sourceScreenId]?.width ??
+              frameGeometryRef.current[sourceScreenId]?.width,
+            frameHeight:
+              renderedFrameGeometryRef.current[sourceScreenId]?.height ??
+              frameGeometryRef.current[sourceScreenId]?.height,
           });
         const lastBoardPoint =
           (endPointOutsideSource
@@ -11245,6 +11251,7 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
           // identical Figma-style indicator between siblings.
           <span
             data-primitive-drop-target
+            data-agent-native-insertion-guide
             data-primitive-drop-placement={primitiveDropTarget.placement}
             className="pointer-events-none absolute z-40 rounded-sm"
             style={getCrossScreenDropGuideStyle({

package/corpus/templates/design/app/components/design/bridge/editor-chrome.bridge.ts

@@ -9765,7 +9765,7 @@ declare var __INITIAL_SOURCE_HEAD__: string;
   function frameLabelText(frame: Element): string {
     var name =
       layerNameForElement(frame) || frame.getAttribute("aria-label") || "";
-    return name.trim() || "Frame" /* i18n-ignore canvas frame label */;
+    return name.trim() || "Frame"; /* i18n-ignore canvas frame label */
   }
 
   function selectFrameFromLabel(frame: Element, e: MouseEvent): void {
@@ -14963,20 +14963,8 @@ declare var __INITIAL_SOURCE_HEAD__: string;
         container,
       );
     }
-    var placementCandidates = children.concat(excluded || []);
-    var hasExplicitPlacement = placementCandidates.some(function (child) {
-      var childStyles = window.getComputedStyle(child);
-      return (
-        childStyles.gridColumnStart !== "auto" ||
-        childStyles.gridColumnEnd !== "auto" ||
-        childStyles.gridRowStart !== "auto" ||
-        childStyles.gridRowEnd !== "auto" ||
-        childStyles.order !== "0"
-      );
-    });
-    // Preserve a single-cell authored slot only for a single source already
-    // owned by this grid. Cross-grid and grouped drops must resolve the
-    // destination cell normally.
+    // Preserve authored placement for any dragged source. Cross-grid and
+    // grouped drops still need the destination cell for every authored item.
     var singleSource = excluded && excluded.length === 1 ? excluded[0] : null;
     var singleSourceStyles = singleSource
       ? window.getComputedStyle(singleSource)
@@ -14989,6 +14977,20 @@ declare var __INITIAL_SOURCE_HEAD__: string;
       singleSource && trackLayout
         ? gridItemAxisPlacement(singleSource, trackLayout, "row")
         : null;
+    var sourceHasAuthoredPlacement = Boolean(
+      excluded?.some(function (source) {
+        var columnPlacement = trackLayout
+          ? gridItemAxisPlacement(source, trackLayout, "column")
+          : null;
+        var rowPlacement = trackLayout
+          ? gridItemAxisPlacement(source, trackLayout, "row")
+          : null;
+        return Boolean(
+          columnPlacement?.hasAuthoredPlacement ||
+          rowPlacement?.hasAuthoredPlacement,
+        );
+      }),
+    );
     var hasAuthoredSingleCellSourcePlacement = Boolean(
       singleSource &&
       singleSource.parentElement === container &&
@@ -15008,11 +15010,7 @@ declare var __INITIAL_SOURCE_HEAD__: string;
     // Resolve the pointer against rendered tracks and carry the cell through
     // the drop so the source and its persisted markup move together. The
     // occupied cell is also retained as the source-order insertion anchor.
-    if (
-      trackLayout &&
-      hasExplicitPlacement &&
-      !hasAuthoredSingleCellSourcePlacement
-    ) {
+    if (trackLayout && !hasAuthoredSingleCellSourcePlacement) {
       var column = trackLayout.columnBounds.findIndex(function (bound) {
         return clientX >= bound.start && clientX <= bound.end;
       });
@@ -15088,7 +15086,12 @@ declare var __INITIAL_SOURCE_HEAD__: string;
           },
           guideMode: displaced ? "grid-line" : "grid-cell",
           guidePlacement: pointer <= midpoint + 0.5 ? "before" : "after",
-          gridCell: { column, row },
+          // Column auto-flow derives placement from source order. Persisting
+          // measured coordinates here would freeze responsive auto-flow into
+          // explicit gridColumn/gridRow styles.
+          ...(autoFlow[0] === "column" && !sourceHasAuthoredPlacement
+            ? {}
+            : { gridCell: { column, row } }),
           gridDisplacement: displaced,
         };
       }
@@ -15956,6 +15959,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
         parent !== document.body &&
         isAutoLayoutElement(parent) &&
         cursor.getAttribute("data-an-primitive") !== "frame" &&
+        (!isContainerDropTarget(cursor) ||
+          cursor.tagName.toLowerCase() !== "section" ||
+          isTemplateCloneElement(cursor)) &&
         !isTextBearingLeaf(parent) &&
         !forceNestedAutoLayout &&
         !isTemplateCloneElement(cursor)
@@ -16036,7 +16042,9 @@ declare var __INITIAL_SOURCE_HEAD__: string;
           parent &&
           parent !== document.body &&
           isAutoLayoutElement(parent) &&
-          cursor.getAttribute("data-an-primitive") !== "frame"
+          cursor.getAttribute("data-an-primitive") !== "frame" &&
+          (cursor.tagName.toLowerCase() !== "section" ||
+            isTemplateCloneElement(cursor))
         )
       ) {
         // Free (absolute) element into a non-auto-layout container stays free:
@@ -16564,6 +16572,11 @@ declare var __INITIAL_SOURCE_HEAD__: string;
     var authoredSpan =
       endValue.trim().match(/^span\s+(\d+)$/) ||
       startValue.trim().match(/^span\s+(\d+)$/);
+    var hasAuthoredPlacement =
+      authoredSpan !== null ||
+      (startValue.trim() !== "auto" && startValue.trim() !== "") ||
+      (endValue.trim() !== "auto" && endValue.trim() !== "") ||
+      styles.order !== "0";
     var geometricRange = layout
       ? gridTrackRangeForRect(
           el.getBoundingClientRect(),
@@ -16582,6 +16595,7 @@ declare var __INITIAL_SOURCE_HEAD__: string;
     if (start === null && end !== null && authoredSpan) start = end - span;
     return {
       authoredStart: start,
+      hasAuthoredPlacement: hasAuthoredPlacement,
       start: start ?? (geometricRange ? geometricRange.start + 1 : null),
       span,
     };
@@ -17042,6 +17056,8 @@ declare var __INITIAL_SOURCE_HEAD__: string;
       }
       var sourceColumn = gridItemAxisPlacement(el, sourceGridLayout, "column");
       var sourceRow = gridItemAxisPlacement(el, sourceGridLayout, "row");
+      var sourceHasAuthoredPlacement =
+        sourceColumn.hasAuthoredPlacement || sourceRow.hasAuthoredPlacement;
       var columnStart = sourceColumn.start ?? NaN;
       var columnSpan = sourceColumn.span;
       var columnEnd = columnStart + columnSpan;
@@ -17178,6 +17194,20 @@ declare var __INITIAL_SOURCE_HEAD__: string;
           });
         };
         targetDisplacements.forEach(function (displaced) {
+          var displacedColumnPlacement = gridItemAxisPlacement(
+            displaced,
+            targetGridLayout,
+            "column",
+          );
+          var displacedRowPlacement = gridItemAxisPlacement(
+            displaced,
+            targetGridLayout,
+            "row",
+          );
+          var displacedHasAuthoredPlacement =
+            displacedColumnPlacement.hasAuthoredPlacement ||
+            displacedRowPlacement.hasAuthoredPlacement;
+          if (!displacedHasAuthoredPlacement) return;
           var displacedRange = gridTrackRangeForRect(
             displaced.getBoundingClientRect(),
             targetGridLayout!.columnBounds,
@@ -17270,14 +17300,16 @@ declare var __INITIAL_SOURCE_HEAD__: string;
           displaced.style.gridRow = `${displacementPlacement.row} / ${displacementPlacement.rowEnd}`;
         });
       }
-      el.style.gridColumn = `${target.gridCell.column + 1} / ${target.gridCell.column + 1 + columnSpan}`;
-      el.style.gridRow = `${target.gridCell.row + 1} / ${target.gridCell.row + 1 + rowSpan}`;
-      target.gridPlacement = {
-        column: target.gridCell.column + 1,
-        columnEnd: target.gridCell.column + 1 + columnSpan,
-        row: target.gridCell.row + 1,
-        rowEnd: target.gridCell.row + 1 + rowSpan,
-      };
+      if (sourceHasAuthoredPlacement) {
+        el.style.gridColumn = `${target.gridCell.column + 1} / ${target.gridCell.column + 1 + columnSpan}`;
+        el.style.gridRow = `${target.gridCell.row + 1} / ${target.gridCell.row + 1 + rowSpan}`;
+        target.gridPlacement = {
+          column: target.gridCell.column + 1,
+          columnEnd: target.gridCell.column + 1 + columnSpan,
+          row: target.gridCell.row + 1,
+          rowEnd: target.gridCell.row + 1 + rowSpan,
+        };
+      }
     }
     // Must run BEFORE the DOM move below: the delta math reads the member's
     // CURRENT containing block via offsetParent. Called here (the single

package/corpus/templates/design/app/components/design/multi-screen/primitive-drop-target.ts

@@ -347,7 +347,16 @@ export function isPrimitiveContainer(args: {
   display: string;
   borderRadius: string;
 }): boolean {
-  const isDiv = args.tagName.toLowerCase() === "div";
+  const isDiv = [
+    "div",
+    "section",
+    "main",
+    "header",
+    "footer",
+    "article",
+    "nav",
+    "aside",
+  ].includes(args.tagName.toLowerCase());
   const primitiveKind = args.primitiveKind.toLowerCase();
   const isEllipse =
     args.borderRadius === "50%" || args.borderRadius === "50% 50% 50% 50%";

package/corpus/templates/design/app/pages/design-editor/commands/commit-visual-styles.ts

@@ -77,6 +77,7 @@ export interface CommitVisualStylesArgs {
   activeProjectionContent: string;
   canEditDesign: boolean;
   canApplyContentEdit: (fileId: string) => boolean;
+  onNoRenderedBox?: () => void;
   applyLinkedComponentEdit?: (
     fileId: string,
     nodeId: string,
@@ -199,6 +200,7 @@ export function runCommitVisualStyles(
     lastLocalContentRef,
     latestActiveContentRef,
     liveScreenSnapshotsById,
+    onNoRenderedBox,
     queueFileContentSave,
     recordContentHistoryEntry,
     recordLocalContentHistoryChangeFallback,
@@ -302,18 +304,7 @@ export function runCommitVisualStyles(
         });
       }
     }
-    recordPendingVisualStyleEdit(
-      activeFile.id,
-      selector,
-      styles,
-      liveTargetInfo,
-      {
-        originalStyles: options.originalStyles,
-        pendingUndoGestureId: options.pendingUndoGestureId,
-        preserveSelection: options.preserveSelection,
-        routePath: options.routePath,
-      },
-    );
+    onNoRenderedBox?.();
     return;
   }
   upsertMotionKeyframesFromStyles(styles, options.elementInfo, selector);

package/corpus/templates/design/app/pages/design-editor/commands/nudge-selection.ts

@@ -77,11 +77,42 @@ export interface NudgeSelectionArgs {
   selectedElement: ElementInfo | null;
   selectedLayerIdsState: string[];
   selectedLayerTargetsRef: RefObject<SelectedLayerTarget[]>;
+  renderedElementInfoByLayerKeyRef: RefObject<Map<string, ElementInfo>>;
   setSelectedElement: Dispatch<SetStateAction<ElementInfo | null>>;
   setSelectedLayerIdsState: Dispatch<SetStateAction<string[]>>;
   viewModeRef: RefObject<"single" | "overview">;
 }
 
+export function resolveNudgeTarget(
+  selectedElement: ElementInfo | null,
+  selectedLayerTargets: readonly SelectedLayerTarget[],
+  renderedElementInfoByLayerKey: ReadonlyMap<string, ElementInfo>,
+): ElementInfo | null {
+  const selectedLayerTarget =
+    selectedLayerTargets.find(
+      (target) =>
+        selectedElement?.sourceLayerIdentity?.screenId === target.fileId &&
+        selectedElement.sourceLayerIdentity.nodeId === target.layerId,
+    ) ??
+    selectedLayerTargets.find(
+      (target) =>
+        selectedElement?.sourceId === target.layerId ||
+        selectedElement?.sourceId === target.node.id,
+    ) ??
+    selectedLayerTargets[0];
+  return (
+    (selectedLayerTarget
+      ? renderedElementInfoByLayerKey.get(
+          `${selectedLayerTarget.fileId}:${selectedLayerTarget.layerId}`,
+        )
+      : undefined) ??
+    (selectedElement?.selector
+      ? selectedElement
+      : selectedLayerTarget?.elementInfo) ??
+    null
+  );
+}
+
 export function runNudgeSelection(
   {
     applyLinkedComponentEdit,
@@ -104,6 +135,7 @@ export function runNudgeSelection(
     selectedElement,
     selectedLayerIdsState,
     selectedLayerTargetsRef,
+    renderedElementInfoByLayerKeyRef,
     setSelectedElement,
     setSelectedLayerIdsState,
     viewModeRef,
@@ -171,9 +203,11 @@ export function runNudgeSelection(
   // Selecting in the layers tree fills selectedLayerTargets before the
   // bridge round-trip fills selectedElement, so keying off the latter
   // alone silently drops the first nudge after every tree selection.
-  const nudgeTarget = selectedElement?.selector
-    ? selectedElement
-    : selectedLayerTargetsRef.current[0]?.elementInfo;
+  const nudgeTarget = resolveNudgeTarget(
+    selectedElement,
+    selectedLayerTargetsRef.current,
+    renderedElementInfoByLayerKeyRef.current,
+  );
   if (!nudgeTarget?.selector) return;
 
   if (isRunningAppSource && canEditLiveScreen) {

package/corpus/templates/design/app/pages/design-editor/commands/redo.ts

@@ -224,7 +224,7 @@ export interface RedoArgs {
   pendingVisualStyleUndoStackRef: RefObject<PendingVisualStyleUndoEntry[]>;
   replayPendingVisualStyleRuntime?: (
     edits: readonly PendingVisualStyleEdit[],
-  ) => void;
+  ) => number | undefined;
   setPendingVisualStyleBaselineResetRequest?: Dispatch<
     SetStateAction<number | null>
   >;
@@ -781,9 +781,12 @@ export function runRedo({
       ({ edit }) => Object.keys(edit.styles).length > 0,
     );
     if (replayPendingVisualStyleRuntime) {
-      replayPendingVisualStyleRuntime(
+      const requestId = replayPendingVisualStyleRuntime(
         redoneStyleTargets.map(({ edit }) => edit),
       );
+      if (requestId !== undefined) {
+        setPendingVisualStyleBaselineResetRequest?.(requestId);
+      }
     } else if (redoneStyleTargets.length > 0) {
       const requestId = Date.now() + Math.random();
       setPendingVisualStyleRevertRequest({

package/dist/chat-threads/store.d.ts

@@ -86,6 +86,7 @@ export declare function createThread(ownerEmail: string, opts?: {
 export declare function registerChatThreadsShareable(): void;
 export declare function ensureChatThreadTables(): Promise<void>;
 export declare function resolveThreadAccess(userEmail: string | null | undefined, threadId: string | null | undefined, minRole?: ShareRole | "owner", ctx?: Omit<AccessContext, "userEmail">): Promise<ChatThread | null>;
+export declare function resolveThreadsAccess(userEmail: string | null | undefined, threadIds: readonly string[], ctx?: Pick<AccessContext, "orgId">): Promise<Map<string, ChatThread>>;
 export declare function getThread(id: string): Promise<ChatThread | null>;
 /**
  * Fill missing provenance on a thread without rewriting an established origin.

package/dist/chat-threads/store.js

@@ -406,6 +406,25 @@ export async function resolveThreadAccess(userEmail, threadId, minRole = "viewer
         return null;
     return await getThread(threadId);
 }
+export async function resolveThreadsAccess(userEmail, threadIds, ctx = {}) {
+    const ids = [...new Set(threadIds.filter(Boolean))];
+    const threads = new Map();
+    if (!userEmail || ids.length === 0)
+        return threads;
+    await ensureTable();
+    const access = chatThreadAccessSql(userEmail, ctx.orgId);
+    const client = getDbExec();
+    const placeholders = ids.map(() => "?").join(", ");
+    const { rows } = await client.execute({
+        sql: `SELECT ${THREAD_COLUMNS} FROM chat_threads WHERE id IN (${placeholders}) AND ${access.sql}`,
+        args: [...ids, ...access.args],
+    });
+    for (const row of rows) {
+        const thread = rowToThread(row);
+        threads.set(thread.id, thread);
+    }
+    return threads;
+}
 export async function getThread(id) {
     await ensureTable();
     const client = getDbExec();