@tutti-os/workbench-surface 0.0.207 → 0.0.209

package/README.md

@@ -149,6 +149,12 @@ Layout rules:
 - fullscreen nodes respect top, left, and right safe area, but ignore bottom
   safe area so immersive content can reach the bottom edge of the workbench
   surface
+- persisted snapshots record the surface and layout constraints that produced
+  their frames; initial restore maps node frames, fullscreen restore frames,
+  space frames, and reusable closed-window frames into the current safe layout
+- legacy snapshots without a layout basis remain readable; fullscreen geometry
+  is recomputed and hidden restore frames are clamped before they become
+  floating windows
 
 The package ships a baseline host layout default so new integrations do not
 start with windows tucked under shared chrome. Today that default uses:

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { WorkbenchFrame as WorkbenchFrame$1, WorkbenchSnapshotDisplayModeV1, WorkbenchSnapshot, WorkbenchSnapshotNode } from '@tutti-os/workbench-snapshot';
+import { WorkbenchFrame as WorkbenchFrame$1, WorkbenchSnapshotDisplayModeV1, WorkbenchSnapshot, WorkbenchSnapshotNode, WorkbenchSnapshotLayoutBasisV1 } from '@tutti-os/workbench-snapshot';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { HTMLAttributes, ReactNode, CSSProperties } from 'react';
 import { I18nRuntime } from '@tutti-os/ui-i18n-runtime';
@@ -234,6 +234,7 @@ interface WorkbenchController<TData = unknown> extends WorkbenchStore<TData> {
 
 declare function createWorkbenchController<TData = unknown>(initialState?: Partial<WorkbenchState<TData>>, options?: {
     debugDiagnostics?: WorkbenchDebugDiagnostics;
+    onSurfaceSizeMeasured?: () => void;
 }): WorkbenchController<TData>;
 
 type WorkbenchMissionControlMode = "activate" | "layout";
@@ -916,7 +917,8 @@ interface CreateWorkbenchSnapshotFromStateOptions {
 declare function createWorkbenchNode<TData = unknown>(input: CreateWorkbenchNodeInput<TData>): WorkbenchNode<TData>;
 declare function createWorkbenchNodeFromSnapshot<TData = unknown>(snapshotNode: WorkbenchSnapshotNode): WorkbenchNode<TData>;
 declare function createWorkbenchStateFromSnapshot<TData = unknown>(snapshot: WorkbenchSnapshot): Pick<WorkbenchState<TData>, "nodeStack" | "nodes">;
-declare function createWorkbenchSnapshotFromState<TData = unknown>(state: Pick<WorkbenchState<TData>, "nodeStack" | "nodes">, options?: CreateWorkbenchSnapshotFromStateOptions): WorkbenchSnapshot;
+declare function createWorkbenchSnapshotFromState<TData = unknown>(state: Pick<WorkbenchState<TData>, "nodeStack" | "nodes"> & Partial<Pick<WorkbenchState<TData>, "layoutConstraints" | "surfaceSize">>, options?: CreateWorkbenchSnapshotFromStateOptions): WorkbenchSnapshot;
+declare function createWorkbenchSnapshotLayoutBasis(state: Partial<Pick<WorkbenchState, "layoutConstraints" | "surfaceSize">>): WorkbenchSnapshotLayoutBasisV1 | undefined;
 
 interface WorkbenchHostNodeIdentityInput {
     instanceId: string;
@@ -980,4 +982,4 @@ interface CreateMultiInstanceDockEntryOptionsInput {
 declare function createMultiInstanceDockEntryOptions(launchPayload?: unknown, input?: CreateMultiInstanceDockEntryOptionsInput): Pick<WorkbenchHostDockEntry, "allowNewWindowInDockPopup" | "instanceMode" | "launchBehavior" | "launchPayload" | "newWindowLaunchPayload">;
 declare function resolveWorkbenchDockCountBadge(activeNodeCount: number): WorkbenchHostDockEntry["badge"];
 
-export { type CreateWorkbenchNodeInput, type CreateWorkbenchSnapshotFromStateOptions, type ResolvedWorkbenchHostDockEntry, type WorkbenchContribution, type WorkbenchController, type WorkbenchDebugDiagnostics, type WorkbenchDisplayMode, WorkbenchDockComponentPreviewFrame, type WorkbenchDockComponentPreviewFrameProps, type WorkbenchDockContext, type WorkbenchDockPlacement, type WorkbenchDockPreviewCache, type WorkbenchDockPreviewCacheKey, type WorkbenchDockPreviewCacheKeyResolver, type WorkbenchDockPreviewContent, type WorkbenchFrame, type WorkbenchFullscreenHeaderMode, WorkbenchHost, type WorkbenchHostActivation, type WorkbenchHostActivationTarget, type WorkbenchHostChromeRenderContext, type WorkbenchHostCloseDialogRequest, type WorkbenchHostCloseDialogScope, type WorkbenchHostCloseDialogVariant, type WorkbenchHostCloseEffect, type WorkbenchHostClosePreparationContext, type WorkbenchHostClosePreparer, type WorkbenchHostDockClickResolution, type WorkbenchHostDockEntry, type WorkbenchHostDockEntryAction, type WorkbenchHostDockEntryBadge, type WorkbenchHostDockEntryDynamicState, type WorkbenchHostDockEntryLaunchBehavior, type WorkbenchHostDockEntryPresentationOverride, type WorkbenchHostDockEntryPresentationOverrides, type WorkbenchHostDockEntryState, type WorkbenchHostDockEntryStateKind, type WorkbenchHostDockEntryStateSource, type WorkbenchHostDockEntryVisibility, type WorkbenchHostDockNodeState, type WorkbenchHostDockPopupItemDescriptor, type WorkbenchHostDockPopupItemInput, type WorkbenchHostExternalStateLookupInput, type WorkbenchHostExternalStateSource, type WorkbenchHostHandle, type WorkbenchHostLaunchFramePolicy, type WorkbenchHostLaunchInput, type WorkbenchHostLaunchReason, type WorkbenchHostLaunchRequest, type WorkbenchHostLaunchResult, type WorkbenchHostMissionControlMode, type WorkbenchHostMissionControlProps, type WorkbenchHostMultiInstanceStrategy, type WorkbenchHostNodeBodyContext, type WorkbenchHostNodeCloseDecision, type WorkbenchHostNodeCloseRequest, type WorkbenchHostNodeData, type WorkbenchHostNodeDefinition, type WorkbenchHostNodeHeaderContext, type WorkbenchHostNodeHeaderFrameRenderKey, type WorkbenchHostNodeHeaderWindowActions, type WorkbenchHostNodeIdentityInput, type WorkbenchHostNodeInstanceStrategy, type WorkbenchHostNodeMinimizedDockCapability, type WorkbenchHostNodeWindowCapabilities, type WorkbenchHostProjectedNode, type WorkbenchHostProjectedNodeSubject, type WorkbenchHostProps, type WorkbenchHostSingleInstanceStrategy, type WorkbenchHostSnapshotRepository, type WorkbenchHostWindowCloseEffectContext, type WorkbenchLayoutConstraints, type WorkbenchLayoutConstraintsInput, type WorkbenchLayoutPreset, type WorkbenchMissionControlAdapter, type WorkbenchMissionControlMode, type WorkbenchMissionControlSnapshot, type WorkbenchNode, type WorkbenchNodeRenderFrame, type WorkbenchNodeSizeConstraints, type WorkbenchQuickLayoutTarget, type WorkbenchRenderNode, type WorkbenchRenderNodeContext, type WorkbenchRenderWindowActions, type WorkbenchRenderWindowHeader, type WorkbenchResolveFullscreenHeaderMode, type WorkbenchResolveWindowChromeMode, type WorkbenchResolveWindowChromeModeContext, type WorkbenchResolveWindowHeaderPresentation, type WorkbenchSafeArea, type WorkbenchSize, type WorkbenchState, WorkbenchSurface, type WorkbenchSurfacePresentation, type WorkbenchSurfaceProps, type WorkbenchSurfaceWallpaper, type WorkbenchSurfaceWallpaperFit, type WorkbenchWindowActionContext, WorkbenchWindowChromeI18nRuntime, type WorkbenchWindowChromeMode, type WorkbenchWindowHeaderContext, type WorkbenchWindowHeaderPresentation, type WorkbenchWindowManagementConfig, canCreateNewWindow, canCreateNewWindowInDockPopup, createDockNewWindowLaunchPayload, createMultiInstanceDockEntryOptions, createWorkbenchController, createWorkbenchHostLaunchedNodeId, createWorkbenchHostProjectedNodeId, createWorkbenchNode, createWorkbenchNodeFromSnapshot, createWorkbenchSnapshotFromState, createWorkbenchStateFromSnapshot, getWorkbenchLayoutFrame, isEditableShortcutTarget, matchWorkbenchDockEntryNode, resolveWorkbenchDockCountBadge, resolveWorkbenchDockEntries, resolveWorkbenchDockEntryClick, resolveWorkbenchHostPrepareClose, selectFocusedWorkbenchNode, useWorkbenchSelector, workbenchFocusInputActivationType };
+export { type CreateWorkbenchNodeInput, type CreateWorkbenchSnapshotFromStateOptions, type ResolvedWorkbenchHostDockEntry, type WorkbenchContribution, type WorkbenchController, type WorkbenchDebugDiagnostics, type WorkbenchDisplayMode, WorkbenchDockComponentPreviewFrame, type WorkbenchDockComponentPreviewFrameProps, type WorkbenchDockContext, type WorkbenchDockPlacement, type WorkbenchDockPreviewCache, type WorkbenchDockPreviewCacheKey, type WorkbenchDockPreviewCacheKeyResolver, type WorkbenchDockPreviewContent, type WorkbenchFrame, type WorkbenchFullscreenHeaderMode, WorkbenchHost, type WorkbenchHostActivation, type WorkbenchHostActivationTarget, type WorkbenchHostChromeRenderContext, type WorkbenchHostCloseDialogRequest, type WorkbenchHostCloseDialogScope, type WorkbenchHostCloseDialogVariant, type WorkbenchHostCloseEffect, type WorkbenchHostClosePreparationContext, type WorkbenchHostClosePreparer, type WorkbenchHostDockClickResolution, type WorkbenchHostDockEntry, type WorkbenchHostDockEntryAction, type WorkbenchHostDockEntryBadge, type WorkbenchHostDockEntryDynamicState, type WorkbenchHostDockEntryLaunchBehavior, type WorkbenchHostDockEntryPresentationOverride, type WorkbenchHostDockEntryPresentationOverrides, type WorkbenchHostDockEntryState, type WorkbenchHostDockEntryStateKind, type WorkbenchHostDockEntryStateSource, type WorkbenchHostDockEntryVisibility, type WorkbenchHostDockNodeState, type WorkbenchHostDockPopupItemDescriptor, type WorkbenchHostDockPopupItemInput, type WorkbenchHostExternalStateLookupInput, type WorkbenchHostExternalStateSource, type WorkbenchHostHandle, type WorkbenchHostLaunchFramePolicy, type WorkbenchHostLaunchInput, type WorkbenchHostLaunchReason, type WorkbenchHostLaunchRequest, type WorkbenchHostLaunchResult, type WorkbenchHostMissionControlMode, type WorkbenchHostMissionControlProps, type WorkbenchHostMultiInstanceStrategy, type WorkbenchHostNodeBodyContext, type WorkbenchHostNodeCloseDecision, type WorkbenchHostNodeCloseRequest, type WorkbenchHostNodeData, type WorkbenchHostNodeDefinition, type WorkbenchHostNodeHeaderContext, type WorkbenchHostNodeHeaderFrameRenderKey, type WorkbenchHostNodeHeaderWindowActions, type WorkbenchHostNodeIdentityInput, type WorkbenchHostNodeInstanceStrategy, type WorkbenchHostNodeMinimizedDockCapability, type WorkbenchHostNodeWindowCapabilities, type WorkbenchHostProjectedNode, type WorkbenchHostProjectedNodeSubject, type WorkbenchHostProps, type WorkbenchHostSingleInstanceStrategy, type WorkbenchHostSnapshotRepository, type WorkbenchHostWindowCloseEffectContext, type WorkbenchLayoutConstraints, type WorkbenchLayoutConstraintsInput, type WorkbenchLayoutPreset, type WorkbenchMissionControlAdapter, type WorkbenchMissionControlMode, type WorkbenchMissionControlSnapshot, type WorkbenchNode, type WorkbenchNodeRenderFrame, type WorkbenchNodeSizeConstraints, type WorkbenchQuickLayoutTarget, type WorkbenchRenderNode, type WorkbenchRenderNodeContext, type WorkbenchRenderWindowActions, type WorkbenchRenderWindowHeader, type WorkbenchResolveFullscreenHeaderMode, type WorkbenchResolveWindowChromeMode, type WorkbenchResolveWindowChromeModeContext, type WorkbenchResolveWindowHeaderPresentation, type WorkbenchSafeArea, type WorkbenchSize, type WorkbenchState, WorkbenchSurface, type WorkbenchSurfacePresentation, type WorkbenchSurfaceProps, type WorkbenchSurfaceWallpaper, type WorkbenchSurfaceWallpaperFit, type WorkbenchWindowActionContext, WorkbenchWindowChromeI18nRuntime, type WorkbenchWindowChromeMode, type WorkbenchWindowHeaderContext, type WorkbenchWindowHeaderPresentation, type WorkbenchWindowManagementConfig, canCreateNewWindow, canCreateNewWindowInDockPopup, createDockNewWindowLaunchPayload, createMultiInstanceDockEntryOptions, createWorkbenchController, createWorkbenchHostLaunchedNodeId, createWorkbenchHostProjectedNodeId, createWorkbenchNode, createWorkbenchNodeFromSnapshot, createWorkbenchSnapshotFromState, createWorkbenchSnapshotLayoutBasis, createWorkbenchStateFromSnapshot, getWorkbenchLayoutFrame, isEditableShortcutTarget, matchWorkbenchDockEntryNode, resolveWorkbenchDockCountBadge, resolveWorkbenchDockEntries, resolveWorkbenchDockEntryClick, resolveWorkbenchHostPrepareClose, selectFocusedWorkbenchNode, useWorkbenchSelector, workbenchFocusInputActivationType };

package/dist/index.js

@@ -776,7 +776,12 @@ function reduceWorkbenchState(state, action) {
         return {
           ...node,
           displayMode: "floating",
-          frame: node.restoreFrame ?? node.frame,
+          frame: clampWorkbenchRect(
+            node.restoreFrame ?? node.frame,
+            state.surfaceSize,
+            state.layoutConstraints,
+            node.sizeConstraints
+          ),
           restoreFrame: null
         };
       });
@@ -1427,14 +1432,21 @@ function createWorkbenchStore(initialState = {}, options = {}) {
     dispatch(action) {
       const nextState = reduceWorkbenchState(state, action);
       if (nextState === state) {
+        notifySurfaceSizeMeasured(action, options);
         return;
       }
       logWorkbenchFrameChanges(action, state, nextState, options);
       state = nextState;
       subscriptions.notify();
+      notifySurfaceSizeMeasured(action, options);
     }
   };
 }
+function notifySurfaceSizeMeasured(action, options) {
+  if (action.type === "setSurfaceSize") {
+    options.onSurfaceSizeMeasured?.();
+  }
+}
 function logWorkbenchFrameChanges(action, previousState, nextState, options) {
   if (!options.debugDiagnostics?.isEnabled()) {
     return;
@@ -6016,9 +6028,25 @@ function createWorkbenchSnapshotFromState(state, options = {}) {
     activeNodeId: state.nodeStack.at(-1) ?? null,
     spaces: options.spaces,
     activeSpaceId: options.activeSpaceId,
+    layoutBasis: createWorkbenchSnapshotLayoutBasis(state),
     metadata: options.metadata
   });
 }
+function createWorkbenchSnapshotLayoutBasis(state) {
+  if (!state.surfaceSize || !state.layoutConstraints || !isPositiveFinite(state.surfaceSize.width) || !isPositiveFinite(state.surfaceSize.height)) {
+    return void 0;
+  }
+  return {
+    surfaceSize: { ...state.surfaceSize },
+    layoutConstraints: {
+      ...state.layoutConstraints,
+      safeArea: { ...state.layoutConstraints.safeArea }
+    }
+  };
+}
+function isPositiveFinite(value) {
+  return Number.isFinite(value) && value > 0;
+}
 
 // src/core/placement.ts
 var WORKBENCH_WINDOW_CASCADE_OFFSET = 28;
@@ -6417,50 +6445,6 @@ function resolveCompactWorkbenchPreferredFrame(input) {
     input.sizeConstraints
   );
 }
-function compactRestoredWorkbenchHostNodes(input) {
-  if (!shouldUseCompactWorkbenchFrame(input.surfaceSize)) {
-    return [...input.nodes];
-  }
-  return input.nodes.map((node) => {
-    const sizeConstraints = node.sizeConstraints ?? input.nodeDefinitionByType.get(node.data.typeId)?.sizeConstraints ?? null;
-    if (node.displayMode === "fullscreen") {
-      return {
-        ...node,
-        frame: getWorkbenchFullscreenRect(
-          input.surfaceSize,
-          input.constraints,
-          sizeConstraints
-        )
-      };
-    }
-    const defaultFrame = input.nodeDefinitionByType.get(node.data.typeId)?.frame ?? node.frame;
-    const compactWidth = Math.round(
-      defaultFrame.width * COMPACT_LAUNCH_FRAME_SCALE
-    );
-    const compactHeight = Math.round(
-      defaultFrame.height * COMPACT_LAUNCH_FRAME_SCALE
-    );
-    const width = Math.min(node.frame.width, compactWidth);
-    const height = Math.min(node.frame.height, compactHeight);
-    const sizeChanged = width !== node.frame.width || height !== node.frame.height;
-    const layoutFrame = getWorkbenchLayoutFrame(
-      input.surfaceSize,
-      input.constraints
-    );
-    const frame = clampWorkbenchRect(
-      sizeChanged ? {
-        height,
-        width,
-        x: Math.round(layoutFrame.x + (layoutFrame.width - width) / 2),
-        y: Math.round(layoutFrame.y + (layoutFrame.height - height) / 2)
-      } : node.frame,
-      input.surfaceSize,
-      input.constraints,
-      sizeConstraints
-    );
-    return rectsEqual(node.frame, frame) ? node : { ...node, frame };
-  });
-}
 function shouldUseCompactWorkbenchFrame(surfaceSize) {
   return surfaceSize.width < COMPACT_LAUNCH_WIDTH_THRESHOLD;
 }
@@ -6469,6 +6453,7 @@ function createProjectedNodeID(typeId, instanceId) {
 }
 function persistedWorkbenchState(state, nodeDefinitionByType) {
   return {
+    layoutConstraints: state.layoutConstraints,
     nodeStack: state.nodeStack,
     nodes: state.nodes.filter((node) => {
       return nodeDefinitionByType.get(node.data.typeId)?.window?.persists !== false;
@@ -6482,7 +6467,8 @@ function persistedWorkbenchState(state, nodeDefinitionByType) {
         ...node.data.isProjected === true ? { isProjected: true } : {},
         typeId: node.data.typeId
       }
-    }))
+    })),
+    surfaceSize: state.surfaceSize
   };
 }
 function stateFromSnapshotOrDefinitions(snapshot, nodeDefinitions, projectedNodes = []) {
@@ -6771,6 +6757,174 @@ function projectedSubjectsEqual(left, right) {
   return left?.id === right?.id && left?.type === right?.type;
 }
 
+// src/core/snapshotLayout.ts
+function restoreWorkbenchFrameToLayout(input) {
+  const sourceLayoutBasis = input.sourceLayoutBasis;
+  if (!sourceLayoutBasis) {
+    return normalizeRestoredFrame(
+      clampWorkbenchRect(
+        input.frame,
+        input.targetSurfaceSize,
+        input.targetLayoutConstraints,
+        input.sizeConstraints
+      )
+    );
+  }
+  const sourceLayoutRect = getWorkbenchSafeLayoutRect(
+    sourceLayoutBasis.surfaceSize,
+    sourceLayoutBasis.layoutConstraints
+  );
+  const targetLayoutRect = getWorkbenchSafeLayoutRect(
+    input.targetSurfaceSize,
+    input.targetLayoutConstraints
+  );
+  const normalizedFrame = normalizeWorkbenchFrameToRect(
+    input.frame,
+    sourceLayoutRect
+  );
+  const restoredFrame = denormalizeWorkbenchFrameFromRect(
+    normalizedFrame,
+    targetLayoutRect
+  );
+  return normalizeRestoredFrame(
+    clampWorkbenchRect(
+      restoredFrame,
+      input.targetSurfaceSize,
+      input.targetLayoutConstraints,
+      input.sizeConstraints
+    )
+  );
+}
+function normalizeRestoredFrame(frame) {
+  return {
+    x: normalizeCoordinate(frame.x),
+    y: normalizeCoordinate(frame.y),
+    width: normalizeCoordinate(frame.width),
+    height: normalizeCoordinate(frame.height)
+  };
+}
+function normalizeCoordinate(value) {
+  const normalized = Number(value.toFixed(3));
+  return Object.is(normalized, -0) ? 0 : normalized;
+}
+
+// src/host/snapshotLayout.ts
+function restoreWorkbenchHostNodesToSurface(input) {
+  const persistedNodeById = new Map(
+    input.persistedNodes?.map((node) => [node.id, node])
+  );
+  return input.nodes.map((node) => {
+    const persistedNode = persistedNodeById.get(node.id);
+    const sourceNode = persistedNode ? {
+      ...node,
+      frame: persistedNode.frame,
+      restoreFrame: persistedNode.restoreFrame ?? null
+    } : node;
+    return restoreNodeToSurface(sourceNode, input);
+  });
+}
+function restoreWorkbenchHostSpacesToSurface(input) {
+  return input.spaces?.map((space) => {
+    if (!space.frame) {
+      return space;
+    }
+    const frame = restoreWorkbenchFrameToLayout({
+      frame: space.frame,
+      sourceLayoutBasis: input.layoutBasis,
+      targetLayoutConstraints: input.constraints,
+      targetSurfaceSize: input.surfaceSize
+    });
+    return rectsEqual(space.frame, frame) ? space : { ...space, frame };
+  });
+}
+function restoreClosedDockWindowFrameEntriesToSurface(input) {
+  const restoredEntries = /* @__PURE__ */ new Map();
+  for (const entry of input.entries) {
+    const definition = input.nodeDefinitionByType.get(entry.typeId);
+    const restoredEntry = {
+      ...entry,
+      frame: restoreWorkbenchFrameToLayout({
+        frame: entry.frame,
+        sourceLayoutBasis: input.layoutBasis,
+        targetLayoutConstraints: input.constraints,
+        targetSurfaceSize: input.surfaceSize,
+        sizeConstraints: definition?.sizeConstraints
+      })
+    };
+    restoredEntries.set(
+      closedDockWindowFrameEntryKey(restoredEntry),
+      restoredEntry
+    );
+  }
+  return restoredEntries;
+}
+function restoreNodeToSurface(node, input) {
+  const sizeConstraints = node.sizeConstraints ?? input.nodeDefinitionByType.get(node.data.typeId)?.sizeConstraints ?? null;
+  const restoreFrame = node.restoreFrame ? restoreWorkbenchFrameToLayout({
+    frame: node.restoreFrame,
+    sourceLayoutBasis: input.layoutBasis,
+    targetLayoutConstraints: input.constraints,
+    targetSurfaceSize: input.surfaceSize,
+    sizeConstraints
+  }) : null;
+  if (node.displayMode === "fullscreen") {
+    const frame2 = getWorkbenchFullscreenRect(
+      input.surfaceSize,
+      input.constraints,
+      sizeConstraints
+    );
+    return rectsEqual(node.frame, frame2) && nullableRectsEqual(node.restoreFrame, restoreFrame) ? node : { ...node, frame: frame2, restoreFrame };
+  }
+  if (input.layoutBasis) {
+    const frame2 = restoreWorkbenchFrameToLayout({
+      frame: node.frame,
+      sourceLayoutBasis: input.layoutBasis,
+      targetLayoutConstraints: input.constraints,
+      targetSurfaceSize: input.surfaceSize,
+      sizeConstraints
+    });
+    return rectsEqual(node.frame, frame2) && nullableRectsEqual(node.restoreFrame, restoreFrame) ? node : { ...node, frame: frame2, restoreFrame };
+  }
+  if (input.surfaceSize.width >= COMPACT_LAUNCH_WIDTH_THRESHOLD) {
+    const frame2 = clampWorkbenchRect(
+      node.frame,
+      input.surfaceSize,
+      input.constraints,
+      sizeConstraints
+    );
+    return rectsEqual(node.frame, frame2) && nullableRectsEqual(node.restoreFrame, restoreFrame) ? node : { ...node, frame: frame2, restoreFrame };
+  }
+  const defaultFrame = input.nodeDefinitionByType.get(node.data.typeId)?.frame ?? node.frame;
+  const compactWidth = Math.round(
+    defaultFrame.width * COMPACT_LAUNCH_FRAME_SCALE
+  );
+  const compactHeight = Math.round(
+    defaultFrame.height * COMPACT_LAUNCH_FRAME_SCALE
+  );
+  const width = Math.min(node.frame.width, compactWidth);
+  const height = Math.min(node.frame.height, compactHeight);
+  const sizeChanged = width !== node.frame.width || height !== node.frame.height;
+  const layoutFrame = getWorkbenchLayoutFrame(
+    input.surfaceSize,
+    input.constraints
+  );
+  const frame = clampWorkbenchRect(
+    sizeChanged ? {
+      height,
+      width,
+      x: Math.round(layoutFrame.x + (layoutFrame.width - width) / 2),
+      y: Math.round(layoutFrame.y + (layoutFrame.height - height) / 2)
+    } : node.frame,
+    input.surfaceSize,
+    input.constraints,
+    sizeConstraints
+  );
+  return rectsEqual(node.frame, frame) && nullableRectsEqual(node.restoreFrame, restoreFrame) ? node : { ...node, frame, restoreFrame };
+}
+function nullableRectsEqual(left, right) {
+  return left === right || left !== null && right !== null && rectsEqual(left, right);
+}
+
 // src/host/externalState.ts
 import { useCallback as useCallback9, useMemo as useMemo7, useSyncExternalStore } from "react";
 var noopSubscribe = () => () => {
@@ -6863,6 +7017,7 @@ function sanitizeWorkbenchHostSnapshot(snapshot) {
     activeNodeId: normalized.activeNodeId,
     spaces: normalized.spaces?.map(sanitizeSpace),
     activeSpaceId: normalized.activeSpaceId,
+    layoutBasis: normalized.layoutBasis,
     metadata: sanitizeMetadata(normalized.metadata)
   });
 }
@@ -6940,7 +7095,7 @@ var WorkbenchHostSessionController = class {
   loadPromise = null;
   nodeLeases = /* @__PURE__ */ new Map();
   nextActivationSequence = 1;
-  hasAppliedInitialCompactRestoredFrames = false;
+  hasAppliedInitialRestoredLayout = false;
   hasReceivedSurfaceSize = false;
   observedSurfaceSize = null;
   pendingProjectedNodeReconciliation = false;
@@ -6973,17 +7128,23 @@ var WorkbenchHostSessionController = class {
         this.nodeDefinitions,
         this.projectedNodes
       ),
-      { debugDiagnostics: input.debugDiagnostics }
+      {
+        debugDiagnostics: input.debugDiagnostics,
+        onSurfaceSizeMeasured: () => {
+          this.hasReceivedSurfaceSize = true;
+          this.applyInitialRestoredLayout();
+        }
+      }
     );
     this.observedSurfaceSize = this.controller.getSnapshot().surfaceSize;
     this.leaseUnsubscribe = this.controller.subscribe(() => {
       this.noteSurfaceSizeChange();
       this.reconcileNodeLeases();
-      this.applyInitialCompactRestoredFrames();
+      this.applyInitialRestoredLayout();
     });
     this.isSnapshotLoaded = this.loadedSnapshot !== null;
     if (this.isSnapshotLoaded) {
-      this.applyInitialCompactRestoredFrames();
+      this.applyInitialRestoredLayout();
       this.subscribeToPersistence();
     }
   }
@@ -7182,6 +7343,7 @@ var WorkbenchHostSessionController = class {
     return this.loadPromise;
   }
   async loadInitialSnapshot(generation) {
+    this.hasAppliedInitialRestoredLayout = false;
     this.unsubscribe?.();
     this.unsubscribe = null;
     this.disposeExternalStatePersistenceSubscriptions();
@@ -7225,7 +7387,7 @@ var WorkbenchHostSessionController = class {
     }
     this.reconcileNodeLeases();
     this.isSnapshotLoaded = true;
-    this.applyInitialCompactRestoredFrames();
+    this.applyInitialRestoredLayout();
     this.subscribeToPersistence();
     this.markReady();
   }
@@ -7499,7 +7661,7 @@ var WorkbenchHostSessionController = class {
   }
   resetHydrationBarrier() {
     this.isHydratingInitialSnapshot = true;
-    this.hasAppliedInitialCompactRestoredFrames = false;
+    this.hasAppliedInitialRestoredLayout = false;
     this.readyPromise = new Promise((resolve) => {
       this.resolveReady = resolve;
     });
@@ -7511,22 +7673,47 @@ var WorkbenchHostSessionController = class {
     }
     this.observedSurfaceSize = currentSurfaceSize;
   }
-  applyInitialCompactRestoredFrames() {
-    if (this.hasAppliedInitialCompactRestoredFrames || !this.isSnapshotLoaded || !this.hasReceivedSurfaceSize) {
+  applyInitialRestoredLayout() {
+    if (this.hasAppliedInitialRestoredLayout || !this.isSnapshotLoaded || !this.hasReceivedSurfaceSize) {
       return;
     }
     const snapshot = this.controller.getSnapshot();
-    const compactedNodes = compactRestoredWorkbenchHostNodes({
+    const sourceLayoutBasis = this.loadedSnapshot?.layoutBasis;
+    const restoredNodes = restoreWorkbenchHostNodesToSurface({
       constraints: snapshot.layoutConstraints,
+      layoutBasis: sourceLayoutBasis,
       nodeDefinitionByType: this.nodeDefinitionByType,
       nodes: snapshot.nodes,
+      persistedNodes: this.loadedSnapshot?.nodes,
       surfaceSize: snapshot.surfaceSize
     });
-    this.hasAppliedInitialCompactRestoredFrames = true;
-    if (shallowArrayEqual(snapshot.nodes, compactedNodes)) {
-      return;
+    this.closedDockWindowFrameEntries = restoreClosedDockWindowFrameEntriesToSurface({
+      constraints: snapshot.layoutConstraints,
+      entries: this.closedDockWindowFrameEntries.values(),
+      layoutBasis: sourceLayoutBasis,
+      nodeDefinitionByType: this.nodeDefinitionByType,
+      surfaceSize: snapshot.surfaceSize
+    });
+    if (this.loadedSnapshot) {
+      this.loadedSnapshot = {
+        ...this.loadedSnapshot,
+        layoutBasis: createWorkbenchSnapshotLayoutBasis(snapshot),
+        metadata: writeClosedDockWindowFrameEntries(
+          this.loadedSnapshot.metadata,
+          this.closedDockWindowFrameEntries.values()
+        ),
+        spaces: restoreWorkbenchHostSpacesToSurface({
+          constraints: snapshot.layoutConstraints,
+          layoutBasis: sourceLayoutBasis,
+          spaces: this.loadedSnapshot.spaces,
+          surfaceSize: snapshot.surfaceSize
+        })
+      };
+    }
+    this.hasAppliedInitialRestoredLayout = true;
+    if (!shallowArrayEqual(snapshot.nodes, restoredNodes)) {
+      this.controller.commands.replaceNodes(restoredNodes);
     }
-    this.controller.commands.replaceNodes(compactedNodes);
   }
   queueProjectedNodeReconciliation() {
     if (this.pendingProjectedNodeReconciliation) {
@@ -14428,6 +14615,7 @@ export {
   createWorkbenchNode,
   createWorkbenchNodeFromSnapshot,
   createWorkbenchSnapshotFromState,
+  createWorkbenchSnapshotLayoutBasis,
   createWorkbenchStateFromSnapshot,
   createWorkbenchWindowChromeI18nRuntime,
   getWorkbenchLayoutFrame,