packages/core/src/manual-layout/applyManualLayout.ts (1)

268-272: Move the manual fast-path before invariant checks

Line 265-267 invariants still run before the new manual short-circuit. If snapshot is stale/mismatched, this path can still throw even though the function can safely skip re-application for already-manual input.

Suggested adjustment

 export function applyManualLayout<
   V extends LayoutedView,
 >(
   autoLayouted: V,
   snapshot: ViewManualLayoutSnapshot,
 ): V {
+  if (autoLayouted._layout === 'manual') {
+    return autoLayouted
+  }
+
   invariant(autoLayouted.id === snapshot.id, 'applyManualLayout: view ids do not match')
   invariant(autoLayouted._stage === 'layouted', 'applyManualLayout: expected layouted view')
   invariant(snapshot._stage === 'layouted', 'applyManualLayout: expected layouted snapshot')
-  // If the view already has manual layout applied, return it as-is.
-  // This can happen when the Vite client receives pre-processed data (`#2882`).
-  if (autoLayouted._layout === 'manual') {
-    return autoLayouted
-  }

As per coding guidelines: “When changes relate to views (types or models), update View-drifts detection/auto-applying in src/manual-layout accordingly. If unsure what leads to layout drifts or can be auto-applied, ask for confirmation.”

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@packages/core/src/manual-layout/applyManualLayout.ts` around lines 268 - 272,
The manual-layout fast-path should be moved before any invariant/snapshot
validation so we don't throw on stale/mismatched snapshot for already-manual
inputs; in applyManualLayout (look for autoLayouted and its _layout === 'manual'
check) relocate that short-circuit to run before the snapshot/invariant checks
that reference snapshot, and ensure you still run any necessary view-drifts
detection/auto-applying updates in src/manual-layout per the coding guidelines.