@agent-native/core 0.192.0-nightly-20260926081002 → 0.192.0

package/corpus/templates/design/actions/get-design.schema.ts

@@ -16,4 +16,14 @@ export const getDesignSchema = z.object({
         : value === true || value === "true" || value === "1",
     )
     .describe("Set false to return file metadata without HTML contents"),
+  reviewPreview: queryBoolean
+    .optional()
+    .transform((value) =>
+      value === undefined
+        ? undefined
+        : value === true || value === "true" || value === "1",
+    )
+    .describe(
+      "Human Review only: read a design in the current organization. Requires an organization owner or admin.",
+    ),
 });

package/corpus/templates/design/actions/get-design.ts

@@ -1,4 +1,6 @@
-import { defineAction } from "@agent-native/core/action";
+import { defineAction, fail } from "@agent-native/core/action";
+import { currentRequestUserIsOrgAdmin } from "@agent-native/core/server";
+import { getRequestOrgId } from "@agent-native/core/server/request-context";
 import { loadAgentDesignSystemContext } from "@agent-native/core/shared";
 import { resolveAccess } from "@agent-native/core/sharing";
 import { track } from "@agent-native/core/tracking";
@@ -45,8 +47,27 @@ export default defineAction({
   requiresAuth: false,
   publicAgent: { expose: true, readOnly: true, requiresAuth: false },
   http: { method: "GET" },
-  run: async ({ id, fileId, includeFileContent }, ctx) => {
-    const access = await resolveAccess("design", id);
+  run: async ({ id, fileId, includeFileContent, reviewPreview }, ctx) => {
+    const db = getDb();
+    let access;
+    if (reviewPreview) {
+      const orgId = getRequestOrgId();
+      if (!orgId || !(await currentRequestUserIsOrgAdmin(orgId))) {
+        fail(
+          "Only organization owners and admins can preview reviewed designs.",
+          { statusCode: 403 },
+        );
+      }
+      const [resource] = await db
+        .select()
+        .from(schema.designs)
+        .where(and(eq(schema.designs.id, id), eq(schema.designs.orgId, orgId)))
+        .limit(1);
+      if (!resource) fail("Design not found.", { statusCode: 404 });
+      access = { role: "viewer" as const, resource };
+    } else {
+      access = await resolveAccess("design", id);
+    }
     if (!access) {
       const error = new Error("Design not found") as Error & {
         statusCode: number;
@@ -56,8 +77,6 @@ export default defineAction({
     }
 
     const row = access.resource;
-    const db = getDb();
-
     // Fetch associated files in a stable order. This array feeds the overview
     // canvas's screen stack and each screen's index within its layout group, so
     // unordered rows (Postgres returns heap order, which an UPDATE can change)
@@ -100,7 +119,7 @@ export default defineAction({
       getDesignSystem,
     );
 
-    if (shouldTrackDesignView(ctx?.userEmail, id)) {
+    if (!reviewPreview && shouldTrackDesignView(ctx?.userEmail, id)) {
       track(
         "design_viewed",
         {

package/corpus/templates/design/actions/publish-visual-edit-pending.ts

@@ -1,6 +1,5 @@
 import { defineAction, fail } from "@agent-native/core/action";
-import { getRequestContext } from "@agent-native/core/server/request-context";
-import { assertAccess, resolveAccess } from "@agent-native/core/sharing";
+import { assertAccess } from "@agent-native/core/sharing";
 import { eq, sql } from "drizzle-orm";
 import { z } from "zod";
 
@@ -19,41 +18,6 @@ const pendingSchema = z
   })
   .nullable();
 
-function isVisualEditBrowserRequest(
-  ctx: Parameters<typeof isSameOriginVisualEditBrowserRequest>[0],
-  designId: string,
-  requireShareLink = false,
-): boolean {
-  if (
-    ctx?.caller !== "frontend" ||
-    !isSameOriginVisualEditBrowserRequest(ctx)
-  ) {
-    return false;
-  }
-
-  const referer = ctx.requestHeaders?.get("referer");
-  const requestOrigin = getRequestContext()?.requestOrigin;
-  if (!referer || !requestOrigin || !URL.canParse(referer)) return false;
-
-  const refererUrl = new URL(referer);
-  if (!URL.canParse(requestOrigin)) return false;
-  if (refererUrl.origin !== new URL(requestOrigin).origin) return false;
-  if (requireShareLink && refererUrl.searchParams.get("share") !== "1") {
-    return false;
-  }
-
-  const segments = refererUrl.pathname.split("/").filter(Boolean);
-  const referredDesignId = segments.pop();
-  if (segments.pop() !== "visual-edit" || !referredDesignId) return false;
-
-  try {
-    return decodeURIComponent(referredDesignId) === designId;
-  } catch (error) {
-    if (error instanceof URIError) return false;
-    throw error;
-  }
-}
-
 export default defineAction({
   description:
     "Publish the current DOM-only visual-edit handoff for the Design page so an external coding agent can retrieve it. Browser-only transport; this does not write design files or app source.",
@@ -88,28 +52,9 @@ export default defineAction({
       });
     }
 
-    let access: Awaited<ReturnType<typeof assertAccess>>;
-    if (isVisualEditBrowserRequest(ctx, designId)) {
-      const browserAccess = await resolveAccess("design", designId);
-      const browserCanEditDesign =
-        browserAccess &&
-        ["owner", "admin", "editor"].includes(browserAccess.role);
-      const browserCanShareVisualEdit = isVisualEditBrowserRequest(
-        ctx,
-        designId,
-        true,
-      );
-      if (
-        browserAccess &&
-        (browserCanEditDesign || browserCanShareVisualEdit)
-      ) {
-        access = browserAccess;
-      } else {
-        access = await assertAccess("design", designId, "editor");
-      }
-    } else {
-      access = await assertAccess("design", designId, "editor");
-    }
+    // Same-origin metadata is CSRF defense only; the scoped page capability
+    // is what grants a signed-out visual-edit session editor access.
+    const access = await assertAccess("design", designId, "editor");
     const design = access.resource as typeof schema.designs.$inferSelect;
     const now = new Date().toISOString();
     const canEditDesign = ["owner", "admin", "editor"].includes(access.role);

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

@@ -782,6 +782,7 @@ interface DesignCanvasProps {
     transactionId?: string;
     routePath?: string;
     reason: string;
+    sourcePresent?: boolean;
   }) => void;
   onRuntimeStructureRollbackResult?: (details: {
     requestId: string;
@@ -1922,9 +1923,10 @@ export function DesignCanvas({
     awaitingTransaction: boolean;
   } | null>(null);
   const lastRuntimeStructureDeleteRequestIdRef = useRef<string | null>(null);
-  const lastRuntimeStructureDeleteCancelRequestIdRef = useRef<string | null>(
-    null,
-  );
+  const lastRuntimeStructureDeleteCancelRequestRef = useRef<{
+    requestId: string;
+    retryCount: number;
+  } | null>(null);
   const lastRuntimeStructureTargetReloadTransactionIdRef = useRef<
     string | null
   >(null);
@@ -4852,6 +4854,25 @@ export function DesignCanvas({
         });
         return;
       }
+      if (e.data.type === "runtime-structure-delete-cancelled") {
+        const requestId = String(e.data.requestId || "");
+        if (!requestId) return;
+        onRuntimeStructureDeleteRejected?.({
+          screenId,
+          requestId,
+          transactionId:
+            typeof e.data.transactionId === "string"
+              ? e.data.transactionId
+              : undefined,
+          routePath:
+            typeof e.data.routePath === "string"
+              ? e.data.routePath
+              : (liveRoutePathRef.current ?? undefined),
+          reason: "cancelled",
+          sourcePresent: e.data.sourcePresent === true,
+        });
+        return;
+      }
       if (e.data.type === "runtime-structure-rollback-result") {
         const requestId = String(e.data.requestId || "");
         if (!requestId) return;
@@ -6876,7 +6897,9 @@ export function DesignCanvas({
       currentPreview.transactionId = request?.transactionId;
       currentPreview.awaitingTransaction = false;
     }
-    if (!request?.waitForInsertTransaction) return;
+    // Keep the source visible until the destination has acknowledged its
+    // insert. A refused or disconnected target must leave the move untouched.
+    if (!request || request.waitForInsertTransaction) return;
     if (readyIframeDocumentIdentity !== iframeDocumentIdentity) {
       if (currentPreview?.requestId === request.requestId) {
         currentPreview.documentIdentity = null;
@@ -6915,19 +6938,26 @@ export function DesignCanvas({
   useEffect(() => {
     const request = runtimeStructureDeleteRequest;
     if (!request?.cancelRequested) {
-      lastRuntimeStructureDeleteCancelRequestIdRef.current = null;
+      lastRuntimeStructureDeleteCancelRequestRef.current = null;
       return;
     }
     if (readyIframeDocumentIdentity !== iframeDocumentIdentity) {
-      lastRuntimeStructureDeleteCancelRequestIdRef.current = null;
+      lastRuntimeStructureDeleteCancelRequestRef.current = null;
       return;
     }
+    const retryCount = request.cancellationRetryCount ?? 0;
     if (
-      lastRuntimeStructureDeleteCancelRequestIdRef.current === request.requestId
+      lastRuntimeStructureDeleteCancelRequestRef.current?.requestId ===
+        request.requestId &&
+      lastRuntimeStructureDeleteCancelRequestRef.current.retryCount ===
+        retryCount
     ) {
       return;
     }
-    lastRuntimeStructureDeleteCancelRequestIdRef.current = request.requestId;
+    lastRuntimeStructureDeleteCancelRequestRef.current = {
+      requestId: request.requestId,
+      retryCount,
+    };
     postOneShotBridgeMessage({
       type: "cancel-pending-delete-element",
       selector: request.selector,
@@ -6939,12 +6969,11 @@ export function DesignCanvas({
       type: "visual-structure-ack",
       requestId: request.requestId,
       applied: false,
-    });
-    onRuntimeStructureDeleteRejected?.({
-      screenId,
-      requestId: request.requestId,
-      transactionId: request.transactionId,
-      reason: "cancelled",
+      cancelRuntimeStructureDelete: {
+        transactionId: request.transactionId,
+        selector: request.selector,
+        selectorCandidates: request.selectorCandidates ?? [],
+      },
     });
   }, [
     iframeDocumentIdentity,
@@ -7663,38 +7692,67 @@ export function DesignCanvas({
       : deviceFrame === "none"
         ? "100%"
         : (iframeHeight ?? undefined);
-  const focusScrollSurface = useCallback(() => {
-    const surface = scrollContainerRef.current;
-    if (!surface || document.activeElement === surface) return;
-    // A picker drag ending over the canvas must not take focus from the open
-    // picker: losing it ends the inspector gesture and drops a styled text range.
-    if (
-      textEditingStateRef.current.active ||
-      document.activeElement?.closest("[data-radix-popper-content-wrapper]")
-    ) {
-      return;
-    }
-    const focusedElement = document.activeElement;
-    if (focusedElement instanceof HTMLIFrameElement) {
-      try {
-        const frameDocument = focusedElement.contentDocument;
-        if (
-          !frameDocument ||
-          frameDocument.activeElement?.closest(EDITABLE_FOCUS_SELECTOR)
-        ) {
+  const focusScrollSurface = useCallback(
+    (fromIframeLoad = false) => {
+      const surface = scrollContainerRef.current;
+      if (
+        !surface ||
+        document.activeElement === surface ||
+        !editMode ||
+        interactMode
+      )
+        return;
+      // A picker drag ending over the canvas must not take focus from the open
+      // picker: losing it ends the inspector gesture and drops a styled text range.
+      if (
+        textEditingStateRef.current.active ||
+        document.activeElement?.closest("[data-radix-popper-content-wrapper]")
+      ) {
+        return;
+      }
+      const focusedElement = document.activeElement;
+      if (
+        fromIframeLoad &&
+        focusedElement !== document.body &&
+        focusedElement !== iframeRef.current
+      ) {
+        return;
+      }
+      if (focusedElement instanceof HTMLIFrameElement) {
+        try {
+          const frameDocument = focusedElement.contentDocument;
+          if (!frameDocument) {
+            if (!fromIframeLoad) return;
+          } else if (
+            frameDocument.activeElement?.closest(EDITABLE_FOCUS_SELECTOR)
+          ) {
+            return;
+          }
+        } catch (error) {
+          if (
+            !(error instanceof DOMException) ||
+            error.name !== "SecurityError"
+          ) {
+            throw error;
+          }
+          // A cross-origin frame may have an app-owned focused input; preserve
+          // its focus when the parent cannot inspect it.
           return;
         }
-      } catch {
-        // Keep focus inside a frame we cannot inspect; it may own an editor.
-        return;
       }
-    }
-    // Taking focus for keyboard panning must never outrank a field the user
-    // was just handed: a composer that opens under the cursor would otherwise
-    // be focused on mount and silently unfocused by the same pointer motion.
-    if (focusedElement?.closest(EDITABLE_FOCUS_SELECTOR)) return;
-    surface.focus({ preventScroll: true });
-  }, []);
+      // Taking focus for keyboard panning must never outrank a field the user
+      // was just handed: a composer that opens under the cursor would otherwise
+      // be focused on mount and silently unfocused by the same pointer motion.
+      if (focusedElement?.closest(EDITABLE_FOCUS_SELECTOR)) return;
+      surface.focus({ preventScroll: true });
+    },
+    [editMode, interactMode],
+  );
+  const handleCanvasPointerEnter = useCallback(
+    () => focusScrollSurface(),
+    [focusScrollSurface],
+  );
+  useLayoutEffect(() => focusScrollSurface(), [focusScrollSurface]);
 
   // Single-screen pan (Figma parity §3): middle-mouse-button drag always
   // pans (mirrors MultiScreenCanvas's unconditional `e.button === 1` branch
@@ -7963,6 +8021,7 @@ export function DesignCanvas({
           onLoad={(event) => {
             if (!liveEditFrameRequiresBridge) markPreviewFrameReady();
             sendBridgeToContainer();
+            focusScrollSurface(true);
             event.currentTarget.contentWindow?.postMessage(
               { type: "agent-native:editor-chrome-ready-probe" },
               "*",
@@ -8414,8 +8473,8 @@ export function DesignCanvas({
         <div
           ref={scrollContainerRef}
           tabIndex={-1}
-          onPointerEnter={focusScrollSurface}
-          onMouseEnter={focusScrollSurface}
+          onPointerEnter={handleCanvasPointerEnter}
+          onMouseEnter={handleCanvasPointerEnter}
           className="relative h-full w-full overflow-clip"
         >
           {iframeElement}
@@ -8432,8 +8491,8 @@ export function DesignCanvas({
       <div
         ref={scrollContainerRef}
         tabIndex={-1}
-        onPointerEnter={focusScrollSurface}
-        onMouseEnter={focusScrollSurface}
+        onPointerEnter={handleCanvasPointerEnter}
+        onMouseEnter={handleCanvasPointerEnter}
         className="relative h-full w-full overflow-clip"
         style={{
           width: embeddedFrame.displayWidth,
@@ -8466,8 +8525,8 @@ export function DesignCanvas({
     <div
       ref={scrollContainerRef}
       tabIndex={-1}
-      onPointerEnter={focusScrollSurface}
-      onMouseEnter={focusScrollSurface}
+      onPointerEnter={handleCanvasPointerEnter}
+      onMouseEnter={handleCanvasPointerEnter}
       onMouseDown={handleScrollSurfaceMouseDown}
       onClick={handleScrollSurfaceBackgroundClick}
       className="relative flex-1 h-full overflow-auto"

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

@@ -97,6 +97,7 @@ import {
   useLayoutEffect,
   useMemo,
   type CSSProperties,
+  type FocusEvent as ReactFocusEvent,
   type MutableRefObject,
   type PointerEvent as ReactPointerEvent,
   type ReactNode,
@@ -145,10 +146,7 @@ import {
   parseGradientCss,
   type GradientStopValue,
 } from "./inspector/GradientEditor";
-import {
-  sendLinkedScreenPreviewCancelPendingDelete,
-  sendLinkedScreenPreviewPendingDelete,
-} from "./multi-screen/linked-screen-preview";
+import { sendLinkedScreenPreviewCancelPendingDelete } from "./multi-screen/linked-screen-preview";
 import type {
   AltHoverMeasurement,
   AltHoverMeasurementLine,
@@ -739,6 +737,8 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
   const { resolvedTheme } = useTheme();
   const t = useT();
   const surfaceRef = useRef<HTMLDivElement>(null);
+  const initialCanvasFocusPendingRef = useRef(true);
+  const initialCanvasFocusAttemptedRef = useRef(false);
   const [pan, setPan] = useState({ x: 0, y: 0 });
   const panRef = useRef(pan);
   const [canvasZoom, setCanvasZoom] = useState(zoom);
@@ -1783,6 +1783,62 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
     surface.focus({ preventScroll: true });
   }, []);
 
+  useEffect(() => {
+    const markCanvasUsed = () => {
+      initialCanvasFocusPendingRef.current = false;
+    };
+    document.addEventListener("pointerdown", markCanvasUsed, true);
+    document.addEventListener("keydown", markCanvasUsed, true);
+    return () => {
+      document.removeEventListener("pointerdown", markCanvasUsed, true);
+      document.removeEventListener("keydown", markCanvasUsed, true);
+    };
+  }, []);
+
+  useLayoutEffect(() => {
+    if (
+      initialCanvasFocusAttemptedRef.current ||
+      !editableScreenIds?.size ||
+      interactMode ||
+      interactScreenId
+    ) {
+      return;
+    }
+    initialCanvasFocusAttemptedRef.current = true;
+    if (!initialCanvasFocusPendingRef.current) return;
+    const surface = surfaceRef.current;
+    const active = document.activeElement;
+    if (
+      !surface ||
+      (active !== document.body && isEditableHotkeyTarget(active))
+    ) {
+      return;
+    }
+    surface.focus({ preventScroll: true });
+  }, [editableScreenIds?.size, interactMode, interactScreenId]);
+
+  const restoreInitialCanvasFocus = useCallback(
+    (event: ReactFocusEvent<HTMLDivElement>) => {
+      if (
+        !initialCanvasFocusPendingRef.current ||
+        interactMode ||
+        interactScreenId
+      ) {
+        return;
+      }
+      const target = event.target;
+      if (
+        !(target instanceof HTMLIFrameElement) ||
+        !surfaceRef.current?.contains(target) ||
+        target.closest('[data-screen-interact-mode="true"]')
+      ) {
+        return;
+      }
+      surfaceRef.current.focus({ preventScroll: true });
+    },
+    [interactMode, interactScreenId],
+  );
+
   // Per-screen memoization of resolveScreenMetadata (PF20). resolveScreenMetadata
   // string-scans up to 4000 chars of content (deriveSource/derivePreviewState)
   // plus URL parsing on every call. getResolvedMetadata is invoked once per
@@ -3603,23 +3659,8 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
         clearCrossScreenDrag();
         return;
       }
-      const shouldPreviewSourceDelete =
-        !payload.duplicate &&
-        Boolean(payload.sourceDeleteRequestId) &&
-        editableScreenIds?.has(sourceScreenId) === true &&
-        (targetCandidate.id === boardFileId ||
-          editableScreenIds?.has(targetCandidate.id) === true);
-      if (payload.sourceDeleteRequestId) {
-        if (shouldPreviewSourceDelete) {
-          sendLinkedScreenPreviewPendingDelete(sourceScreenId, {
-            selector: payload.selector,
-            selectorCandidates: sourceDeleteCandidates,
-            requestId: payload.sourceDeleteRequestId,
-          });
-        } else {
-          cancelPendingSourceDelete();
-        }
-      }
+      // The source stays visible until the destination insert is acknowledged.
+      // DesignCanvas starts its delete preview only after that acknowledgement.
       crossScreenHostCommittedRef.current = true;
       if (targetCandidate.id === boardFileId) {
         // A successful prior handoff retains its identity until the paired
@@ -11617,6 +11658,7 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
       tabIndex={-1}
       className="relative h-full w-full select-none overflow-clip outline-none"
       onMouseDownCapture={handleMouseDown}
+      onFocusCapture={restoreInitialCanvasFocus}
       onMouseMove={handleMouseMove}
       onMouseLeave={() => setAltHoverMeasurement(null)}
       onDragEnter={handleCanvasDragEnter}

package/corpus/templates/design/app/components/design/types.ts

@@ -112,6 +112,7 @@ export interface RuntimeStructureDeleteRequest {
   rollbackSourceId?: string;
   /** Cancel a source delete and restore its DOM before rolling back the insert. */
   cancelRequested?: boolean;
+  cancellationRetryCount?: number;
 }
 
 export interface RuntimeStructureRollbackRequest {
@@ -121,6 +122,7 @@ export interface RuntimeStructureRollbackRequest {
   sourceId?: string;
   /** A target lost across canvas unmount is already rolled back if absent. */
   idempotent?: boolean;
+  retryCount?: number;
 }
 
 export interface RuntimeLayerRenameRequest {

package/corpus/templates/design/app/pages/design-editor/commands/cross-screen-element-drop.ts

@@ -15,12 +15,12 @@ import { dndHostLog } from "@/components/design/dnd-debug";
 import { isShaderWriteInFlight } from "@/components/design/inspector/GlslShaderPanel";
 import { validateCrossScreenSourceHtmlSnapshot } from "@/components/design/multi-screen/cross-screen-drop";
 import { getPrimaryIframeId } from "@/components/design/multi-screen/iframe-targeting";
-import { sendLinkedScreenPreviewPendingDelete } from "@/components/design/multi-screen/linked-screen-preview";
 import type {
   ElementInfo,
   PortableStyleSnapshot,
   RuntimeStructureDeleteRequest,
   RuntimeStructureInsertRequest,
+  RuntimeStructureRollbackRequest,
 } from "@/components/design/types";
 import type { ClipboardContentMutationPublication } from "@/lib/clipboard-content-lineage";
 import {
@@ -98,6 +98,103 @@ export function absolutePlacePointForDrop(args: {
   return absoluteDropPoint(args.targetLocalPoint, args.targetAnchorRect);
 }
 
+export function releaseCrossScreenDropAdmission(
+  pendingTransactionRef: RefObject<string | null> | undefined,
+  transactionId: string | undefined,
+): boolean {
+  if (
+    !transactionId ||
+    !pendingTransactionRef ||
+    pendingTransactionRef.current !== transactionId
+  ) {
+    return false;
+  }
+  pendingTransactionRef.current = null;
+  return true;
+}
+
+export function resolveCrossScreenMoveFailureRecovery(args: {
+  reason: string;
+  transactionId: string;
+  insertRequest: (RuntimeStructureInsertRequest & { screenId: string }) | null;
+  sourceDeleteRequest:
+    | (RuntimeStructureDeleteRequest & { screenId: string })
+    | null;
+  rollbackRequestId: string;
+  pendingTransactionRef?: RefObject<string | null>;
+}): {
+  rollbackRequest:
+    | (RuntimeStructureRollbackRequest & { screenId: string })
+    | null;
+  sourceDeleteRequest:
+    | (RuntimeStructureDeleteRequest & { screenId: string })
+    | null
+    | undefined;
+} {
+  const insertRequest =
+    args.insertRequest?.transactionId === args.transactionId
+      ? args.insertRequest
+      : null;
+  const sourceDeleteRequest =
+    args.sourceDeleteRequest?.transactionId === args.transactionId
+      ? args.sourceDeleteRequest
+      : null;
+  const destinationDocumentLost =
+    args.reason === "target-canvas-unmounted" ||
+    args.reason === "target-document-replaced";
+  // A lost document discarded its transient insert; only an acknowledged
+  // insert needs the source's pending delete canceled before admission opens.
+  const needsRollback =
+    !destinationDocumentLost &&
+    (args.reason === "board-drop-timeout" ||
+      args.reason === "cross-screen-insert-timeout" ||
+      Boolean(sourceDeleteRequest?.rollbackSelector));
+  const rollbackScreenId =
+    sourceDeleteRequest?.rollbackScreenId ?? insertRequest?.screenId;
+  const sourceDeleteMayHaveApplied = Boolean(
+    sourceDeleteRequest &&
+    (sourceDeleteRequest.cancelRequested ||
+      sourceDeleteRequest.waitForInsertTransaction !== true ||
+      sourceDeleteRequest.rollbackSelector),
+  );
+  const sourceRestorationMustPrecedeRollback =
+    needsRollback && sourceDeleteMayHaveApplied;
+  const rollbackRequest =
+    needsRollback && !sourceRestorationMustPrecedeRollback && rollbackScreenId
+      ? {
+          screenId: rollbackScreenId,
+          requestId: args.rollbackRequestId,
+          transactionId: args.transactionId,
+          selector: sourceDeleteRequest?.rollbackSelector ?? "",
+          sourceId: sourceDeleteRequest?.rollbackSourceId,
+          idempotent: true,
+        }
+      : null;
+  const recoveredSourceDeleteRequest = sourceDeleteRequest
+    ? sourceDeleteMayHaveApplied
+      ? {
+          ...sourceDeleteRequest,
+          cancelRequested: true,
+          ...(sourceRestorationMustPrecedeRollback
+            ? {}
+            : { rollbackSelector: undefined, rollbackSourceId: undefined }),
+        }
+      : null
+    : undefined;
+
+  if (!rollbackRequest && !recoveredSourceDeleteRequest?.cancelRequested) {
+    releaseCrossScreenDropAdmission(
+      args.pendingTransactionRef,
+      args.transactionId,
+    );
+  }
+
+  return {
+    rollbackRequest,
+    sourceDeleteRequest: recoveredSourceDeleteRequest,
+  };
+}
+
 export interface CrossScreenElementDropArgs {
   getCurrentFileSnapshot?: (fileId: string) => {
     content: string;
@@ -510,14 +607,6 @@ export function runCrossScreenElementDrop(
     const deleteSelectorCandidates = Array.from(
       new Set([sourceSelector, ...codeLayerSelectorAliases(sourceOwner.node)]),
     ).filter(Boolean);
-    // Conceal the source in the current DOM before the destination insert is
-    // posted. The React prop path below replays it after source-frame reloads.
-    sendLinkedScreenPreviewPendingDelete(sourceScreenId, {
-      selector: sourceSelector,
-      selectorCandidates: deleteSelectorCandidates,
-      requestId: deleteRequestId,
-      transactionId,
-    });
     runtimeStructureInsertRevisionRef.current += 1;
     setRuntimeStructureInsertRequest({
       requestId: runtimeStructureInsertRevisionRef.current,