@tutti-os/workbench-surface 0.0.233 → 0.0.234

package/dist/index.js

@@ -3093,16 +3093,18 @@ function WorkbenchWindowFrame({
       "data-presentation-mode": presentationMode ?? "default",
       "data-presentation-visibility": isPresentationHidden ? "hidden" : "visible",
       "data-slot": "viewport-menu-boundary",
+      "data-viewport-menu-portal-target": "body",
       "data-workbench-node-type-id": resolveWorkbenchNodeTypeId(node.data),
       "data-workbench-window-id": node.id,
       "data-window-drag-state": isDragging ? "dragging" : "idle",
       "data-window-resize-state": isResizing ? "resizing" : "idle",
       style: {
         height: node.frame.height,
-        left: node.frame.x,
-        top: node.frame.y,
+        left: 0,
+        top: 0,
         transform: shellTransform,
         transformOrigin: "top left",
+        translate: `${node.frame.x}px ${node.frame.y}px`,
         width: node.frame.width,
         zIndex
       },
@@ -8800,7 +8802,7 @@ function logWorkbenchHostDebug(event, debugDiagnostics, payload) {
 }
 
 // src/host/useWorkbenchHostSurfaceRenderers.tsx
-import { Component, memo as memo2, useCallback as useCallback13, useMemo as useMemo10 } from "react";
+import { Component, memo as memo3, useCallback as useCallback13, useMemo as useMemo10 } from "react";
 
 // src/host/WorkbenchHostDock.tsx
 import {
@@ -8949,6 +8951,35 @@ function isWorkbenchDockEntryBlocked(entry) {
 import { useCallback as useCallback10, useEffect as useEffect7, useRef as useRef6 } from "react";
 
 // src/host/dockMagnificationBounds.ts
+var DOCK_MAGNIFICATION_CROSS_AXIS_PADDING = 8;
+function resolveDockMagnificationHitBounds(slotRects, dockPlacement, crossAxisPadding = DOCK_MAGNIFICATION_CROSS_AXIS_PADDING) {
+  if (slotRects.length === 0) {
+    return null;
+  }
+  let mainStart = Number.POSITIVE_INFINITY;
+  let mainEnd = Number.NEGATIVE_INFINITY;
+  let crossStart = Number.POSITIVE_INFINITY;
+  let crossEnd = Number.NEGATIVE_INFINITY;
+  for (const rect of slotRects) {
+    if (dockPlacement === "left") {
+      mainStart = Math.min(mainStart, rect.top);
+      mainEnd = Math.max(mainEnd, rect.bottom);
+      crossStart = Math.min(crossStart, rect.left);
+      crossEnd = Math.max(crossEnd, rect.right);
+    } else {
+      mainStart = Math.min(mainStart, rect.left);
+      mainEnd = Math.max(mainEnd, rect.right);
+      crossStart = Math.min(crossStart, rect.top);
+      crossEnd = Math.max(crossEnd, rect.bottom);
+    }
+  }
+  return {
+    crossEnd: crossEnd + crossAxisPadding,
+    crossStart: crossStart - crossAxisPadding,
+    mainEnd,
+    mainStart
+  };
+}
 function resolveDockMagnificationViewportBounds(viewportRect, dockPlacement) {
   return dockPlacement === "left" ? {
     crossEnd: viewportRect.right,
@@ -9034,27 +9065,10 @@ function isDockMagnificationPointInsideSlotRect({
   return clientX >= rect.left && clientX <= rect.right && clientY >= rect.top && clientY <= rect.bottom;
 }
 
-// src/host/dockMagnification.ts
+// src/host/dockMagnificationGeometry.ts
 var DOCK_ICON_BASE_SIZE = 43.2;
 var DOCK_ICON_PEAK_SIZE = DOCK_ICON_BASE_SIZE * 1.7;
 var DOCK_MAGNIFICATION_HALF_RANGE = DOCK_ICON_BASE_SIZE * 2.4;
-var DOCK_MAGNIFICATION_SPRING_MASS = 0.1;
-var DOCK_MAGNIFICATION_SPRING_STIFFNESS = 200;
-var DOCK_MAGNIFICATION_SPRING_DAMPING = 14;
-var MAGNIFICATION_SETTLE_EPSILON = 0.2;
-var MAGNIFICATION_SIZE_EPSILON = 0.2;
-var MAX_MAGNIFICATION_STEP_SECONDS = 1 / 30;
-var MAGNIFICATION_INFLUENCE_PADDING = 8;
-var DOCK_MAGNIFICATION_ENTRY_RAMP_MS = 90;
-var DOCK_MAGNIFICATION_CROSS_AXIS_PADDING = 8;
-var DOCK_MAGNIFICATION_MAIN_AXIS_EDGE_PADDING = DOCK_ICON_BASE_SIZE / 2;
-var DOCK_MAGNIFICATION_AMBIENT_EDGE_RANGE = 180;
-var DOCK_MAGNIFICATION_AMBIENT_VIEWPORT_PADDING = 8;
-var dockMagnificationShellBySlot = /* @__PURE__ */ new WeakMap();
-var globalPointerListenerOptions = {
-  capture: true,
-  passive: true
-};
 function mapDistanceToTargetSize(distance, baseSize = DOCK_ICON_BASE_SIZE, peakSize = DOCK_ICON_PEAK_SIZE, halfRange = DOCK_MAGNIFICATION_HALF_RANGE) {
   const absoluteDistance = Math.abs(distance);
   if (absoluteDistance >= halfRange) {
@@ -9067,34 +9081,65 @@ function applyDockMagnificationEntryRamp(targetSize, baseSize, progress) {
   const clampedProgress = Math.min(1, Math.max(0, progress));
   return baseSize + (targetSize - baseSize) * clampedProgress;
 }
-function resolveDockMagnificationHitBounds(slotRects, dockPlacement, crossAxisPadding = DOCK_MAGNIFICATION_CROSS_AXIS_PADDING) {
-  if (slotRects.length === 0) {
-    return null;
-  }
-  let mainStart = Number.POSITIVE_INFINITY;
-  let mainEnd = Number.NEGATIVE_INFINITY;
-  let crossStart = Number.POSITIVE_INFINITY;
-  let crossEnd = Number.NEGATIVE_INFINITY;
-  for (const rect of slotRects) {
-    if (dockPlacement === "left") {
-      mainStart = Math.min(mainStart, rect.top);
-      mainEnd = Math.max(mainEnd, rect.bottom);
-      crossStart = Math.min(crossStart, rect.left);
-      crossEnd = Math.max(crossEnd, rect.right);
-    } else {
-      mainStart = Math.min(mainStart, rect.left);
-      mainEnd = Math.max(mainEnd, rect.right);
-      crossStart = Math.min(crossStart, rect.top);
-      crossEnd = Math.max(crossEnd, rect.bottom);
+function resolveDockMagnificationSlotCenter(rect, dockPlacement, baseSize = DOCK_ICON_BASE_SIZE) {
+  return dockPlacement === "left" ? rect.top + baseSize / 2 : rect.left + baseSize / 2;
+}
+function projectDockMagnificationGeometry({
+  appliedSizes,
+  dockPlacement,
+  mainAxisStartAligned,
+  order,
+  restRects
+}) {
+  const growthByAnchorKey = /* @__PURE__ */ new Map();
+  let totalGrowth = 0;
+  for (const anchorKey of order) {
+    const restRect = restRects.get(anchorKey);
+    if (!restRect) {
+      continue;
+    }
+    const restMainSize = dockPlacement === "left" ? restRect.bottom - restRect.top : restRect.right - restRect.left;
+    const growth = (appliedSizes.get(anchorKey) ?? restMainSize) - restMainSize;
+    growthByAnchorKey.set(anchorKey, growth);
+    totalGrowth += growth;
+  }
+  let mainAxisOffset = mainAxisStartAligned ? 0 : -totalGrowth / 2;
+  const centers = /* @__PURE__ */ new Map();
+  const slotRects = [];
+  for (const anchorKey of order) {
+    const restRect = restRects.get(anchorKey);
+    if (!restRect) {
+      continue;
     }
+    const growth = growthByAnchorKey.get(anchorKey) ?? 0;
+    const restMainSize = dockPlacement === "left" ? restRect.bottom - restRect.top : restRect.right - restRect.left;
+    const size = restMainSize + growth;
+    const rect = dockPlacement === "left" ? {
+      bottom: restRect.top + mainAxisOffset + size,
+      left: (restRect.left + restRect.right - size) / 2,
+      right: (restRect.left + restRect.right + size) / 2,
+      top: restRect.top + mainAxisOffset
+    } : {
+      bottom: restRect.bottom,
+      left: restRect.left + mainAxisOffset,
+      right: restRect.left + mainAxisOffset + size,
+      top: restRect.bottom - size
+    };
+    slotRects.push(rect);
+    centers.set(
+      anchorKey,
+      resolveDockMagnificationSlotCenter(rect, dockPlacement)
+    );
+    mainAxisOffset += growth;
   }
-  return {
-    crossEnd: crossEnd + crossAxisPadding,
-    crossStart: crossStart - crossAxisPadding,
-    mainEnd,
-    mainStart
-  };
+  return { centers, slotRects };
 }
+
+// src/host/dockMagnificationPointerTracker.ts
+var dockMagnificationPointerListenerOptions = {
+  capture: true,
+  passive: true
+};
 function createDockMagnificationGlobalPointerTracker({
   blurTarget,
   onPointerCancel,
@@ -9118,12 +9163,12 @@ function createDockMagnificationGlobalPointerTracker({
     pointerTarget.addEventListener(
       "pointermove",
       handlePointerMove,
-      globalPointerListenerOptions
+      dockMagnificationPointerListenerOptions
     );
     pointerTarget.addEventListener(
       "pointercancel",
       handlePointerCancel,
-      globalPointerListenerOptions
+      dockMagnificationPointerListenerOptions
     );
     blurTarget?.addEventListener("blur", handlePointerCancel);
   };
@@ -9135,12 +9180,12 @@ function createDockMagnificationGlobalPointerTracker({
     pointerTarget.removeEventListener(
       "pointermove",
       handlePointerMove,
-      globalPointerListenerOptions
+      dockMagnificationPointerListenerOptions
     );
     pointerTarget.removeEventListener(
       "pointercancel",
       handlePointerCancel,
-      globalPointerListenerOptions
+      dockMagnificationPointerListenerOptions
     );
     blurTarget?.removeEventListener("blur", handlePointerCancel);
   };
@@ -9150,10 +9195,13 @@ function createDockMagnificationGlobalPointerTracker({
     stop
   };
 }
-function resolveDockMagnificationSlotCenter(rect, dockPlacement, baseSize = DOCK_ICON_BASE_SIZE) {
-  return dockPlacement === "left" ? rect.top + baseSize / 2 : rect.left + baseSize / 2;
-}
+
+// src/host/dockMagnificationSpring.ts
+var DOCK_MAGNIFICATION_SPRING_MASS = 0.1;
+var DOCK_MAGNIFICATION_SPRING_STIFFNESS = 200;
+var DOCK_MAGNIFICATION_SPRING_DAMPING = 14;
 var DOCK_MAGNIFICATION_SPRING_SUBSTEPS = 8;
+var MAGNIFICATION_SETTLE_EPSILON = 0.2;
 function advanceDockMagnificationSpring(current, target, deltaSeconds) {
   const subDeltaSeconds = deltaSeconds / DOCK_MAGNIFICATION_SPRING_SUBSTEPS;
   let { value, velocity } = current;
@@ -9168,6 +9216,16 @@ function advanceDockMagnificationSpring(current, target, deltaSeconds) {
 function isDockMagnificationSpringSettled(spring, target) {
   return Math.abs(spring.value - target) <= MAGNIFICATION_SETTLE_EPSILON && Math.abs(spring.velocity) <= MAGNIFICATION_SETTLE_EPSILON;
 }
+
+// src/host/dockMagnification.ts
+var MAGNIFICATION_SIZE_EPSILON = 0.2;
+var MAX_MAGNIFICATION_STEP_SECONDS = 1 / 30;
+var MAGNIFICATION_INFLUENCE_PADDING = 8;
+var DOCK_MAGNIFICATION_ENTRY_RAMP_MS = 90;
+var DOCK_MAGNIFICATION_MAIN_AXIS_EDGE_PADDING = DOCK_ICON_BASE_SIZE / 2;
+var DOCK_MAGNIFICATION_AMBIENT_EDGE_RANGE = 180;
+var DOCK_MAGNIFICATION_AMBIENT_VIEWPORT_PADDING = 8;
+var dockMagnificationShellBySlot = /* @__PURE__ */ new WeakMap();
 function roundDockMagnificationSize(size) {
   return Math.round(size * 10) / 10;
 }
@@ -9274,10 +9332,11 @@ function useDockMagnification({
   const animationFrameRef = useRef6(null);
   const lastFrameTimeRef = useRef6(null);
   const entryRampStartedAtRef = useRef6(null);
-  const restCentersRef = useRef6(null);
+  const centersRef = useRef6(null);
   const hitBoundsRef = useRef6(null);
   const visibleSlotRectsRef = useRef6(null);
   const slotOrderRef = useRef6([]);
+  const geometryBasisRef = useRef6(null);
   const magnifyActiveRef = useRef6(false);
   const globalPointerTrackerRef = useRef6(null);
   const handleGlobalPointerMoveRef = useRef6(() => {
@@ -9309,23 +9368,51 @@ function useDockMagnification({
     }
     lastFrameTimeRef.current = null;
   }, []);
-  const captureRestCenters = useCallback10(() => {
+  const updateProjectedGeometry = useCallback10(() => {
+    const basis = geometryBasisRef.current;
+    if (!basis) {
+      return;
+    }
+    const appliedSizes = /* @__PURE__ */ new Map();
+    for (const [anchorKey, style] of appliedStylesRef.current) {
+      appliedSizes.set(anchorKey, style.size);
+    }
+    const geometry = projectDockMagnificationGeometry({
+      appliedSizes,
+      dockPlacement,
+      mainAxisStartAligned: basis.mainAxisStartAligned,
+      order: slotOrderRef.current,
+      restRects: basis.slotRects
+    });
+    hitBoundsRef.current = resolveDockMagnificationVisibleHitBounds({
+      dockPlacement,
+      hitBounds: resolveDockMagnificationHitBounds(
+        geometry.slotRects,
+        dockPlacement
+      ),
+      mainAxisEdgePadding: DOCK_MAGNIFICATION_MAIN_AXIS_EDGE_PADDING,
+      viewportRect: basis.viewportRect
+    });
+    visibleSlotRectsRef.current = resolveDockMagnificationVisibleSlotRects({
+      slotRects: geometry.slotRects,
+      viewportRect: basis.viewportRect
+    });
+    centersRef.current = geometry.centers;
+  }, [dockPlacement]);
+  const captureBaseGeometry = useCallback10(() => {
     const slots = slotRefs.current;
-    const centers = /* @__PURE__ */ new Map();
-    const slotRects = [];
+    const slotRects = /* @__PURE__ */ new Map();
     const order = [];
     const viewportRect = dockViewportRef.current?.getBoundingClientRect();
     for (const [anchorKey, slotElement] of slots) {
       order.push(anchorKey);
       const rect = slotElement.getBoundingClientRect();
-      slotRects.push({
+      slotRects.set(anchorKey, {
         bottom: rect.bottom,
         left: rect.left,
         right: rect.right,
         top: rect.top
       });
-      const center = resolveDockMagnificationSlotCenter(rect, dockPlacement);
-      centers.set(anchorKey, center);
     }
     slotOrderRef.current = order;
     const visibleViewportRect = viewportRect ? {
@@ -9334,18 +9421,13 @@ function useDockMagnification({
       right: viewportRect.right,
       top: viewportRect.top
     } : null;
-    hitBoundsRef.current = resolveDockMagnificationVisibleHitBounds({
-      dockPlacement,
-      hitBounds: resolveDockMagnificationHitBounds(slotRects, dockPlacement),
-      mainAxisEdgePadding: DOCK_MAGNIFICATION_MAIN_AXIS_EDGE_PADDING,
-      viewportRect: visibleViewportRect
-    });
-    visibleSlotRectsRef.current = resolveDockMagnificationVisibleSlotRects({
+    geometryBasisRef.current = {
+      mainAxisStartAligned: dockRootRef.current?.hasAttribute("data-scroll-overflow") ?? false,
       slotRects,
       viewportRect: visibleViewportRect
-    });
-    restCentersRef.current = centers;
-  }, [dockPlacement, dockViewportRef, slotRefs]);
+    };
+    updateProjectedGeometry();
+  }, [dockRootRef, dockViewportRef, slotRefs, updateProjectedGeometry]);
   const isPointerInsideAnyVisibleDockSlot = useCallback10(
     (clientX, clientY) => {
       for (const rect of visibleSlotRectsRef.current ?? []) {
@@ -9362,10 +9444,10 @@ function useDockMagnification({
     []
   );
   const ensureDockMagnificationGeometry = useCallback10(() => {
-    if (restCentersRef.current === null || hitBoundsRef.current === null || visibleSlotRectsRef.current === null) {
-      captureRestCenters();
+    if (centersRef.current === null || hitBoundsRef.current === null || visibleSlotRectsRef.current === null) {
+      captureBaseGeometry();
     }
-  }, [captureRestCenters]);
+  }, [captureBaseGeometry]);
   const isPointerInsideDockMagnificationTarget = useCallback10(
     (clientX, clientY) => isDockMagnificationPointInsideHitBounds({
       clientX,
@@ -9382,7 +9464,6 @@ function useDockMagnification({
       }
       const pointerAxis = pointerAxisRef.current;
       if (pointerAxis !== null) {
-        captureRestCenters();
         entryRampStartedAtRef.current ??= frameTime;
       }
       const slots = slotRefs.current;
@@ -9402,7 +9483,7 @@ function useDockMagnification({
         if (!anchorKey) {
           continue;
         }
-        const center = restCentersRef.current?.get(anchorKey);
+        const center = centersRef.current?.get(anchorKey);
         if (center === void 0) {
           continue;
         }
@@ -9463,6 +9544,7 @@ function useDockMagnification({
           appliedStylesRef.current
         );
       }
+      updateProjectedGeometry();
       if (pointerAxis !== null) {
         shouldContinue = true;
       } else if (!allSettled) {
@@ -9470,10 +9552,11 @@ function useDockMagnification({
       }
       if (pointerAxis === null && allSettled) {
         entryRampStartedAtRef.current = null;
-        restCentersRef.current = null;
+        centersRef.current = null;
         hitBoundsRef.current = null;
         visibleSlotRectsRef.current = null;
         slotOrderRef.current = [];
+        geometryBasisRef.current = null;
         setMagnifyActive(false);
       }
       if (shouldContinue) {
@@ -9483,7 +9566,7 @@ function useDockMagnification({
       animationFrameRef.current = null;
       lastFrameTimeRef.current = null;
     },
-    [captureRestCenters, setMagnifyActive, slotRefs]
+    [setMagnifyActive, slotRefs, updateProjectedGeometry]
   );
   const scheduleAnimation = useCallback10(() => {
     if (animationFrameRef.current !== null) {
@@ -9612,13 +9695,13 @@ function useDockMagnification({
     document.addEventListener(
       "pointermove",
       handleAmbientPointerMove,
-      globalPointerListenerOptions
+      dockMagnificationPointerListenerOptions
     );
     return () => {
       document.removeEventListener(
         "pointermove",
         handleAmbientPointerMove,
-        globalPointerListenerOptions
+        dockMagnificationPointerListenerOptions
       );
       clearAmbientPointerSample();
     };
@@ -9637,10 +9720,11 @@ function useDockMagnification({
   const clearSlotMagnification = useCallback10(
     (anchorKey) => {
       springsRef.current.delete(anchorKey);
-      restCentersRef.current?.delete(anchorKey);
+      centersRef.current = null;
       appliedStylesRef.current.delete(anchorKey);
       hitBoundsRef.current = null;
       visibleSlotRectsRef.current = null;
+      geometryBasisRef.current = null;
       slotOrderRef.current = slotOrderRef.current.filter(
         (key) => key !== anchorKey
       );
@@ -9667,10 +9751,11 @@ function useDockMagnification({
     }
     springsRef.current.clear();
     appliedStylesRef.current.clear();
-    restCentersRef.current = null;
+    centersRef.current = null;
     hitBoundsRef.current = null;
     visibleSlotRectsRef.current = null;
     slotOrderRef.current = [];
+    geometryBasisRef.current = null;
     pointerAxisRef.current = null;
     pendingPointerAxisRef.current = null;
     entryRampStartedAtRef.current = null;
@@ -10144,7 +10229,7 @@ var dockPopupMinimizedStackLaunchDisappearMs = 0;
 var dockPopupMinimizedStackPopupZIndex = 100300;
 var dockPopupPreviewCacheMaxEntries = 64;
 var dockPopupPreviewByMemoryKey = /* @__PURE__ */ new Map();
-var pendingDockPopupPreviewMemoryKeys = /* @__PURE__ */ new Set();
+var pendingDockPopupPreviewCaptureKeys = /* @__PURE__ */ new Set();
 var popupCardMagnificationRange = 160;
 var popupCardMaxScale = 1.16;
 var popupCardMaxLiftPx = 10;
@@ -10235,6 +10320,7 @@ function WorkbenchHostDockPopup({
   const resolvedVariant = variant ?? "default";
   const isMinimizedStack = resolvedVariant === "minimized-stack";
   const isContextMenu = resolvedVariant === "context-menu";
+  const hasCapturePreview = Boolean(capturePreview);
   const createCardCount = showCreateNew === false ? 0 : 1;
   const cardElementsRef = useRef8(/* @__PURE__ */ new Map());
   const cardRefCallbacksRef = useRef8(
@@ -10246,6 +10332,16 @@ function WorkbenchHostDockPopup({
   const [minimizedStackScrollOffset, setMinimizedStackScrollOffset] = useState7(0);
   const [verticalClampOffsetPx, setVerticalClampOffsetPx] = useState7(0);
   const [capturedPreviewByMemoryKey, setCapturedPreviewByMemoryKey] = useState7({});
+  const capturedPreviewByMemoryKeyRef = useRef8(capturedPreviewByMemoryKey);
+  const capturePreviewRef = useRef8(capturePreview);
+  const debugDiagnosticsRef = useRef8(debugDiagnostics);
+  const dockPreviewCacheRef = useRef8(dockPreviewCache);
+  const resolveDockPreviewCacheKeyRef = useRef8(resolveDockPreviewCacheKey2);
+  capturedPreviewByMemoryKeyRef.current = capturedPreviewByMemoryKey;
+  capturePreviewRef.current = capturePreview;
+  debugDiagnosticsRef.current = debugDiagnostics;
+  dockPreviewCacheRef.current = dockPreviewCache;
+  resolveDockPreviewCacheKeyRef.current = resolveDockPreviewCacheKey2;
   const columnCount = isContextMenu ? 1 : Math.min(Math.max(items.length + createCardCount, 1), 3);
   const popupWidthPx = isContextMenu ? 268 : columnCount * dockPopupCardWidthPx + Math.max(0, columnCount - 1) * dockPopupGridGapPx + dockPopupPanelPaddingInlinePx * 2 + dockPopupPanelBorderInlinePx;
   const popupCenterY = anchorRect.top + anchorRect.height / 2;
@@ -10434,9 +10530,18 @@ function WorkbenchHostDockPopup({
       window.removeEventListener("keydown", handleKeyDown);
     };
   }, [onClose]);
-  const previewCaptureKey = items.map(
-    (item) => `${item.node.id}:${previewCacheToken(item.preview)}:${item.previewRevision ?? ""}`
-  ).join("|");
+  const previewCaptureKey = items.map((item) => {
+    const previewMemoryKey = resolveDockPopupPreviewMemoryKey(
+      item.node,
+      resolveDockPreviewCacheKey2?.(item.node) ?? null
+    );
+    return [
+      previewMemoryKey,
+      item.isMinimized ? "minimized" : "visible",
+      previewCacheToken(item.preview),
+      item.previewRevision ?? ""
+    ].join(":");
+  }).join("|");
   useEffect9(() => {
     if (!isMinimizedStack) {
       return;
@@ -10465,20 +10570,25 @@ function WorkbenchHostDockPopup({
     return () => viewport.removeEventListener("wheel", handleWheel);
   }, [isMinimizedStack, minimizedStackMaxScrollOffset]);
   useEffect9(() => {
-    if (!capturePreview || isContextMenu) {
+    if (!capturePreviewRef.current || isContextMenu) {
       return;
     }
     let cancelled = false;
+    const startedCaptureKeys = /* @__PURE__ */ new Set();
     const missingItems = items.filter((item) => {
       const revision = item.previewRevision;
       const previewMemoryKey = resolveDockPopupPreviewMemoryKey(
         item.node,
-        resolveDockPreviewCacheKey2?.(item.node) ?? null
+        resolveDockPreviewCacheKeyRef.current?.(item.node) ?? null
+      );
+      const pendingCaptureKey = resolveDockPopupPreviewCaptureKey(
+        previewMemoryKey,
+        revision
       );
-      const capturedPreview = capturedPreviewByMemoryKey[previewMemoryKey] ?? readDockPopupPreviewImage(previewMemoryKey);
+      const capturedPreview = capturedPreviewByMemoryKeyRef.current[previewMemoryKey] ?? readDockPopupPreviewImage(previewMemoryKey);
       const hasCapturedPreview = capturedPreview !== void 0 && capturedPreview.revision === revision;
       const shouldCaptureMissingPreview = !item.preview && !hasCapturedPreview;
-      return shouldCaptureMissingPreview && !pendingDockPopupPreviewMemoryKeys.has(previewMemoryKey);
+      return shouldCaptureMissingPreview && !pendingDockPopupPreviewCaptureKeys.has(pendingCaptureKey);
     });
     if (missingItems.length === 0) {
       logWorkbenchDockPopupDebug(
@@ -10502,10 +10612,14 @@ function WorkbenchHostDockPopup({
       }
     );
     for (const item of missingItems) {
-      pendingDockPopupPreviewMemoryKeys.add(
-        resolveDockPopupPreviewMemoryKey(
-          item.node,
-          resolveDockPreviewCacheKey2?.(item.node) ?? null
+      const previewMemoryKey = resolveDockPopupPreviewMemoryKey(
+        item.node,
+        resolveDockPreviewCacheKeyRef.current?.(item.node) ?? null
+      );
+      pendingDockPopupPreviewCaptureKeys.add(
+        resolveDockPopupPreviewCaptureKey(
+          previewMemoryKey,
+          item.previewRevision
         )
       );
     }
@@ -10515,121 +10629,130 @@ function WorkbenchHostDockPopup({
           break;
         }
         const revision = item.previewRevision;
-        logWorkbenchDockPopupDebug(
-          "dock.popup.preview_capture.started",
-          debugDiagnostics,
-          {
-            isMinimized: item.isMinimized,
-            nodeId: item.node.id,
-            revision
-          }
-        );
         const previewMemoryKey = resolveDockPopupPreviewMemoryKey(
           item.node,
-          resolveDockPreviewCacheKey2?.(item.node) ?? null
+          resolveDockPreviewCacheKeyRef.current?.(item.node) ?? null
         );
-        const cacheKey = resolveDockPopupPreviewCacheKey(
-          resolveDockPreviewCacheKey2?.(item.node) ?? null,
+        const pendingCaptureKey = resolveDockPopupPreviewCaptureKey(
+          previewMemoryKey,
           revision
         );
-        if (item.isMinimized && cacheKey) {
-          const minimizedPersistedPreview = await readPersistedDockPreview(
-            dockPreviewCache,
-            cacheKey
+        startedCaptureKeys.add(pendingCaptureKey);
+        try {
+          logWorkbenchDockPopupDebug(
+            "dock.popup.preview_capture.started",
+            debugDiagnosticsRef.current,
+            {
+              isMinimized: item.isMinimized,
+              nodeId: item.node.id,
+              revision
+            }
+          );
+          const cacheKey = resolveDockPopupPreviewCacheKey(
+            resolveDockPreviewCacheKeyRef.current?.(item.node) ?? null,
+            revision
           );
+          if (item.isMinimized && cacheKey) {
+            const minimizedPersistedPreview = await readPersistedDockPreview(
+              dockPreviewCacheRef.current,
+              cacheKey
+            );
+            if (cancelled) {
+              break;
+            }
+            if (minimizedPersistedPreview) {
+              const persistedPreview = {
+                kind: "image",
+                src: minimizedPersistedPreview
+              };
+              writeCachedWorkbenchNodePreviewImage(
+                item.node.id,
+                minimizedPersistedPreview
+              );
+              writeDockPopupPreviewImage(
+                previewMemoryKey,
+                persistedPreview,
+                revision
+              );
+              setCapturedPreviewByMemoryKey((current) => ({
+                ...current,
+                [previewMemoryKey]: {
+                  preview: persistedPreview,
+                  revision
+                }
+              }));
+              continue;
+            }
+          }
+          const preview = normalizeDockPopupPreviewContentResult(
+            item.isMinimized ? await capturePreviewRef.current?.(item) ?? await captureWorkbenchNodePreviewImage(item.node.id, {
+              bypassCache: false
+            }) : await Promise.resolve(
+              capturePreviewRef.current?.(item) ?? null
+            ).catch(() => null),
+            revision
+          );
+          if (cancelled) {
+            break;
+          }
+          logWorkbenchDockPopupDebug(
+            "dock.popup.preview_capture.resolved",
+            debugDiagnosticsRef.current,
+            {
+              hasPreview: Boolean(preview),
+              nodeId: item.node.id,
+              providerRevision: preview?.revision ?? null,
+              revision
+            }
+          );
+          if (preview) {
+            if (preview.kind === "image") {
+              writeCachedWorkbenchNodePreviewImage(item.node.id, preview.src);
+            }
+            writeDockPopupPreviewImage(previewMemoryKey, preview, revision);
+            if (cacheKey && preview.kind === "image") {
+              dockPreviewCacheRef.current?.write({
+                key: cacheKey,
+                previewImageUrl: preview.src
+              });
+            }
+            setCapturedPreviewByMemoryKey((current) => ({
+              ...current,
+              [previewMemoryKey]: { preview, revision }
+            }));
+            continue;
+          }
+          const fallbackPersistedPreview = !item.isMinimized && cacheKey ? await readPersistedDockPreview(
+            dockPreviewCacheRef.current,
+            cacheKey
+          ) : null;
           if (cancelled) {
             break;
           }
-          if (minimizedPersistedPreview) {
-            const persistedPreview = {
-              kind: "image",
-              src: minimizedPersistedPreview
-            };
+          if (fallbackPersistedPreview) {
             writeCachedWorkbenchNodePreviewImage(
               item.node.id,
-              minimizedPersistedPreview
+              fallbackPersistedPreview
             );
+          }
+          if (fallbackPersistedPreview || item.isMinimized) {
+            const fallbackPreview = fallbackPersistedPreview ? { kind: "image", src: fallbackPersistedPreview } : null;
             writeDockPopupPreviewImage(
               previewMemoryKey,
-              persistedPreview,
+              fallbackPreview,
               revision
             );
+          }
+          if (!cancelled) {
+            const fallbackPreview = fallbackPersistedPreview ? { kind: "image", src: fallbackPersistedPreview } : null;
             setCapturedPreviewByMemoryKey((current) => ({
               ...current,
-              [previewMemoryKey]: {
-                preview: persistedPreview,
-                revision
-              }
+              [previewMemoryKey]: { preview: fallbackPreview, revision }
             }));
-            pendingDockPopupPreviewMemoryKeys.delete(previewMemoryKey);
-            continue;
-          }
-        }
-        const preview = normalizeDockPopupPreviewContentResult(
-          item.isMinimized ? await capturePreview?.(item) ?? await captureWorkbenchNodePreviewImage(item.node.id, {
-            bypassCache: false
-          }) : await Promise.resolve(capturePreview?.(item) ?? null).catch(
-            () => null
-          ),
-          revision
-        );
-        if (cancelled) {
-          break;
-        }
-        logWorkbenchDockPopupDebug(
-          "dock.popup.preview_capture.resolved",
-          debugDiagnostics,
-          {
-            hasPreview: Boolean(preview),
-            nodeId: item.node.id,
-            providerRevision: preview?.revision ?? null,
-            revision
-          }
-        );
-        if (preview) {
-          if (preview.kind === "image") {
-            writeCachedWorkbenchNodePreviewImage(item.node.id, preview.src);
-          }
-          writeDockPopupPreviewImage(previewMemoryKey, preview, revision);
-          if (cacheKey && preview.kind === "image") {
-            dockPreviewCache?.write({
-              key: cacheKey,
-              previewImageUrl: preview.src
-            });
           }
-          setCapturedPreviewByMemoryKey((current) => ({
-            ...current,
-            [previewMemoryKey]: { preview, revision }
-          }));
-          pendingDockPopupPreviewMemoryKeys.delete(previewMemoryKey);
-          continue;
-        }
-        const fallbackPersistedPreview = !item.isMinimized && cacheKey ? await readPersistedDockPreview(dockPreviewCache, cacheKey) : null;
-        if (cancelled) {
-          break;
-        }
-        if (fallbackPersistedPreview) {
-          writeCachedWorkbenchNodePreviewImage(
-            item.node.id,
-            fallbackPersistedPreview
-          );
-        }
-        if (fallbackPersistedPreview || item.isMinimized) {
-          const fallbackPreview = fallbackPersistedPreview ? { kind: "image", src: fallbackPersistedPreview } : null;
-          writeDockPopupPreviewImage(
-            previewMemoryKey,
-            fallbackPreview,
-            revision
-          );
-        }
-        if (!cancelled) {
-          const fallbackPreview = fallbackPersistedPreview ? { kind: "image", src: fallbackPersistedPreview } : null;
-          setCapturedPreviewByMemoryKey((current) => ({
-            ...current,
-            [previewMemoryKey]: { preview: fallbackPreview, revision }
-          }));
+        } finally {
+          pendingDockPopupPreviewCaptureKeys.delete(pendingCaptureKey);
         }
-        pendingDockPopupPreviewMemoryKeys.delete(previewMemoryKey);
       }
     })().catch(() => {
       for (const item of missingItems) {
@@ -10642,7 +10765,12 @@ function WorkbenchHostDockPopup({
           null,
           item.previewRevision
         );
-        pendingDockPopupPreviewMemoryKeys.delete(previewMemoryKey);
+        pendingDockPopupPreviewCaptureKeys.delete(
+          resolveDockPopupPreviewCaptureKey(
+            previewMemoryKey,
+            item.previewRevision
+          )
+        );
       }
       if (!cancelled) {
         setCapturedPreviewByMemoryKey((current) => ({
@@ -10665,22 +10793,20 @@ function WorkbenchHostDockPopup({
     return () => {
       cancelled = true;
       for (const item of missingItems) {
-        pendingDockPopupPreviewMemoryKeys.delete(
-          resolveDockPopupPreviewMemoryKey(
-            item.node,
-            resolveDockPreviewCacheKey2?.(item.node) ?? null
-          )
+        const previewMemoryKey = resolveDockPopupPreviewMemoryKey(
+          item.node,
+          resolveDockPreviewCacheKeyRef.current?.(item.node) ?? null
+        );
+        const pendingCaptureKey = resolveDockPopupPreviewCaptureKey(
+          previewMemoryKey,
+          item.previewRevision
         );
+        if (!startedCaptureKeys.has(pendingCaptureKey)) {
+          pendingDockPopupPreviewCaptureKeys.delete(pendingCaptureKey);
+        }
       }
     };
-  }, [
-    capturePreview,
-    dockPreviewCache,
-    isContextMenu,
-    items,
-    previewCaptureKey,
-    resolveDockPreviewCacheKey2
-  ]);
+  }, [hasCapturePreview, isContextMenu, previewCaptureKey]);
   const content = /* @__PURE__ */ jsx11(
     "div",
     {
@@ -11030,6 +11156,9 @@ function resolveDockPopupPreviewMemoryKey(node, cacheKey) {
     workspaceId: cacheKey.workspaceId
   })}`;
 }
+function resolveDockPopupPreviewCaptureKey(memoryKey, revision) {
+  return `${memoryKey}\0${revision ?? ""}`;
+}
 function normalizeDockPopupPreviewContentResult(preview, revision) {
   if (!preview) {
     return null;
@@ -14221,6 +14350,41 @@ var dockSeparatorOuterWidthPx = 8.1;
 var dockSlotWidthPx = 43.2;
 var desktopDockPlateChromeWidth = 15.3;
 
+// src/host/WorkbenchHostNodeBodyRenderer.tsx
+import { memo as memo2 } from "react";
+function WorkbenchHostNodeBodyRenderer(input) {
+  return input.definition.renderBody(input.context);
+}
+function areWorkbenchHostNodeBodyRendererPropsEqual(previous, next) {
+  const previousContext = previous.context;
+  const nextContext = next.context;
+  if (previous.definition !== next.definition || previousContext.activation !== nextContext.activation || previousContext.displayMode !== nextContext.displayMode || previousContext.externalNodeState !== nextContext.externalNodeState || previousContext.externalWorkspaceState !== nextContext.externalWorkspaceState || previousContext.host !== nextContext.host || previousContext.instanceId !== nextContext.instanceId || previousContext.instanceKey !== nextContext.instanceKey || previousContext.isDragging !== nextContext.isDragging || previousContext.isFocused !== nextContext.isFocused || previousContext.isResizing !== nextContext.isResizing || previousContext.isVisible !== nextContext.isVisible || previousContext.presentationMode !== nextContext.presentationMode || !areWorkbenchOptionalSizesEqual(
+    previousContext.previewViewport,
+    nextContext.previewViewport
+  )) {
+    return false;
+  }
+  const previousNode = previousContext.node;
+  const nextNode = nextContext.node;
+  if (previousNode.id !== nextNode.id || previousNode.kind !== nextNode.kind || previousNode.title !== nextNode.title || previousNode.displayMode !== nextNode.displayMode || previousNode.restoreFrame !== nextNode.restoreFrame || previousNode.isMinimized !== nextNode.isMinimized || previousNode.minimizedAtUnixMs !== nextNode.minimizedAtUnixMs || previousNode.sizeConstraints !== nextNode.sizeConstraints || previousNode.data !== nextNode.data) {
+    return false;
+  }
+  if (nextContext.isDragging || nextContext.isResizing) {
+    return previousNode.frame.width === nextNode.frame.width && previousNode.frame.height === nextNode.frame.height;
+  }
+  return areWorkbenchFramesEqual(previousNode.frame, nextNode.frame);
+}
+function areWorkbenchFramesEqual(previous, next) {
+  return previous.x === next.x && previous.y === next.y && previous.width === next.width && previous.height === next.height;
+}
+function areWorkbenchOptionalSizesEqual(previous, next) {
+  return previous === next || previous !== void 0 && next !== void 0 && previous.width === next.width && previous.height === next.height;
+}
+var MemoizedWorkbenchHostNodeBodyRenderer = memo2(
+  WorkbenchHostNodeBodyRenderer,
+  areWorkbenchHostNodeBodyRendererPropsEqual
+);
+
 // src/host/windowActions.ts
 function createWorkbenchHostNodeHeaderWindowActions(context, input = {}) {
   return {
@@ -14774,7 +14938,7 @@ function WorkbenchHostNodeRenderer(input) {
       resetKey,
       workspaceId: input.workspaceId,
       children: /* @__PURE__ */ jsx14(
-        WorkbenchHostNodeBodyRenderer,
+        MemoizedWorkbenchHostNodeBodyRenderer,
         {
           context: bodyContext,
           definition: input.definition
@@ -14813,7 +14977,7 @@ function WorkbenchHostNodeHeaderStateBridge(input) {
 function areWorkbenchHostNodeHeaderStateBridgePropsEqual(previous, next) {
   return previous.definition === next.definition && previous.externalStateSource === next.externalStateSource && previous.host === next.host && previous.workspaceId === next.workspaceId && previous.context.controller === next.context.controller && previous.context.isDragging === next.context.isDragging && previous.context.isFocused === next.context.isFocused && previous.context.isResizing === next.context.isResizing && previous.context.node === next.context.node && previous.context.renderRevision === next.context.renderRevision && previous.context.surfaceSize.width === next.context.surfaceSize.width && previous.context.surfaceSize.height === next.context.surfaceSize.height;
 }
-var MemoizedWorkbenchHostNodeHeaderStateBridge = memo2(
+var MemoizedWorkbenchHostNodeHeaderStateBridge = memo3(
   WorkbenchHostNodeHeaderStateBridge,
   areWorkbenchHostNodeHeaderStateBridgePropsEqual
 );
@@ -14833,12 +14997,12 @@ function areWorkbenchHostNodeHeaderRendererPropsEqual(previous, next) {
   if ((next.context.isDragging || next.context.isResizing) && next.hasFrameRenderKey) {
     return Object.is(previous.frameRenderKey, next.frameRenderKey);
   }
-  return areWorkbenchFramesEqual(previousNode.frame, nextNode.frame);
+  return areWorkbenchFramesEqual2(previousNode.frame, nextNode.frame);
 }
-function areWorkbenchFramesEqual(previous, next) {
+function areWorkbenchFramesEqual2(previous, next) {
   return previous.x === next.x && previous.y === next.y && previous.width === next.width && previous.height === next.height;
 }
-var MemoizedWorkbenchHostNodeHeaderRenderer = memo2(
+var MemoizedWorkbenchHostNodeHeaderRenderer = memo3(
   WorkbenchHostNodeHeaderRenderer,
   areWorkbenchHostNodeHeaderRendererPropsEqual
 );
@@ -14994,12 +15158,6 @@ var WorkbenchHostNodeRenderErrorBoundary = class extends Component {
     return this.props.children;
   }
 };
-function WorkbenchHostNodeBodyRenderer({
-  context,
-  definition
-}) {
-  return definition.renderBody(context);
-}
 function WorkbenchHostChromeRenderer({
   context,
   renderChrome