@tutti-os/workbench-surface 0.0.152 → 0.0.154

package/dist/index.js

@@ -1554,7 +1554,7 @@ function createWorkbenchController(initialState = {}, options = {}) {
 }
 
 // src/host/WorkbenchHost.tsx
-import { useMemo as useMemo8 } from "react";
+import { useMemo as useMemo9 } from "react";
 
 // src/mission-control/WorkbenchMissionControlOverlay.tsx
 import {
@@ -5721,8 +5721,16 @@ function combineContributionExternalStateSources(contributions) {
       }
       return null;
     },
-    subscribe(listener) {
-      const disposers = sources.map((source) => source.subscribe?.(listener)).filter((dispose) => Boolean(dispose));
+    subscribeNodeState(input, listener) {
+      const disposers = sources.map((source) => source.subscribeNodeState?.(input, listener)).filter((dispose) => Boolean(dispose));
+      return () => {
+        for (const dispose of disposers) {
+          dispose();
+        }
+      };
+    },
+    subscribeWorkspaceState(input, listener) {
+      const disposers = sources.map((source) => source.subscribeWorkspaceState?.(input, listener)).filter((dispose) => Boolean(dispose));
       return () => {
         for (const dispose of disposers) {
           dispose();
@@ -5794,7 +5802,7 @@ function resolveHostClosePreparer(contributions) {
 }
 
 // src/host/useWorkbenchHostRuntime.ts
-import { useEffect as useEffect6, useMemo as useMemo5, useState as useState5 } from "react";
+import { useEffect as useEffect6, useMemo as useMemo6, useState as useState5 } from "react";
 
 // src/store/createDerivedSnapshotGetter.ts
 function createDerivedSnapshotGetter(input) {
@@ -6668,14 +6676,11 @@ function projectedSubjectsEqual(left, right) {
 }
 
 // src/host/externalState.ts
-function readWorkbenchHostExternalState(input) {
-  if (!input.externalStateSource) {
-    return {
-      externalNodeState: null,
-      externalWorkspaceState: null
-    };
-  }
-  const nodeStateInput = {
+import { useCallback as useCallback8, useMemo as useMemo5, useSyncExternalStore } from "react";
+var noopSubscribe = () => () => {
+};
+function createWorkbenchHostExternalStateLookupInput(input) {
+  return {
     instanceId: input.node.data.instanceId,
     instanceKey: input.node.data.instanceKey ?? null,
     nodeId: input.node.id,
@@ -6683,6 +6688,59 @@ function readWorkbenchHostExternalState(input) {
     workspaceId: input.workspaceId,
     ...input.node.data.projectionSubject ? { subject: input.node.data.projectionSubject } : {}
   };
+}
+function useWorkbenchHostExternalState(input) {
+  const lookupInput = useMemo5(
+    () => createWorkbenchHostExternalStateLookupInput({
+      node: input.node,
+      workspaceId: input.workspaceId
+    }),
+    [input.node, input.workspaceId]
+  );
+  const workspaceInput = useMemo5(
+    () => ({ workspaceId: input.workspaceId }),
+    [input.workspaceId]
+  );
+  const subscribeNodeState = useCallback8(
+    (listener) => input.externalStateSource?.subscribeNodeState?.(lookupInput, listener) ?? noopSubscribe(),
+    [input.externalStateSource, lookupInput]
+  );
+  const getNodeState = useCallback8(
+    () => input.externalStateSource?.getNodeState(lookupInput) ?? input.node.data.snapshotNodeState ?? null,
+    [input.externalStateSource, input.node.data.snapshotNodeState, lookupInput]
+  );
+  const subscribeWorkspaceState = useCallback8(
+    (listener) => input.externalStateSource?.subscribeWorkspaceState?.(
+      workspaceInput,
+      listener
+    ) ?? noopSubscribe(),
+    [input.externalStateSource, workspaceInput]
+  );
+  const getWorkspaceState = useCallback8(
+    () => input.externalStateSource?.getWorkspaceState(workspaceInput) ?? null,
+    [input.externalStateSource, workspaceInput]
+  );
+  return {
+    externalNodeState: useSyncExternalStore(
+      subscribeNodeState,
+      getNodeState,
+      getNodeState
+    ),
+    externalWorkspaceState: useSyncExternalStore(
+      subscribeWorkspaceState,
+      getWorkspaceState,
+      getWorkspaceState
+    )
+  };
+}
+function readWorkbenchHostExternalState(input) {
+  if (!input.externalStateSource) {
+    return {
+      externalNodeState: null,
+      externalWorkspaceState: null
+    };
+  }
+  const nodeStateInput = createWorkbenchHostExternalStateLookupInput(input);
   const sourceNodeState = input.externalStateSource.getNodeState(nodeStateInput);
   return {
     externalNodeState: sourceNodeState ?? input.node.data.snapshotNodeState ?? null,
@@ -6796,7 +6854,7 @@ var WorkbenchHostSessionController = class {
   saveTimer = null;
   appliedSaveSequence = 0;
   saveSequence = 0;
-  externalStateUnsubscribe = null;
+  externalStatePersistenceSubscriptions = /* @__PURE__ */ new Map();
   leaseUnsubscribe = null;
   unsubscribe = null;
   constructor(input) {
@@ -6930,8 +6988,7 @@ var WorkbenchHostSessionController = class {
     this.leaseUnsubscribe = null;
     this.unsubscribe?.();
     this.unsubscribe = null;
-    this.externalStateUnsubscribe?.();
-    this.externalStateUnsubscribe = null;
+    this.disposeExternalStatePersistenceSubscriptions();
     if (this.saveTimer !== null) {
       globalThis.clearTimeout(this.saveTimer);
       this.saveTimer = null;
@@ -7031,8 +7088,7 @@ var WorkbenchHostSessionController = class {
   async loadInitialSnapshot(generation) {
     this.unsubscribe?.();
     this.unsubscribe = null;
-    this.externalStateUnsubscribe?.();
-    this.externalStateUnsubscribe = null;
+    this.disposeExternalStatePersistenceSubscriptions();
     if (this.saveTimer !== null) {
       globalThis.clearTimeout(this.saveTimer);
       this.saveTimer = null;
@@ -7529,17 +7585,50 @@ var WorkbenchHostSessionController = class {
     }
     this.unsubscribe = this.controller.subscribe(() => {
       this.schedulePersistedSnapshotWrite();
+      this.refreshExternalStatePersistenceSubscription();
     });
-    if (this.externalStateUnsubscribe === null) {
-      const source = this.input.externalStateSource;
-      const canReadSnapshotNodeState = typeof source?.getSnapshotNodeState === "function";
-      if (!canReadSnapshotNodeState) {
-        return;
+    this.refreshExternalStatePersistenceSubscription();
+  }
+  refreshExternalStatePersistenceSubscription() {
+    const source = this.input.externalStateSource;
+    if (typeof source?.getSnapshotNodeState !== "function" || !source.subscribeNodeState) {
+      this.disposeExternalStatePersistenceSubscriptions();
+      return;
+    }
+    const activeNodeIDs = /* @__PURE__ */ new Set();
+    for (const node of this.controller.getSnapshot().nodes) {
+      activeNodeIDs.add(node.id);
+      const lookupInput = createWorkbenchHostExternalStateLookupInput({
+        node,
+        workspaceId: this.input.workspaceId
+      });
+      const existing = this.externalStatePersistenceSubscriptions.get(node.id);
+      if (existing && sameExternalStateLookupInput(existing.lookupInput, lookupInput)) {
+        continue;
       }
-      this.externalStateUnsubscribe = source?.subscribe?.(() => {
-        this.schedulePersistedSnapshotWrite();
-      }) ?? null;
+      existing?.unsubscribe();
+      const unsubscribe = source.subscribeNodeState(
+        lookupInput,
+        () => this.schedulePersistedSnapshotWrite()
+      );
+      this.externalStatePersistenceSubscriptions.set(node.id, {
+        lookupInput,
+        unsubscribe
+      });
+    }
+    for (const [nodeID, subscription] of this.externalStatePersistenceSubscriptions) {
+      if (activeNodeIDs.has(nodeID)) {
+        continue;
+      }
+      subscription.unsubscribe();
+      this.externalStatePersistenceSubscriptions.delete(nodeID);
+    }
+  }
+  disposeExternalStatePersistenceSubscriptions() {
+    for (const subscription of this.externalStatePersistenceSubscriptions.values()) {
+      subscription.unsubscribe();
     }
+    this.externalStatePersistenceSubscriptions.clear();
   }
   disposeNodeLeases() {
     for (const lease of this.nodeLeases.values()) {
@@ -7609,6 +7698,9 @@ function withoutRuntimeNodeState(data) {
   delete next.runtimeNodeState;
   return next;
 }
+function sameExternalStateLookupInput(left, right) {
+  return left.instanceId === right.instanceId && left.instanceKey === right.instanceKey && left.nodeId === right.nodeId && left.subject === right.subject && left.typeId === right.typeId && left.workspaceId === right.workspaceId;
+}
 function withoutSnapshotNodeState(data) {
   const next = { ...data };
   delete next.snapshotNodeState;
@@ -7688,9 +7780,8 @@ function useWorkbenchHostRuntime({
   snapshotRepository,
   workspaceId
 }) {
-  const [externalStateRevision, bumpExternalStateRevision] = useState5(0);
   const [, bumpHydrationRevision] = useState5(0);
-  const hostSession = useMemo5(() => {
+  const hostSession = useMemo6(() => {
     logWorkbenchHostDebug("create-session", debugDiagnostics, {
       nodeTypeIDs: nodes.map((node) => node.typeId),
       projectedNodeCount: projectedNodes?.length ?? 0,
@@ -7715,32 +7806,32 @@ function useWorkbenchHostRuntime({
     snapshotRepository,
     workspaceId
   ]);
-  const hostI18n = useMemo5(() => createWorkbenchHostI18nRuntime(i18n), [i18n]);
-  const missionControlI18n = useMemo5(
+  const hostI18n = useMemo6(() => createWorkbenchHostI18nRuntime(i18n), [i18n]);
+  const missionControlI18n = useMemo6(
     () => createWorkbenchMissionControlI18nRuntime(i18n),
     [i18n]
   );
-  const windowChromeI18n = useMemo5(
+  const windowChromeI18n = useMemo6(
     () => createWorkbenchWindowChromeI18nRuntime(i18n),
     [i18n]
   );
-  const nodeDefinitionByType = useMemo5(
+  const nodeDefinitionByType = useMemo6(
     () => new Map(nodes.map((definition) => [definition.typeId, definition])),
     [nodes]
   );
   const isHydrating = hostSession.isHydrating?.() ?? false;
-  const missionControlAdapter = useMemo5(
+  const missionControlAdapter = useMemo6(
     () => missionControlEnabled && !isHydrating ? createWorkbenchHostMissionControlAdapter({
       activateNode: hostSession.activateNode.bind(hostSession),
       controller: hostSession.controller
     }) : null,
     [hostSession.controller, isHydrating, missionControlEnabled]
   );
-  const chromeController = useMemo5(
+  const chromeController = useMemo6(
     () => isHydrating ? createReadOnlyWorkbenchController(hostSession.controller) : hostSession.controller,
     [hostSession.controller, isHydrating]
   );
-  const chromeContext = useMemo5(
+  const chromeContext = useMemo6(
     () => ({
       activateNode: hostSession.activateNode.bind(hostSession),
       controller: chromeController,
@@ -7782,17 +7873,8 @@ function useWorkbenchHostRuntime({
   useEffect6(() => {
     hostSession.reconcileProjectedNodes(projectedNodes ?? []);
   }, [hostSession, projectedNodes]);
-  useEffect6(() => {
-    if (!externalStateSource?.subscribe) {
-      return void 0;
-    }
-    return externalStateSource.subscribe(() => {
-      bumpExternalStateRevision((revision) => revision + 1);
-    });
-  }, [externalStateSource, workspaceId]);
   return {
     chromeContext,
-    externalStateRevision,
     hostI18n,
     isHydrating,
     hostSession,
@@ -7838,14 +7920,14 @@ function logWorkbenchHostDebug(event, debugDiagnostics, payload) {
 }
 
 // src/host/useWorkbenchHostSurfaceRenderers.tsx
-import { Component, useCallback as useCallback11, useMemo as useMemo7 } from "react";
+import { Component, useCallback as useCallback12, useMemo as useMemo8 } from "react";
 
 // src/host/WorkbenchHostDock.tsx
 import {
-  useCallback as useCallback10,
+  useCallback as useCallback11,
   useEffect as useEffect10,
   useLayoutEffect as useLayoutEffect5,
-  useMemo as useMemo6,
+  useMemo as useMemo7,
   useRef as useRef8,
   useState as useState8
 } from "react";
@@ -7950,7 +8032,7 @@ function isWorkbenchDockEntryBlocked(entry) {
 }
 
 // src/host/dockMagnification.ts
-import { useCallback as useCallback8, useEffect as useEffect7, useRef as useRef5 } from "react";
+import { useCallback as useCallback9, useEffect as useEffect7, useRef as useRef5 } from "react";
 
 // src/host/dockMagnificationBounds.ts
 function resolveDockMagnificationViewportBounds(viewportRect, dockPlacement) {
@@ -8289,7 +8371,7 @@ function useDockMagnification({
   const handleGlobalPointerCancelRef = useRef5(() => {
     return;
   });
-  const setMagnifyActive = useCallback8(
+  const setMagnifyActive = useCallback9(
     (active) => {
       if (magnifyActiveRef.current === active) {
         return;
@@ -8303,14 +8385,14 @@ function useDockMagnification({
     },
     [dockRootRef]
   );
-  const stopAnimation = useCallback8(() => {
+  const stopAnimation = useCallback9(() => {
     if (animationFrameRef.current !== null) {
       cancelAnimationFrame(animationFrameRef.current);
       animationFrameRef.current = null;
     }
     lastFrameTimeRef.current = null;
   }, []);
-  const captureRestCenters = useCallback8(() => {
+  const captureRestCenters = useCallback9(() => {
     const slots = slotRefs.current;
     const centers = /* @__PURE__ */ new Map();
     const slotRects = [];
@@ -8347,7 +8429,7 @@ function useDockMagnification({
     });
     restCentersRef.current = centers;
   }, [dockPlacement, dockViewportRef, slotRefs]);
-  const isPointerInsideAnyVisibleDockSlot = useCallback8(
+  const isPointerInsideAnyVisibleDockSlot = useCallback9(
     (clientX, clientY) => {
       for (const rect of visibleSlotRectsRef.current ?? []) {
         if (isDockMagnificationPointInsideSlotRect({
@@ -8362,12 +8444,12 @@ function useDockMagnification({
     },
     []
   );
-  const ensureDockMagnificationGeometry = useCallback8(() => {
+  const ensureDockMagnificationGeometry = useCallback9(() => {
     if (restCentersRef.current === null || hitBoundsRef.current === null || visibleSlotRectsRef.current === null) {
       captureRestCenters();
     }
   }, [captureRestCenters]);
-  const isPointerInsideDockMagnificationTarget = useCallback8(
+  const isPointerInsideDockMagnificationTarget = useCallback9(
     (clientX, clientY) => isDockMagnificationPointInsideHitBounds({
       clientX,
       clientY,
@@ -8376,7 +8458,7 @@ function useDockMagnification({
     }) || isPointerInsideAnyVisibleDockSlot(clientX, clientY),
     [dockPlacement, isPointerInsideAnyVisibleDockSlot]
   );
-  const runAnimationFrame = useCallback8(
+  const runAnimationFrame = useCallback9(
     (frameTime) => {
       if (pendingPointerAxisRef.current !== null) {
         pointerAxisRef.current = pendingPointerAxisRef.current;
@@ -8486,16 +8568,16 @@ function useDockMagnification({
     },
     [captureRestCenters, setMagnifyActive, slotRefs]
   );
-  const scheduleAnimation = useCallback8(() => {
+  const scheduleAnimation = useCallback9(() => {
     if (animationFrameRef.current !== null) {
       return;
     }
     animationFrameRef.current = requestAnimationFrame(runAnimationFrame);
   }, [runAnimationFrame]);
-  const stopGlobalPointerTracking = useCallback8(() => {
+  const stopGlobalPointerTracking = useCallback9(() => {
     globalPointerTrackerRef.current?.stop();
   }, []);
-  const startGlobalPointerTracking = useCallback8(() => {
+  const startGlobalPointerTracking = useCallback9(() => {
     if (typeof document === "undefined") {
       return;
     }
@@ -8511,17 +8593,17 @@ function useDockMagnification({
     });
     globalPointerTrackerRef.current.start();
   }, []);
-  const clearTrackedPointer = useCallback8(() => {
+  const clearTrackedPointer = useCallback9(() => {
     pendingPointerAxisRef.current = null;
     pointerAxisRef.current = null;
     entryRampStartedAtRef.current = null;
     scheduleAnimation();
   }, [scheduleAnimation]);
-  const handleGlobalPointerCancel = useCallback8(() => {
+  const handleGlobalPointerCancel = useCallback9(() => {
     stopGlobalPointerTracking();
     clearTrackedPointer();
   }, [clearTrackedPointer, stopGlobalPointerTracking]);
-  const handlePointerMove = useCallback8(
+  const handlePointerMove = useCallback9(
     (clientX, clientY) => {
       ensureDockMagnificationGeometry();
       if (!isPointerInsideDockMagnificationTarget(clientX, clientY)) {
@@ -8630,12 +8712,12 @@ function useDockMagnification({
     handlePointerMove,
     isPointerInsideDockMagnificationTarget
   ]);
-  const handlePointerLeave = useCallback8(() => {
+  const handlePointerLeave = useCallback9(() => {
     pendingPointerAxisRef.current = null;
     pointerAxisRef.current = null;
     scheduleAnimation();
   }, [scheduleAnimation]);
-  const clearSlotMagnification = useCallback8(
+  const clearSlotMagnification = useCallback9(
     (anchorKey) => {
       springsRef.current.delete(anchorKey);
       restCentersRef.current?.delete(anchorKey);
@@ -8652,7 +8734,7 @@ function useDockMagnification({
     },
     [slotRefs]
   );
-  const pauseMagnification = useCallback8(() => {
+  const pauseMagnification = useCallback9(() => {
     stopGlobalPointerTracking();
     stopAnimation();
     pendingPointerAxisRef.current = null;
@@ -8660,7 +8742,7 @@ function useDockMagnification({
     entryRampStartedAtRef.current = null;
     lastFrameTimeRef.current = null;
   }, [stopAnimation, stopGlobalPointerTracking]);
-  const resetMagnification = useCallback8(() => {
+  const resetMagnification = useCallback9(() => {
     stopGlobalPointerTracking();
     stopAnimation();
     for (const slotElement of slotRefs.current.values()) {
@@ -8963,7 +9045,7 @@ function resolveWorkbenchMinimizedDockRestoreIntent(input) {
 // src/host/WorkbenchHostDockPopup.tsx
 import {
   forwardRef,
-  useCallback as useCallback9,
+  useCallback as useCallback10,
   useEffect as useEffect9,
   useLayoutEffect as useLayoutEffect4,
   useRef as useRef7,
@@ -9375,7 +9457,7 @@ function WorkbenchHostDockPopup({
     popupCenterY,
     popupDiagnosticKey
   ]);
-  const registerCard = useCallback9((nodeId) => {
+  const registerCard = useCallback10((nodeId) => {
     const existing = cardRefCallbacksRef.current.get(nodeId);
     if (existing) {
       return existing;
@@ -10117,7 +10199,7 @@ var WorkbenchHostDockPopupCard = forwardRef(function WorkbenchHostDockPopupCard2
     },
     []
   );
-  const handleSelect = useCallback9(() => {
+  const handleSelect = useCallback10(() => {
     if (!isMinimizedStack) {
       onSelectNode(item.node.id);
       return;
@@ -10131,7 +10213,7 @@ var WorkbenchHostDockPopupCard = forwardRef(function WorkbenchHostDockPopupCard2
       onSelectNode(item.node.id);
     }, dockPopupMinimizedStackLaunchDisappearMs);
   }, [isMinimizedStack, item.node.id, onSelectNode]);
-  const handleSelectKeyDown = useCallback9(
+  const handleSelectKeyDown = useCallback10(
     (event) => {
       if (event.key !== "Enter" && event.key !== " ") {
         return;
@@ -10316,7 +10398,7 @@ function WorkbenchHostDock({
   onMissionControlRequestOpen,
   workspaceId
 }) {
-  const minimizedNodeIDs = useMemo6(
+  const minimizedNodeIDs = useMemo7(
     () => new Set(context.minimizedNodes.map((node) => node.id)),
     [context.minimizedNodes]
   );
@@ -10374,14 +10456,14 @@ function WorkbenchHostDock({
   const collapsingMinimizedLaunchTimerRef = useRef8(
     /* @__PURE__ */ new Map()
   );
-  const clearHoverPanelCloseTimer = useCallback10(() => {
+  const clearHoverPanelCloseTimer = useCallback11(() => {
     if (hoverPanelCloseTimerRef.current === null) {
       return;
     }
     clearTimeout(hoverPanelCloseTimerRef.current);
     hoverPanelCloseTimerRef.current = null;
   }, []);
-  const clearHoverPanelOpenTimer = useCallback10(() => {
+  const clearHoverPanelOpenTimer = useCallback11(() => {
     if (hoverPanelOpenTimerRef.current === null) {
       return;
     }
@@ -10389,7 +10471,7 @@ function WorkbenchHostDock({
     hoverPanelOpenTimerRef.current = null;
     hoverPanelScheduledPointRef.current = null;
   }, []);
-  const clearLabelTooltipOpenTimer = useCallback10(() => {
+  const clearLabelTooltipOpenTimer = useCallback11(() => {
     if (labelTooltipOpenTimerRef.current === null) {
       return;
     }
@@ -10413,7 +10495,7 @@ function WorkbenchHostDock({
       clearLabelTooltipOpenTimer
     ]
   );
-  const clearCollapsingMinimizedLaunch = useCallback10((anchorKey) => {
+  const clearCollapsingMinimizedLaunch = useCallback11((anchorKey) => {
     const timer = collapsingMinimizedLaunchTimerRef.current.get(anchorKey);
     if (timer) {
       clearTimeout(timer);
@@ -10432,7 +10514,7 @@ function WorkbenchHostDock({
       return next;
     });
   }, []);
-  const scheduleCollapsingMinimizedLaunchClear = useCallback10(
+  const scheduleCollapsingMinimizedLaunchClear = useCallback11(
     (anchorKey) => {
       const existing = collapsingMinimizedLaunchTimerRef.current.get(anchorKey);
       if (existing) {
@@ -10484,7 +10566,7 @@ function WorkbenchHostDock({
       window.removeEventListener("resize", scheduleUpdate);
     };
   }, [dockPlacement]);
-  const flushPendingDockStateRefresh = useCallback10(() => {
+  const flushPendingDockStateRefresh = useCallback11(() => {
     if (!pendingDockStateRefreshRef.current) {
       return;
     }
@@ -10503,14 +10585,14 @@ function WorkbenchHostDock({
       setDockStateRevision((revision) => revision + 1);
     });
   }, [dockStateSource]);
-  const renderedDockEntries = useMemo6(
+  const renderedDockEntries = useMemo7(
     () => dockEntries.map((entry) => {
       const dynamicState = dockStateSource?.getEntryState(entry.id);
       return dynamicState ? { ...entry, ...dynamicState } : entry;
     }),
     [dockEntries, dockStateRevision, dockStateSource]
   );
-  const resolvedEntries = useMemo6(
+  const resolvedEntries = useMemo7(
     () => resolveWorkbenchDockEntries({
       dockEntries: renderedDockEntries,
       minimizedNodeIds: minimizedNodeIDs,
@@ -10518,7 +10600,7 @@ function WorkbenchHostDock({
     }),
     [context.nodes, minimizedNodeIDs, renderedDockEntries]
   );
-  const minimizedDockSlots = useMemo6(
+  const minimizedDockSlots = useMemo7(
     () => resolveWorkbenchMinimizedDockSlots({
       nodeDefinitions,
       nodes: context.minimizedNodes
@@ -10526,7 +10608,7 @@ function WorkbenchHostDock({
     [context.minimizedNodes, nodeDefinitions]
   );
   const { promotedNodeId, stackDispatching } = useMinimizedDockStackPromotion(minimizedDockSlots);
-  const dockItems = useMemo6(
+  const dockItems = useMemo7(
     () => createWorkbenchHostDockItems({
       minimizedDockSlots,
       resolvedEntries
@@ -10537,7 +10619,7 @@ function WorkbenchHostDock({
     dockItems,
     (nodeId) => context.genie.shouldAnimateMinimizedDockEnter(nodeId)
   );
-  const presentDockItemKeys = useMemo6(
+  const presentDockItemKeys = useMemo7(
     () => presentDockItems.map((item) => item.key).join("\n"),
     [presentDockItems]
   );
@@ -10546,7 +10628,7 @@ function WorkbenchHostDock({
     elementRefs: wallpaperToneElementRefs,
     itemKeys: presentDockItemKeys
   });
-  const dockWidth = useMemo6(
+  const dockWidth = useMemo7(
     () => resolveWorkbenchHostDockItemsWidth(dockItems),
     [dockItems]
   );
@@ -10576,7 +10658,7 @@ function WorkbenchHostDock({
   registerDockAnchorRef.current = (anchorKey, element) => {
     context.genie.registerDockAnchor(anchorKey, element);
   };
-  const registerWallpaperToneElement = useCallback10(
+  const registerWallpaperToneElement = useCallback11(
     (key) => (element) => {
       if (element) {
         wallpaperToneElementRefs.current.set(key, element);
@@ -10586,7 +10668,7 @@ function WorkbenchHostDock({
     },
     []
   );
-  const setDockHoverPanelOpen = useCallback10((open) => {
+  const setDockHoverPanelOpen = useCallback11((open) => {
     if (open) {
       dockMeasureRef.current?.setAttribute(
         "data-dock-hover-panel-open",
@@ -10602,7 +10684,7 @@ function WorkbenchHostDock({
   useEffect10(() => {
     activeLabelTooltipRef.current = activeLabelTooltip;
   }, [activeLabelTooltip]);
-  const closeLabelTooltipImmediate = useCallback10(
+  const closeLabelTooltipImmediate = useCallback11(
     (targetKey) => {
       clearLabelTooltipOpenTimer();
       if (targetKey !== void 0 && activeLabelTooltipRef.current?.key !== targetKey) {
@@ -10616,7 +10698,7 @@ function WorkbenchHostDock({
     },
     [clearLabelTooltipOpenTimer]
   );
-  const closeHoverPanelImmediate = useCallback10(
+  const closeHoverPanelImmediate = useCallback11(
     (entryId) => {
       clearHoverPanelOpenTimer();
       clearHoverPanelCloseTimer();
@@ -10639,7 +10721,7 @@ function WorkbenchHostDock({
       setDockHoverPanelOpen
     ]
   );
-  const scheduleHoverPanelClose = useCallback10(
+  const scheduleHoverPanelClose = useCallback11(
     (entryId) => {
       clearHoverPanelOpenTimer();
       clearHoverPanelCloseTimer();
@@ -10656,7 +10738,7 @@ function WorkbenchHostDock({
       handleDockPointerLeave
     ]
   );
-  const showHoverPanel = useCallback10(
+  const showHoverPanel = useCallback11(
     (entryId, anchorKey, anchorElement) => {
       const dockElement = dockMeasureRef.current;
       if (!dockElement) {
@@ -10682,7 +10764,7 @@ function WorkbenchHostDock({
     },
     [clearHoverPanelCloseTimer, pauseDockMagnification, setDockHoverPanelOpen]
   );
-  const scheduleHoverPanelAfterRest = useCallback10(
+  const scheduleHoverPanelAfterRest = useCallback11(
     (entryId, anchorKey) => {
       hoverPanelRestTargetRef.current = { anchorKey, entryId };
       clearHoverPanelOpenTimer();
@@ -10703,7 +10785,7 @@ function WorkbenchHostDock({
     },
     [clearHoverPanelOpenTimer, showHoverPanel]
   );
-  const showLabelTooltip = useCallback10(
+  const showLabelTooltip = useCallback11(
     (target, anchorKey, anchorElement) => {
       const dockElement = dockMeasureRef.current;
       if (!dockElement) {
@@ -10728,7 +10810,7 @@ function WorkbenchHostDock({
     },
     [clearLabelTooltipOpenTimer]
   );
-  const scheduleLabelTooltipAfterRest = useCallback10(
+  const scheduleLabelTooltipAfterRest = useCallback11(
     (target, anchorKey) => {
       clearLabelTooltipOpenTimer();
       labelTooltipScheduledPointRef.current = null;
@@ -10744,7 +10826,7 @@ function WorkbenchHostDock({
     },
     [clearLabelTooltipOpenTimer, showLabelTooltip]
   );
-  const resolveHoverPanelTargetAtPoint = useCallback10(
+  const resolveHoverPanelTargetAtPoint = useCallback11(
     (clientX, clientY) => {
       for (const [anchorKey, slotElement] of slotRefs.current) {
         const entryId = slotElement.dataset.dockHoverPanelEntryId;
@@ -10760,7 +10842,7 @@ function WorkbenchHostDock({
     },
     []
   );
-  const resolveLabelTooltipTargetAtPoint = useCallback10(
+  const resolveLabelTooltipTargetAtPoint = useCallback11(
     (clientX, clientY) => {
       for (const [anchorKey, slotElement] of slotRefs.current) {
         if (slotElement.dataset.dockHoverPanelEntryId) {
@@ -10787,7 +10869,7 @@ function WorkbenchHostDock({
     },
     []
   );
-  const isPointerInsideActiveHoverPanelRegion = useCallback10(
+  const isPointerInsideActiveHoverPanelRegion = useCallback11(
     (clientX, clientY) => {
       const activeHoverPanel2 = activeHoverPanelRef.current;
       if (!activeHoverPanel2) {
@@ -10819,7 +10901,7 @@ function WorkbenchHostDock({
     },
     []
   );
-  const scheduleHoverPanelAtPointAfterRest = useCallback10(
+  const scheduleHoverPanelAtPointAfterRest = useCallback11(
     (clientX, clientY) => {
       const scheduledPoint = hoverPanelScheduledPointRef.current;
       if (hoverPanelOpenTimerRef.current !== null && scheduledPoint && Math.abs(clientX - scheduledPoint.clientX) <= dockHoverPanelPointerRestTolerancePx && Math.abs(clientY - scheduledPoint.clientY) <= dockHoverPanelPointerRestTolerancePx) {
@@ -10847,7 +10929,7 @@ function WorkbenchHostDock({
     },
     [clearHoverPanelOpenTimer, resolveHoverPanelTargetAtPoint, showHoverPanel]
   );
-  const scheduleLabelTooltipAtPointAfterRest = useCallback10(
+  const scheduleLabelTooltipAtPointAfterRest = useCallback11(
     (clientX, clientY) => {
       if (activeLabelTooltipRef.current !== null) {
         return;
@@ -10877,7 +10959,7 @@ function WorkbenchHostDock({
       showLabelTooltip
     ]
   );
-  const beginDockIconInteraction = useCallback10(
+  const beginDockIconInteraction = useCallback11(
     (anchorKey) => {
       hoverPanelRestTargetRef.current = null;
       clearHoverPanelOpenTimer();
@@ -10892,20 +10974,20 @@ function WorkbenchHostDock({
       triggerDockBounce
     ]
   );
-  const isDockEntryClickThrottled = useCallback10(
+  const isDockEntryClickThrottled = useCallback11(
     (anchorKey) => {
       const throttledUntil = dockEntryClickThrottleUntilRef.current.get(anchorKey);
       return throttledUntil !== void 0 && Date.now() < throttledUntil;
     },
     []
   );
-  const claimDockEntryClick = useCallback10((anchorKey) => {
+  const claimDockEntryClick = useCallback11((anchorKey) => {
     dockEntryClickThrottleUntilRef.current.set(
       anchorKey,
       Date.now() + DOCK_ENTRY_CLICK_THROTTLE_MS
     );
   }, []);
-  const beginDockMinimizedInteraction = useCallback10(
+  const beginDockMinimizedInteraction = useCallback11(
     (anchorKey) => {
       hoverPanelRestTargetRef.current = null;
       clearHoverPanelOpenTimer();
@@ -10945,7 +11027,7 @@ function WorkbenchHostDock({
       pauseDockMagnification
     ]
   );
-  const runDockMinimizedLaunchAfterCollapse = useCallback10(
+  const runDockMinimizedLaunchAfterCollapse = useCallback11(
     (intent, launch) => {
       const { anchorKey } = intent;
       beginDockMinimizedInteraction(anchorKey);
@@ -10959,14 +11041,14 @@ function WorkbenchHostDock({
     },
     [beginDockMinimizedInteraction, scheduleCollapsingMinimizedLaunchClear]
   );
-  const runDockMinimizedStackLaunch = useCallback10(
+  const runDockMinimizedStackLaunch = useCallback11(
     (intent, launch) => {
       beginDockMinimizedInteraction();
       launch(intent);
     },
     [beginDockMinimizedInteraction]
   );
-  const handleDockPointerTravel = useCallback10(
+  const handleDockPointerTravel = useCallback11(
     (clientX, clientY) => {
       if (activeHoverPanelRef.current !== null) {
         closeLabelTooltipImmediate();
@@ -11001,7 +11083,7 @@ function WorkbenchHostDock({
       scheduleLabelTooltipAtPointAfterRest
     ]
   );
-  const updateDockScrollState = useCallback10(() => {
+  const updateDockScrollState = useCallback11(() => {
     const scrollElement = dockItemsRef.current;
     const viewportElement = dockMeasureRef.current;
     if (!scrollElement || !viewportElement) {
@@ -11073,13 +11155,29 @@ function WorkbenchHostDock({
   );
   useEffect10(() => {
     const shouldSubscribe = activePopup !== null || hasMinimizedPreviewCapture;
-    if (!shouldSubscribe || !externalStateSource?.subscribe) {
+    if (!shouldSubscribe || !externalStateSource?.subscribeNodeState) {
       return void 0;
     }
-    return externalStateSource.subscribe(() => {
-      setExternalStateRevision((revision) => revision + 1);
-    });
-  }, [activePopup, externalStateSource, hasMinimizedPreviewCapture]);
+    const nodes = activePopup ? context.nodes : context.minimizedNodes;
+    const disposers = nodes.map(
+      (node) => externalStateSource.subscribeNodeState?.(
+        createWorkbenchHostExternalStateLookupInput({ node, workspaceId }),
+        () => setExternalStateRevision((revision) => revision + 1)
+      )
+    );
+    return () => {
+      for (const dispose of disposers) {
+        dispose?.();
+      }
+    };
+  }, [
+    activePopup,
+    context.minimizedNodes,
+    context.nodes,
+    externalStateSource,
+    hasMinimizedPreviewCapture,
+    workspaceId
+  ]);
   useEffect10(() => {
     const nextAttentionIds = /* @__PURE__ */ new Set();
     for (const entry of renderedDockEntries) {
@@ -11130,7 +11228,7 @@ function WorkbenchHostDock({
     },
     []
   );
-  const captureMinimizedNodePreview = useCallback10(
+  const captureMinimizedNodePreview = useCallback11(
     async (node) => {
       const minimizedDock = nodeDefinitions.get(node.data.typeId)?.window?.minimizedDock;
       const capturePreview = minimizedDock?.kind === "snapshot" ? minimizedDock.capturePreview : void 0;
@@ -11161,7 +11259,7 @@ function WorkbenchHostDock({
       workspaceId
     ]
   );
-  const provideMinimizedNodePreview = useCallback10(
+  const provideMinimizedNodePreview = useCallback11(
     (node) => {
       const minimizedDock = nodeDefinitions.get(node.data.typeId)?.window?.minimizedDock;
       if (minimizedDock?.kind !== "component") {
@@ -11190,7 +11288,7 @@ function WorkbenchHostDock({
       workspaceId
     ]
   );
-  const provideMinimizedNodePreviewForNode = useCallback10(
+  const provideMinimizedNodePreviewForNode = useCallback11(
     (node) => {
       const minimizedDock = nodeDefinitions.get(node.data.typeId)?.window?.minimizedDock;
       return minimizedDock?.kind === "component" ? provideMinimizedNodePreview : void 0;
@@ -11226,7 +11324,7 @@ function WorkbenchHostDock({
       top: isVertical ? delta : 0
     });
   };
-  const registerDockSlot = useCallback10((anchorKey) => {
+  const registerDockSlot = useCallback11((anchorKey) => {
     const existing = dockSlotRefCallbacksRef.current.get(anchorKey);
     if (existing) {
       return existing;
@@ -11247,7 +11345,7 @@ function WorkbenchHostDock({
     dockSlotRefCallbacksRef.current.set(anchorKey, callback);
     return callback;
   }, []);
-  const runDockEntryAction = useCallback10(
+  const runDockEntryAction = useCallback11(
     (entryId, actionId) => {
       const actionKey = dockActionKey(entryId, actionId);
       if (pendingActionKeys.has(actionKey)) {
@@ -13105,7 +13203,7 @@ var DOCK_BOUNCE_MS = 600;
 var DOCK_ENTRY_CLICK_THROTTLE_MS = DOCK_BOUNCE_MS;
 function useDockBounce(slotRefs) {
   const timeoutsRef = useRef8(/* @__PURE__ */ new Map());
-  const clearDockBounce = useCallback10(
+  const clearDockBounce = useCallback11(
     (anchorKey) => {
       const timeout = timeoutsRef.current.get(anchorKey);
       const slotElement = slotRefs.current.get(anchorKey);
@@ -13128,7 +13226,7 @@ function useDockBounce(slotRefs) {
     },
     [clearDockBounce]
   );
-  const triggerDockBounce = useCallback10(
+  const triggerDockBounce = useCallback11(
     (anchorKey) => {
       const shouldRestartAnimation = clearDockBounce(anchorKey);
       const slotElement = slotRefs.current.get(anchorKey);
@@ -13230,11 +13328,12 @@ function createWorkbenchHostNodeHeaderWindowActions(context, input = {}) {
 // src/host/hostNodeContext.ts
 function createWorkbenchHostNodeBodyContext({
   context,
+  externalState,
   externalStateSource,
   host,
   workspaceId
 }) {
-  const externalState = readWorkbenchHostExternalState({
+  const resolvedExternalState = externalState ?? readWorkbenchHostExternalState({
     externalStateSource,
     node: context.node,
     workspaceId
@@ -13242,8 +13341,8 @@ function createWorkbenchHostNodeBodyContext({
   return {
     activation: context.node.data.activation ?? null,
     displayMode: context.node.displayMode,
-    externalNodeState: externalState.externalNodeState,
-    externalWorkspaceState: externalState.externalWorkspaceState,
+    externalNodeState: resolvedExternalState.externalNodeState,
+    externalWorkspaceState: resolvedExternalState.externalWorkspaceState,
     focus() {
       host.focusNode(context.node.id);
     },
@@ -13265,11 +13364,12 @@ function createWorkbenchHostNodeBodyContext({
 }
 function createWorkbenchHostNodeHeaderContext({
   context,
+  externalState,
   externalStateSource,
   host,
   workspaceId
 }) {
-  const externalState = readWorkbenchHostExternalState({
+  const resolvedExternalState = externalState ?? readWorkbenchHostExternalState({
     externalStateSource,
     node: context.node,
     workspaceId
@@ -13279,8 +13379,8 @@ function createWorkbenchHostNodeHeaderContext({
     defaultActions: context.defaultActions,
     displayMode: context.node.displayMode,
     dragHandleProps: context.dragHandleProps,
-    externalNodeState: externalState.externalNodeState,
-    externalWorkspaceState: externalState.externalWorkspaceState,
+    externalNodeState: resolvedExternalState.externalNodeState,
+    externalWorkspaceState: resolvedExternalState.externalWorkspaceState,
     instanceId: context.node.data.instanceId,
     instanceKey: context.node.data.instanceKey ?? null,
     isFocused: selectFocusedWorkbenchNode(host.getSnapshot())?.id === context.node.id,
@@ -13331,7 +13431,7 @@ function WorkbenchHostWindowActions({
 // src/host/useWorkbenchHostSurfaceRenderers.tsx
 import { jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
 function useWorkbenchHostSurfaceRenderers(input) {
-  const renderBottomChrome = useMemo7(() => {
+  const renderBottomChrome = useMemo8(() => {
     const renderChrome = input.renderBottomChrome;
     return renderChrome ? () => /* @__PURE__ */ jsx14(
       WorkbenchHostSurfaceRenderErrorBoundary,
@@ -13359,7 +13459,7 @@ function useWorkbenchHostSurfaceRenderers(input) {
     input.renderBottomChrome,
     input.workspaceId
   ]);
-  const renderTopChrome = useMemo7(() => {
+  const renderTopChrome = useMemo8(() => {
     const renderChrome = input.renderTopChrome;
     return renderChrome ? () => /* @__PURE__ */ jsx14(
       WorkbenchHostSurfaceRenderErrorBoundary,
@@ -13387,7 +13487,7 @@ function useWorkbenchHostSurfaceRenderers(input) {
     input.renderTopChrome,
     input.workspaceId
   ]);
-  const captureNodePreviewImage = useCallback11(
+  const captureNodePreviewImage = useCallback12(
     async (node) => {
       const definition = input.nodeDefinitionByType.get(node.data.typeId);
       const minimizedDock = definition?.window?.minimizedDock;
@@ -13420,7 +13520,7 @@ function useWorkbenchHostSurfaceRenderers(input) {
       input.workspaceId
     ]
   );
-  const renderDock = useCallback11(
+  const renderDock = useCallback12(
     (context) => /* @__PURE__ */ jsx14(
       WorkbenchHostSurfaceRenderErrorBoundary,
       {
@@ -13472,7 +13572,7 @@ function useWorkbenchHostSurfaceRenderers(input) {
       input.workspaceId
     ]
   );
-  const renderNode = useCallback11(
+  const renderNode = useCallback12(
     (context) => {
       const definition = input.nodeDefinitionByType.get(
         context.node.data.typeId
@@ -13480,44 +13580,27 @@ function useWorkbenchHostSurfaceRenderers(input) {
       if (!definition) {
         return null;
       }
-      const bodyContext = createWorkbenchHostNodeBodyContext({
-        context,
-        definition,
-        externalStateSource: input.externalStateSource,
-        host: input.hostSession,
-        workspaceId: input.workspaceId
-      });
       return /* @__PURE__ */ jsx14(
-        WorkbenchHostNodeRenderErrorBoundary,
+        WorkbenchHostNodeRenderer,
         {
           debugDiagnostics: input.debugDiagnostics,
-          node: context.node,
-          onErrorChange: (hasError) => definition.onBodyRenderErrorChange?.({
-            hasError,
-            node: context.node
-          }),
-          resetKey: `${context.node.id}:${context.node.data.typeId}:${input.externalStateRevision}`,
-          workspaceId: input.workspaceId,
-          children: /* @__PURE__ */ jsx14(
-            WorkbenchHostNodeBodyRenderer,
-            {
-              context: bodyContext,
-              definition
-            }
-          )
+          context,
+          definition,
+          externalStateSource: input.externalStateSource,
+          host: input.hostSession,
+          workspaceId: input.workspaceId
         }
       );
     },
     [
       input.debugDiagnostics,
       input.externalStateSource,
-      input.externalStateRevision,
       input.hostSession,
       input.nodeDefinitionByType,
       input.workspaceId
     ]
   );
-  const renderWindowActions = useCallback11(
+  const renderWindowActions = useCallback12(
     (context) => /* @__PURE__ */ jsx14(
       WorkbenchHostWindowActions,
       {
@@ -13529,7 +13612,7 @@ function useWorkbenchHostSurfaceRenderers(input) {
     ),
     [input.hostI18n, input.hostSession, input.nodeDefinitionByType]
   );
-  const renderWindowHeader = useCallback11(
+  const renderWindowHeader = useCallback12(
     (context) => {
       const definition = input.nodeDefinitionByType.get(
         context.node.data.typeId
@@ -13537,39 +13620,39 @@ function useWorkbenchHostSurfaceRenderers(input) {
       if (!definition?.renderHeader) {
         return null;
       }
-      return definition.renderHeader(
-        createWorkbenchHostNodeHeaderContext({
+      return /* @__PURE__ */ jsx14(
+        WorkbenchHostNodeHeaderRenderer,
+        {
           context,
           definition,
           externalStateSource: input.externalStateSource,
           host: input.hostSession,
           workspaceId: input.workspaceId
-        })
+        }
       );
     },
     [
       input.externalStateSource,
-      input.externalStateRevision,
       input.hostSession,
       input.nodeDefinitionByType,
       input.workspaceId
     ]
   );
-  const shouldKeepMinimizedNodeMounted = useCallback11(
+  const shouldKeepMinimizedNodeMounted = useCallback12(
     (node) => {
       const capability = input.nodeDefinitionByType.get(node.data.typeId)?.window?.keepMountedWhenMinimized;
       return typeof capability === "function" ? capability(node) : capability === true;
     },
     [input.nodeDefinitionByType]
   );
-  const shouldCaptureNodePreviewImage = useCallback11(
+  const shouldCaptureNodePreviewImage = useCallback12(
     (node) => {
       const minimizedDock = input.nodeDefinitionByType.get(node.data.typeId)?.window?.minimizedDock;
       return minimizedDock?.kind !== "component";
     },
     [input.nodeDefinitionByType]
   );
-  const renderNodeGeniePreview = useCallback11(
+  const renderNodeGeniePreview = useCallback12(
     (node, {
       previewViewport
     }) => {
@@ -13603,7 +13686,7 @@ function useWorkbenchHostSurfaceRenderers(input) {
       input.workspaceId
     ]
   );
-  const resolveDockAnchorKey = useCallback11(
+  const resolveDockAnchorKey = useCallback12(
     (node) => {
       if (node.isMinimized && isWorkbenchMinimizedDockEligibleNode({
         node,
@@ -13636,7 +13719,7 @@ function useWorkbenchHostSurfaceRenderers(input) {
     },
     [input.dockEntries, input.hostSession, input.nodeDefinitionByType]
   );
-  const resolveDockPreviewCacheKey2 = useCallback11(
+  const resolveDockPreviewCacheKey2 = useCallback12(
     (node) => ({
       instanceId: node.data.instanceId,
       instanceKey: node.data.instanceKey ?? null,
@@ -13646,16 +13729,16 @@ function useWorkbenchHostSurfaceRenderers(input) {
     }),
     [input.workspaceId]
   );
-  const windowChromeMode = useCallback11(
+  const windowChromeMode = useCallback12(
     ({ node }) => input.nodeDefinitionByType.get(node.data.typeId)?.renderHeader ? "custom-header" : "system",
     [input.nodeDefinitionByType]
   );
-  const resolveWindowZIndex = useCallback11(({ baseZIndex }) => baseZIndex, []);
-  const resolveWindowSurfaceLayer = useCallback11(
+  const resolveWindowZIndex = useCallback12(({ baseZIndex }) => baseZIndex, []);
+  const resolveWindowSurfaceLayer = useCallback12(
     ({ node }) => input.nodeDefinitionByType.get(node.data.typeId)?.window?.surfaceLayer ?? "default",
     [input.nodeDefinitionByType]
   );
-  const resolveFullscreenHeaderMode = useCallback11(
+  const resolveFullscreenHeaderMode = useCallback12(
     ({ node }) => input.nodeDefinitionByType.get(node.data.typeId)?.window?.fullscreenHeaderMode,
     [input.nodeDefinitionByType]
   );
@@ -13678,6 +13761,72 @@ function useWorkbenchHostSurfaceRenderers(input) {
     windowChromeMode
   };
 }
+function WorkbenchHostNodeRenderer(input) {
+  const externalState = useWorkbenchHostExternalState({
+    externalStateSource: input.externalStateSource,
+    node: input.context.node,
+    workspaceId: input.workspaceId
+  });
+  const bodyContext = createWorkbenchHostNodeBodyContext({
+    context: input.context,
+    definition: input.definition,
+    externalState,
+    externalStateSource: input.externalStateSource,
+    host: input.host,
+    workspaceId: input.workspaceId
+  });
+  const resetKey = useMemo8(
+    () => [
+      input.context.node.id,
+      input.context.node.data.typeId,
+      externalState.externalNodeState,
+      externalState.externalWorkspaceState
+    ],
+    [
+      externalState.externalNodeState,
+      externalState.externalWorkspaceState,
+      input.context.node.data.typeId,
+      input.context.node.id
+    ]
+  );
+  return /* @__PURE__ */ jsx14(
+    WorkbenchHostNodeRenderErrorBoundary,
+    {
+      debugDiagnostics: input.debugDiagnostics,
+      node: input.context.node,
+      onErrorChange: (hasError) => input.definition.onBodyRenderErrorChange?.({
+        hasError,
+        node: input.context.node
+      }),
+      resetKey,
+      workspaceId: input.workspaceId,
+      children: /* @__PURE__ */ jsx14(
+        WorkbenchHostNodeBodyRenderer,
+        {
+          context: bodyContext,
+          definition: input.definition
+        }
+      )
+    }
+  );
+}
+function WorkbenchHostNodeHeaderRenderer(input) {
+  const externalState = useWorkbenchHostExternalState({
+    externalStateSource: input.externalStateSource,
+    node: input.context.node,
+    workspaceId: input.workspaceId
+  });
+  return input.definition.renderHeader?.(
+    createWorkbenchHostNodeHeaderContext({
+      context: input.context,
+      definition: input.definition,
+      externalState,
+      externalStateSource: input.externalStateSource,
+      host: input.host,
+      workspaceId: input.workspaceId
+    })
+  );
+}
 var WorkbenchHostSurfaceRenderErrorBoundary = class extends Component {
   state = {
     hasError: false
@@ -13730,7 +13879,7 @@ var WorkbenchHostNodeRenderErrorBoundary = class extends Component {
     return { hasError: true };
   }
   componentDidUpdate(previousProps) {
-    if (this.state.hasError && previousProps.resetKey !== this.props.resetKey) {
+    if (this.state.hasError && !Object.is(previousProps.resetKey, this.props.resetKey)) {
       this.setState({ hasError: false });
       this.props.onErrorChange?.(false);
     }
@@ -13879,7 +14028,7 @@ function WorkbenchHost({
   windowManagement,
   workspaceId
 }) {
-  const hostRuntimeConfig = useMemo8(
+  const hostRuntimeConfig = useMemo9(
     () => resolveWorkbenchHostRuntimeConfig({
       contributions,
       externalStateSource,
@@ -13895,7 +14044,7 @@ function WorkbenchHost({
       onNodeCloseRequest
     ]
   );
-  const hostDockEntries = useMemo8(
+  const hostDockEntries = useMemo9(
     () => resolveWorkbenchHostDockEntries({
       contributions,
       dockEntryPresentationOverrides,
@@ -13910,7 +14059,6 @@ function WorkbenchHost({
   const missionControlEnabled = missionControlMode !== null || onMissionControlAdapterReady !== void 0;
   const {
     chromeContext,
-    externalStateRevision,
     hostI18n,
     hostSession,
     isHydrating,
@@ -13941,7 +14089,6 @@ function WorkbenchHost({
     dockStateSource,
     dockEntries: hostDockEntries,
     externalStateSource: hostRuntimeConfig.externalStateSource,
-    externalStateRevision,
     hostI18n,
     hostSession,
     nodeDefinitionByType,