@agent-native/core 0.169.1 → 0.170.0

package/corpus/templates/design/app/pages/design-editor/commands/apply-local-content-update.ts

@@ -7,6 +7,7 @@ import * as Y from "yjs";
 
 import { trace } from "@/components/design/design-trace";
 import type { ClipboardContentMutationPublication } from "@/lib/clipboard-content-lineage";
+import { writeCollabText } from "@/pages/design-editor/collab-sync";
 import {
   LOCAL_EDIT_ORIGIN,
   TAB_ID,
@@ -289,17 +290,16 @@ export function runApplyLocalContentUpdate(
     const ytext = ydoc.getText("content");
     if (ytext.toString() !== nextContent) {
       if (!yjsHistoryAvailable) {
-        // Untracked full rewrite (recordHistory:false callers such as the
+        // Untracked write (recordHistory:false callers such as the
         // code-layer id-stamping effect, or history-suppressed replays) —
         // see U1 note above: clear the undo stack so a stale tracked
         // delta can't be replayed against content it no longer matches.
         undoManagerRef.current?.clear(true, false);
       }
-      ydoc.transact(
-        () => {
-          ytext.delete(0, ytext.length);
-          ytext.insert(0, nextContent);
-        },
+      writeCollabText(
+        ydoc,
+        ytext,
+        nextContent,
         yjsHistoryAvailable ? LOCAL_EDIT_ORIGIN : TAB_ID,
       );
     }

package/corpus/templates/design/app/pages/design-editor/commands/apply-pending-visual-styles-with-agent.ts

@@ -50,7 +50,7 @@ export interface ApplyPendingVisualStylesWithAgentArgs {
   pendingStructureVerificationStatus: PendingStructureVerificationStatus;
   pendingVisualStyleEdits: PendingVisualStyleEdit[];
   pendingVisualStylePrompt: string;
-  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel>>;
+  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel | null>>;
   setApplyingViaHost: Dispatch<SetStateAction<boolean>>;
   setPendingAgentHandoffBusy: Dispatch<SetStateAction<boolean>>;
   setPendingStructureAckRequest: Dispatch<

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

@@ -25,6 +25,7 @@ import {
   resolveCodeLayerTargetFromBridge,
   resolveCodeLayerTargetFromElementInfo,
 } from "@/pages/design-editor/code-layer-state";
+import { writeCollabText } from "@/pages/design-editor/collab-sync";
 import type {
   LiveScreenSnapshot,
   PatchProofState,
@@ -176,6 +177,9 @@ export function runCommitVisualStyles(
     elementInfo?: ElementInfo;
     /** Pre-gesture values, for the pending-edit revert stack. */
     originalStyles?: Record<string, string>;
+    /** The write is a side effect of a gesture on another element, so it must
+     *  not move the selection onto the element it touched. */
+    preserveSelection?: boolean;
   } = {},
 ) {
   trace("persist", "commit-styles", {
@@ -657,17 +661,16 @@ export function runCommitVisualStyles(
       const ytext = ydoc.getText("content");
       if (ytext.toString() !== resolvedNextContent) {
         if (!yjsHistoryAvailable) {
-          // Untracked full rewrite (overview mode with a still-live
+          // Untracked write (overview mode with a still-live
           // single-mode UndoManager, or history-suppressed replay) —
           // see U1 note: clear the undo stack so a stale tracked delta
           // can't be replayed against content it no longer matches.
           undoManagerRef.current?.clear(true, false);
         }
-        ydoc.transact(
-          () => {
-            ytext.delete(0, ytext.length);
-            ytext.insert(0, resolvedNextContent);
-          },
+        writeCollabText(
+          ydoc,
+          ytext,
+          resolvedNextContent,
           yjsHistoryAvailable ? LOCAL_EDIT_ORIGIN : TAB_ID,
         );
       }
@@ -687,7 +690,15 @@ export function runCommitVisualStyles(
       setContentRenderRevision((revision) => revision + 1);
     }
   }
-  if (resolvedNode) setSelectedLayerIdsState([resolvedNode.id]);
+  if (options.preserveSelection) return;
+  // A commit must never shrink the selection: a group transform commits one
+  // style change per member, so selecting the committed node keeps only the
+  // member that happened to commit last.
+  if (resolvedNode) {
+    setSelectedLayerIdsState((current) =>
+      current.includes(resolvedNode.id) ? current : [resolvedNode.id],
+    );
+  }
   setSelectedElement((prev) => {
     if (options.elementInfo) return options.elementInfo;
     if (!prev) return prev;

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

@@ -1,33 +1,13 @@
-import type { CodeLayerNode, CodeLayerTreeNode } from "@shared/code-layer";
 import type { Dispatch, RefObject, SetStateAction } from "react";
 
 import type { ElementInfo } from "@/components/design/types";
-import {
-  collectCodeLayerAncestors,
-  elementInfoFromCodeLayerNode,
-} from "@/pages/design-editor/code-layer-state";
-import {
-  hasSelectableCodeLayerParent,
-  resolveEscapePopSelectionAction,
-  shouldEscapeToOverview,
-} from "@/pages/design-editor/selection-state";
+import { shouldEscapeToOverview } from "@/pages/design-editor/selection-state";
 import type { DesignTool, EditorMode } from "@/pages/design-editor/types";
 
 export interface EscapeHotkeyArgs {
   activeBreakpointWidthStateRef: RefObject<number | undefined>;
   activeTool: DesignTool;
   cancelActiveEditorDrag: () => boolean;
-  codeLayerOwnerByNodeIdRef: RefObject<
-    Map<
-      string,
-      {
-        fileId: string;
-        node: CodeLayerNode;
-        tree: CodeLayerTreeNode[];
-        runtimeOnly: boolean;
-      }
-    >
-  >;
   drawMode: boolean;
   enterOverviewFromZoom: (nextMode?: EditorMode) => void;
   focusedAnnotationSending: boolean;
@@ -40,11 +20,8 @@ export interface EscapeHotkeyArgs {
   overviewAnnotationSending: boolean;
   pinMode: boolean;
   selectedElement: ElementInfo | null;
-  selectedLayerIdsState: string[];
-  setActiveFileId: Dispatch<SetStateAction<string | null>>;
   setActiveTool: Dispatch<SetStateAction<DesignTool>>;
   setDrawMode: Dispatch<SetStateAction<boolean>>;
-  setExpandedLayerIds: Dispatch<SetStateAction<string[]>>;
   setHoveredElement: Dispatch<SetStateAction<ElementInfo | null>>;
   setMode: Dispatch<SetStateAction<EditorMode>>;
   setOverviewClearSelectionRequest: Dispatch<SetStateAction<number>>;
@@ -59,7 +36,6 @@ export function runEscapeHotkey({
   activeBreakpointWidthStateRef,
   activeTool,
   cancelActiveEditorDrag,
-  codeLayerOwnerByNodeIdRef,
   drawMode,
   enterOverviewFromZoom,
   focusedAnnotationSending,
@@ -72,11 +48,8 @@ export function runEscapeHotkey({
   overviewAnnotationSending,
   pinMode,
   selectedElement,
-  selectedLayerIdsState,
-  setActiveFileId,
   setActiveTool,
   setDrawMode,
-  setExpandedLayerIds,
   setHoveredElement,
   setMode,
   setOverviewClearSelectionRequest,
@@ -133,68 +106,9 @@ export function runEscapeHotkey({
     enterOverviewFromZoom();
     return;
   }
-  // Figma parity — pop the plain-canvas selection one level at a time
-  // (child layer -> parent layer -> containing screen/frame -> fully
-  // deselected) instead of deselecting everything on the first Escape.
-  // The decision itself is a pure, unit-tested function
-  // (resolveEscapePopSelectionAction in design-editor/selection-state.ts);
-  // this reuses the same codeLayerOwnerByNodeIdRef/parentId ancestor walk
-  // handleSelectParentLayer (Shift+Enter / "\\") already uses, inlined
-  // here (rather than calling selectCodeLayerNodesForHotkey directly)
-  // since that helper is declared later in this component and referencing
-  // it from this callback's deps would hit its temporal-dead-zone before
-  // this render's declarations run.
-  const escapeSelectedLayerId =
-    selectedLayerIdsState[selectedLayerIdsState.length - 1];
-  const escapeOwner = escapeSelectedLayerId
-    ? codeLayerOwnerByNodeIdRef.current.get(escapeSelectedLayerId)
-    : undefined;
-  // BUG-ESCAPE-SHELL: the flat codeLayerOwnerByNodeIdRef map (built from
-  // projection.nodes) still contains <html>/<body> entries with real
-  // parentId links even though the VISUAL layers tree collapses them away
-  // (shared/code-layer.ts's isCollapsibleDocumentShellNode). A bare
-  // Boolean(escapeOwner?.node.parentId) check treats a top-level layer's
-  // collapsed <body> ancestor as a selectable parent, so popping from the
-  // screen root would select <body> then <html> instead of stopping at the
-  // screen/frame level. hasSelectableCodeLayerParent excludes those shell
-  // nodes so the pop walk matches what the layers panel shows.
-  const escapeParentOwner = escapeOwner?.node.parentId
-    ? codeLayerOwnerByNodeIdRef.current.get(escapeOwner.node.parentId)
-    : undefined;
-  const popAction = resolveEscapePopSelectionAction({
-    hasSelectedLayer: Boolean(escapeOwner),
-    hasLayerParent: hasSelectableCodeLayerParent({
-      parentNode: escapeParentOwner?.node,
-    }),
-    viewMode,
-  });
-  if (popAction.kind === "pop-to-parent-layer" && escapeOwner) {
-    const parentOwner = escapeParentOwner;
-    if (parentOwner && parentOwner.fileId === escapeOwner.fileId) {
-      setActiveFileId(parentOwner.fileId);
-      setOverviewSelectedScreenIds([]);
-      setSelectedLayerIdsState([parentOwner.node.id]);
-      setSelectedElement(elementInfoFromCodeLayerNode(parentOwner.node));
-      setExpandedLayerIds((current) => {
-        const next = new Set(current);
-        next.add(parentOwner.fileId);
-        collectCodeLayerAncestors(
-          parentOwner.tree,
-          parentOwner.node.id,
-        ).forEach((ancestorId) => next.add(ancestorId));
-        return next.size === current.length ? current : Array.from(next);
-      });
-      return;
-    }
-    // Parent couldn't be resolved (e.g. cross-file) — fall through to a
-    // full deselect below rather than silently doing nothing.
-  } else if (popAction.kind === "pop-to-screen-frame" && escapeOwner) {
-    setSelectedElement(null);
-    setSelectedLayerIdsState([]);
-    setOverviewSelectedScreenIds([escapeOwner.fileId]);
-    setOverviewClearSelectionRequest((request) => request + 1);
-    return;
-  }
+  // Figma's Esc is "select none". Walking up one ancestor per press belongs to
+  // Shift+Enter / "\\" (handleSelectParentLayer) — Escape must never leave
+  // something selected, or there is no keystroke that reaches an empty canvas.
   setSelectedElement(null);
   setHoveredElement(null);
   setOverviewSelectedScreenIds([]);

package/corpus/templates/design/app/pages/design-editor/commands/layer-marquee-selection-change.ts

@@ -15,6 +15,7 @@ import {
   isScreenRootElementInfo,
   shouldClearBridgeSelectionOnEmptyMarquee,
 } from "@/pages/design-editor/selection-state";
+import { resolveToolAfterSelection } from "@/pages/design-editor/tool-state";
 import type { DesignTool, EditorMode } from "@/pages/design-editor/types";
 
 export interface LayerMarqueeSelectionChangeArgs {
@@ -158,6 +159,6 @@ export function runLayerMarqueeSelectionChange(
     setOverviewClearSelectionRequest((request) => request + 1);
   }
 
-  setActiveTool("move");
+  setActiveTool(resolveToolAfterSelection);
   setMode("edit");
 }

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

@@ -9,6 +9,7 @@ import {
   getOverviewScreenIdsFromLayerSelection,
   getSidebarCodeLayerSelectionState,
 } from "@/pages/design-editor/selection-state";
+import { resolveToolAfterSelection } from "@/pages/design-editor/tool-state";
 import type {
   DesignFile,
   DesignTool,
@@ -130,13 +131,13 @@ export function runLayerSelectionChange(
     if (layerCanvasBlocked) {
       setSelectedElement(null);
       focusDesignInspectorForSelection();
-      setActiveTool("move");
+      setActiveTool(resolveToolAfterSelection);
       setMode("edit");
       return;
     }
     setSelectedElement(elementInfoFromCodeLayerNode(codeLayerOwner.node));
     focusDesignInspectorForSelection();
-    setActiveTool("move");
+    setActiveTool(resolveToolAfterSelection);
     setMode("edit");
     return;
   }
@@ -153,7 +154,7 @@ export function runLayerSelectionChange(
         ? nextLayerIds
         : [fileId],
     );
-    setActiveTool("move");
+    setActiveTool(resolveToolAfterSelection);
     setMode("edit");
     viewModeRef.current = "overview";
     setViewMode("overview");

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

@@ -20,6 +20,7 @@ import {
   isScreenRootElementInfo,
   shouldIgnoreOverviewLayerCreationEcho,
 } from "@/pages/design-editor/selection-state";
+import { resolveToolAfterSelection } from "@/pages/design-editor/tool-state";
 import type { DesignTool, EditorMode } from "@/pages/design-editor/types";
 
 export interface ScreenElementSelectArgs {
@@ -234,8 +235,17 @@ export function runScreenElementSelect(
       }
       return dedupeStringIds([...current, node.id]);
     });
+  } else if (node) {
+    // An intent-less select is the bridge re-anchoring after a content
+    // replace, not a user picking one object, so it must not collapse a live
+    // multi-selection down to the member it re-found.
+    setSelectedLayerIdsState((current) =>
+      !intent && current.length > 1 && current.includes(node.id)
+        ? current
+        : [node.id],
+    );
   } else {
-    setSelectedLayerIdsState(node ? [node.id] : []);
+    setSelectedLayerIdsState([]);
   }
   if (viewModeRef.current === "overview") {
     setOverviewSelectedScreenIds([]);
@@ -256,7 +266,7 @@ export function runScreenElementSelect(
       handleBreakpointBarSelect(undefined);
     }
   }
-  setActiveTool("move");
+  setActiveTool(resolveToolAfterSelection);
   setMode("edit");
   focusDesignInspectorForSelection();
 }

package/corpus/templates/design/app/pages/design-editor/commands/screen-visual-style-change.ts

@@ -39,7 +39,10 @@ export interface ScreenVisualStyleChangeArgs {
     selector: string,
     styles: Record<string, string>,
     elementInfo?: ElementInfo,
-    metadata?: { originalStyles?: Record<string, string> },
+    metadata?: {
+      originalStyles?: Record<string, string>;
+      preserveSelection?: boolean;
+    },
   ) => void;
   overviewScreens: OverviewScreen[];
   recordPendingVisualStyleEdit: (
@@ -49,6 +52,7 @@ export interface ScreenVisualStyleChangeArgs {
     elementInfo?: ElementInfo,
     metadata?: {
       originalStyles?: Record<string, string>;
+      preserveSelection?: boolean;
       interactionState?: InteractionState;
     },
   ) => void;
@@ -75,7 +79,10 @@ export function runScreenVisualStyleChange(
   selector: string,
   styles: Record<string, string>,
   elementInfo?: ElementInfo,
-  metadata?: { originalStyles?: Record<string, string> },
+  metadata?: {
+    originalStyles?: Record<string, string>;
+    preserveSelection?: boolean;
+  },
 ) {
   if (screenId === activeFile?.id) {
     handleVisualStyleChange(selector, styles, elementInfo, metadata);

package/corpus/templates/design/app/pages/design-editor/commands/send-runtime-layer-move-semantic-handoff.ts

@@ -29,7 +29,7 @@ export interface SendRuntimeLayerMoveSemanticHandoffArgs {
   localhostConnectionRootPathByIdRef: RefObject<Map<string, string>>;
   overviewScreens: OverviewScreen[];
   runtimeLayerSnapshotsById: Record<string, RuntimeLayerSnapshot>;
-  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel>>;
+  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel | null>>;
   t: (key: string, options?: Record<string, unknown>) => string;
 }
 

package/corpus/templates/design/app/pages/design-editor/commands/send-runtime-layer-semantic-handoff.ts

@@ -29,7 +29,7 @@ export interface SendRuntimeLayerSemanticHandoffArgs {
   localhostConnectionRootPathByIdRef: RefObject<Map<string, string>>;
   overviewScreens: OverviewScreen[];
   runtimeLayerSnapshotsById: Record<string, RuntimeLayerSnapshot>;
-  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel>>;
+  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel | null>>;
   t: (key: string, options?: Record<string, unknown>) => string;
 }
 

package/corpus/templates/design/app/pages/design-editor/commands/send-runtime-layer-state-semantic-handoff.ts

@@ -32,7 +32,7 @@ export interface SendRuntimeLayerStateSemanticHandoffArgs {
   localhostConnectionRootPathByIdRef: RefObject<Map<string, string>>;
   overviewScreens: OverviewScreen[];
   runtimeLayerSnapshotsById: Record<string, RuntimeLayerSnapshot>;
-  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel>>;
+  setActiveLeftPanel: Dispatch<SetStateAction<DesignLeftPanel | null>>;
   t: (key: string, options?: Record<string, unknown>) => string;
 }
 

package/corpus/templates/design/app/pages/design-editor/commands/start-sidebar-resize.ts

@@ -8,7 +8,7 @@ import type {
 import type { DesignLeftPanel } from "@/pages/design-editor/types";
 
 export interface StartSidebarResizeArgs {
-  activeLeftPanel: DesignLeftPanel;
+  activeLeftPanel: DesignLeftPanel | null;
   leftSidebarContentRef: RefObject<HTMLDivElement | null>;
   leftSidebarWidth: number;
   rightSidebarContentRef: RefObject<HTMLDivElement | null>;

package/corpus/templates/design/app/pages/design-editor/editor-state.ts

@@ -1,5 +1,7 @@
 import { isStandaloneHttpUrl } from "@shared/html-content";
 
+import { trace } from "@/components/design/design-trace";
+
 import { normalizeDesignLeftPanel } from "./tool-state";
 import {
   type DesignFile,
@@ -24,10 +26,18 @@ export type PreviewContentReplaceResult =
   | "skipped-caller-owns-preview"
   | "unavailable";
 
+/**
+ * True when the in-place bridge patch could not run and the caller must fall
+ * back to rebuilding srcdoc — a real iframe reload that re-executes the editor
+ * bridge, Tailwind and Alpine. Traced because it is the one escalation a user
+ * perceives as "the frame refreshed", and it is otherwise invisible.
+ */
 export function previewContentReplaceNeedsRenderFallback(
   result: PreviewContentReplaceResult,
 ): boolean {
-  return result === "unavailable";
+  if (result !== "unavailable") return false;
+  trace("persist", "preview-bridge-unavailable-reload");
+  return true;
 }
 
 /**

package/corpus/templates/design/app/pages/design-editor/effects/adopt-db-file-content.ts

@@ -3,6 +3,7 @@ import { sourceContentHash } from "@shared/source-workspace";
 import type { Dispatch, RefObject, SetStateAction } from "react";
 import * as Y from "yjs";
 
+import { writeCollabText } from "@/pages/design-editor/collab-sync";
 import {
   TAB_ID,
   shouldAdoptExternalReconcileContent,
@@ -103,16 +104,13 @@ export function runAdoptDbFileContent({
     if (isLeadClient && ydoc) {
       const ytext = ydoc.getText("content");
       if (ytext.toString() !== dbContent) {
-        // Untracked full rewrite (agent edit / external DB content
-        // replacing a live doc that diverged) — clear the undo stack so a
-        // stale tracked delta can't be replayed against content it no
-        // longer matches (see U1: this is the primary corruption path —
-        // agent edits, motion autosave, and id-stamping all land here).
+        // Untracked write (agent edit / external DB content replacing a
+        // live doc that diverged) — clear the undo stack so a stale
+        // tracked delta can't be replayed against content it no longer
+        // matches (see U1: this is the primary corruption path — agent
+        // edits, motion autosave, and id-stamping all land here).
         undoManagerRef.current?.clear(true, false);
-        ydoc.transact(() => {
-          ytext.delete(0, ytext.length);
-          ytext.insert(0, dbContent);
-        }, TAB_ID);
+        writeCollabText(ydoc, ytext, dbContent, TAB_ID);
       }
     }
     return;
@@ -182,12 +180,9 @@ export function runAdoptDbFileContent({
           if (isLeadClient && ydoc) {
             const ytext = ydoc.getText("content");
             if (ytext.toString() !== expectedContent) {
-              // Untracked full rewrite — see U1 note above.
+              // Untracked write — see U1 note above.
               undoManagerRef.current?.clear(true, false);
-              ydoc.transact(() => {
-                ytext.delete(0, ytext.length);
-                ytext.insert(0, expectedContent);
-              }, TAB_ID);
+              writeCollabText(ydoc, ytext, expectedContent, TAB_ID);
             }
           }
         }, 1200);
@@ -258,13 +253,10 @@ export function runAdoptDbFileContent({
   if (isLeadClient && ydoc) {
     const ytext = ydoc.getText("content");
     if (ytext.toString() !== dbContent) {
-      // Untracked full rewrite — see U1 note above. The view-appropriate
+      // Untracked write — see U1 note above. The view-appropriate
       // checkpoint recorded above (U21) is what Cmd+Z now falls back to.
       undoManagerRef.current?.clear(true, false);
-      ydoc.transact(() => {
-        ytext.delete(0, ytext.length);
-        ytext.insert(0, dbContent);
-      }, TAB_ID);
+      writeCollabText(ydoc, ytext, dbContent, TAB_ID);
     }
   }
 }

package/corpus/templates/design/app/pages/design-editor/effects/observe-collab-text.ts

@@ -3,7 +3,10 @@ import * as Y from "yjs";
 
 import type { ElementInfo } from "@/components/design/types";
 import { refreshElementInfoFromContent } from "@/pages/design-editor/code-layer-state";
-import { shouldApplyRemotePreviewContent } from "@/pages/design-editor/collab-sync";
+import {
+  shouldApplyRemotePreviewContent,
+  writeCollabText,
+} from "@/pages/design-editor/collab-sync";
 import {
   LOCAL_EDIT_ORIGIN,
   TAB_ID,
@@ -120,12 +123,9 @@ export function runObserveCollabText({
       ) {
         setContentRenderRevision((revision) => revision + 1);
       }
-      // Untracked full rewrite — see clear() note in the seed effect above.
+      // Untracked write — see clear() note in the seed effect above.
       undoManagerRef.current?.clear(true, false);
-      ydoc.transact(() => {
-        ytext.delete(0, ytext.length);
-        ytext.insert(0, pendingLocalContent);
-      }, TAB_ID);
+      writeCollabText(ydoc, ytext, pendingLocalContent, TAB_ID);
       return;
     }
     setCollabContent(next);

package/corpus/templates/design/app/pages/design-editor/effects/publish-agent-selection-context.ts

@@ -20,7 +20,7 @@ export interface PublishAgentSelectionContextArgs {
   activeCodeFile: CodeWorkbenchActiveFile | null;
   activeFile: DesignFile;
   activeInspectorTab: InspectorTab;
-  activeLeftPanel: DesignLeftPanel;
+  activeLeftPanel: DesignLeftPanel | null;
   activeTool: DesignTool;
   design: DesignData | null;
   designDataJson: Record<string, unknown>;

package/corpus/templates/design/app/pages/design-editor/effects/seed-collab-content.ts

@@ -1,7 +1,10 @@
 import type { Dispatch, RefObject, SetStateAction } from "react";
 import * as Y from "yjs";
 
-import { shouldRebaseCollabDocFromStoredContent } from "@/pages/design-editor/collab-sync";
+import {
+  shouldRebaseCollabDocFromStoredContent,
+  writeCollabText,
+} from "@/pages/design-editor/collab-sync";
 import { TAB_ID } from "@/pages/design-editor/editor-session";
 import type { PreviewContentReplaceResult } from "@/pages/design-editor/editor-state";
 import { previewContentReplaceNeedsRenderFallback } from "@/pages/design-editor/editor-state";
@@ -69,16 +72,13 @@ export function runSeedCollabContent({
     ) {
       setContentRenderRevision((revision) => revision + 1);
     }
-    // Full delete+insert with an untracked origin: the UndoManager only
-    // tracks LOCAL_EDIT_ORIGIN, so this rewrite is invisible to it. Clear
-    // the undo stack so a subsequent Cmd+Z can't replay a tracked delta
-    // from before this rewrite against content it no longer matches
-    // (see the DE:5135-style mitigation below for the same hazard).
+    // Untracked origin: the UndoManager only tracks LOCAL_EDIT_ORIGIN, so
+    // this write is invisible to it. Clear the undo stack so a subsequent
+    // Cmd+Z can't replay a tracked delta from before it against content it
+    // no longer matches (see the DE:5135-style mitigation below for the
+    // same hazard).
     undoManagerRef.current?.clear(true, false);
-    ydoc.transact(() => {
-      ytext.delete(0, ytext.length);
-      ytext.insert(0, pendingLocalContent);
-    }, TAB_ID);
+    writeCollabText(ydoc, ytext, pendingLocalContent, TAB_ID);
     return;
   }
   if (text.length > 0) {
@@ -115,12 +115,9 @@ export function runSeedCollabContent({
       ) {
         setContentRenderRevision((revision) => revision + 1);
       }
-      // Untracked full rewrite — see clear() note above.
+      // Untracked write — see clear() note above.
       undoManagerRef.current?.clear(true, false);
-      ydoc.transact(() => {
-        ytext.delete(0, ytext.length);
-        ytext.insert(0, storedContent);
-      }, TAB_ID);
+      writeCollabText(ydoc, ytext, storedContent, TAB_ID);
       return;
     }
     // Y.Doc snapshots are a render seed, not the SQL source of truth; the

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

@@ -401,15 +401,8 @@ export function shouldEscapeToOverview(args: {
  * node already carries `tag`/`layerNameSource` without needing a separate
  * lookup map.
  *
- * Both the Escape pop-one-level walk (`resolveEscapePopSelectionAction`) and
- * the shared Shift+Enter / "\\" select-parent walk (`handleSelectParentLayer`
- * in DesignEditor.tsx) must treat a parent that resolves to a document-shell
- * node as NO parent at all — otherwise popping from a top-level layer selects
- * the raw `<body>`/`<html>` DOM nodes instead of stopping at the screen/frame
- * level (or fully deselecting), which produces a permanently broken 0x0
- * inspector with no way back to a deselected state.
- *
- * Exported for unit testing.
+ * Select-parent must treat a document-shell parent as NO parent, or walking up
+ * from a top-level layer selects raw `<body>` and strands the inspector at 0x0.
  */
 export function isDocumentShellCodeLayerNode(node: {
   tag: string;
@@ -422,14 +415,9 @@ export function isDocumentShellCodeLayerNode(node: {
 }
 
 /**
- * True only when `parentNode` exists AND is not a document-shell node — see
- * `isDocumentShellCodeLayerNode`. Callers walking the flat code-layer
- * ownership map (Escape pop-one-level, Shift+Enter select-parent) must use
- * this instead of a bare `Boolean(parentNode)` truthiness check, or a
- * top-level layer's collapsed `<body>`/`<html>` ancestor gets treated as a
- * selectable parent layer.
- *
- * Exported for unit testing.
+ * Callers walking the flat code-layer ownership map must use this instead of a
+ * bare `Boolean(parentNode)` check, or a top-level layer's collapsed
+ * `<body>`/`<html>` ancestor gets treated as a selectable parent layer.
  */
 export function hasSelectableCodeLayerParent(args: {
   parentNode: { tag: string; layerNameSource: string } | null | undefined;
@@ -439,48 +427,6 @@ export function hasSelectableCodeLayerParent(args: {
   );
 }
 
-export type EscapePopSelectionAction =
-  | { kind: "pop-to-parent-layer" }
-  | { kind: "pop-to-screen-frame" }
-  | { kind: "deselect" };
-
-/**
- * Figma parity — Escape on a plain canvas selection pops one level at a
- * time (child layer -> parent layer -> containing screen/frame -> fully
- * deselected) instead of deselecting everything on the first press.
- *
- * - A selected layer that has a code-layer parent (`hasLayerParent`) pops to
- *   that parent, reusing the same ancestor-walk `handleSelectParentLayer`
- *   (Shift+Enter / "\\") already uses via `codeLayerOwnerByNodeIdRef`.
- * - A selected TOP-level layer (no code-layer parent) in overview mode pops
- *   to selecting its containing screen/frame — the same selection kind
- *   (`overviewSelectedScreenIds`) clicking a frame directly in overview
- *   already produces.
- * - Anything else — nothing selected, or a top-level layer in single-screen
- *   mode where there's no separate "frame" to pop to (the screen already
- *   fills the view, so top-level already reads as "the frame boundary") —
- *   falls straight through to a full deselect, matching the previous
- *   unconditional Escape behavior.
- *
- * Callers must have already handled every higher-priority Escape consumer
- * (an in-progress marquee/drag, an active breakpoint edit target,
- * `shouldEscapeToOverview`'s zoom-out-to-overview case) before calling this
- * — it only decides the remaining plain-canvas-selection case.
- *
- * Exported for unit testing.
- */
-export function resolveEscapePopSelectionAction(args: {
-  hasSelectedLayer: boolean;
-  hasLayerParent: boolean;
-  viewMode: "single" | "overview";
-}): EscapePopSelectionAction {
-  if (args.hasSelectedLayer) {
-    if (args.hasLayerParent) return { kind: "pop-to-parent-layer" };
-    if (args.viewMode === "overview") return { kind: "pop-to-screen-frame" };
-  }
-  return { kind: "deselect" };
-}
-
 /**
  * B5-1: an empty-canvas click (a marquee/hit-test that resolved to zero
  * elements) must deselect ANY current selection kind — a selected