@dxos/plugin-deck 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

package/dist/lib/browser/{chunk-QBKDUEDV.mjs → chunk-VUJ6UNIJ.mjs}

@@ -6,7 +6,7 @@ import {
   useHoistStatusbar,
   useMainSize,
   useNodeActionExpander
-} from "./chunk-7LJDT5OH.mjs";
+} from "./chunk-QKCGZ45E.mjs";
 import {
   calculateOverscroll,
   layoutAppliesTopbar,
@@ -14,117 +14,40 @@ import {
 } from "./chunk-CNTGBCMK.mjs";
 import {
   DeckCapabilities
-} from "./chunk-M57WD3V6.mjs";
+} from "./chunk-5KMJPIQC.mjs";
 import {
   DeckAction,
   NewPlankPositions,
   OverscrollOptions,
   PLANK_COMPANION_TYPE,
   getMode
-} from "./chunk-XL7EWOGI.mjs";
+} from "./chunk-F3VCCHVL.mjs";
 import {
-  DECK_PLUGIN
-} from "./chunk-Z5KITAZW.mjs";
+  meta
+} from "./chunk-UXLU6CMW.mjs";
 
 // src/components/DeckLayout/Banner.tsx
 import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
 import React9 from "react";
-import { Surface as Surface5 } from "@dxos/app-framework";
+import { Surface as Surface5 } from "@dxos/app-framework/react";
 import { useTranslation as useTranslation6 } from "@dxos/react-ui";
-import { mx as mx4 } from "@dxos/react-ui-theme";
+import { mx as mx5 } from "@dxos/react-ui-theme";
 
 // src/components/Sidebar/ComplementarySidebar.tsx
 import { useSignals as _useSignals7 } from "@preact-signals/safe-react/tracking";
 import React7, { Fragment as Fragment2, useCallback as useCallback5, useEffect as useEffect3, useMemo as useMemo3, useState as useState2 } from "react";
-import { LayoutAction as LayoutAction4, Surface as Surface3, createIntent as createIntent5, useCapability as useCapability3, useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework";
-import { Main, useTranslation as useTranslation5, toLocalizedString as toLocalizedString2, IconButton as IconButton4 } from "@dxos/react-ui";
+import { LayoutAction as LayoutAction4, createIntent as createIntent5 } from "@dxos/app-framework";
+import { Surface as Surface3, useCapability as useCapability3, useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework/react";
+import { IconButton as IconButton4, Main, toLocalizedString as toLocalizedString2, useTranslation as useTranslation5 } from "@dxos/react-ui";
 import { Tabs } from "@dxos/react-ui-tabs";
-
-// src/components/Sidebar/SidebarButton.tsx
-import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
-import React, { useCallback } from "react";
-import { createIntent, LayoutAction, useCapability, useIntentDispatcher } from "@dxos/app-framework";
-import { IconButton, useTranslation } from "@dxos/react-ui";
-var ToggleSidebarButton = ({ classNames, variant = "ghost" }) => {
-  var _effect = _useSignals();
-  try {
-    const layoutContext = useCapability(DeckCapabilities.MutableDeckState);
-    const { t } = useTranslation(DECK_PLUGIN);
-    return /* @__PURE__ */ React.createElement(IconButton, {
-      variant,
-      iconOnly: true,
-      icon: "ph--sidebar--regular",
-      size: 4,
-      label: t("open navigation sidebar label"),
-      onClick: () => layoutContext.sidebarState = layoutContext.sidebarState === "expanded" ? "collapsed" : "expanded",
-      classNames
-    });
-  } finally {
-    _effect.f();
-  }
-};
-var CloseSidebarButton = () => {
-  var _effect = _useSignals();
-  try {
-    const layoutContext = useCapability(DeckCapabilities.MutableDeckState);
-    const { t } = useTranslation(DECK_PLUGIN);
-    return /* @__PURE__ */ React.createElement(IconButton, {
-      variant: "ghost",
-      iconOnly: true,
-      icon: "ph--caret-line-left--regular",
-      size: 4,
-      label: t("close navigation sidebar label"),
-      onClick: () => layoutContext.sidebarState = "collapsed",
-      classNames: "rounded-none pli-1 dx-focus-ring-inset pie-[max(.5rem,env(safe-area-inset-left))]"
-    });
-  } finally {
-    _effect.f();
-  }
-};
-var ToggleComplementarySidebarButton = ({ inR0, classNames, current }) => {
-  var _effect = _useSignals();
-  try {
-    const { dispatchPromise: dispatch } = useIntentDispatcher();
-    const layoutContext = useCapability(DeckCapabilities.MutableDeckState);
-    const { t } = useTranslation(DECK_PLUGIN);
-    const companions = useDeckCompanions();
-    const handleClick = useCallback(async () => {
-      layoutContext.complementarySidebarState = layoutContext.complementarySidebarState === "expanded" ? "collapsed" : "expanded";
-      const firstCompanion = companions[0];
-      if (layoutContext.complementarySidebarState === "expanded" && !current && firstCompanion) {
-        await dispatch(createIntent(LayoutAction.UpdateComplementary, {
-          part: "complementary",
-          subject: getCompanionId(firstCompanion.id)
-        }));
-      }
-    }, [
-      layoutContext,
-      current,
-      companions,
-      dispatch
-    ]);
-    return /* @__PURE__ */ React.createElement(IconButton, {
-      iconOnly: true,
-      onClick: handleClick,
-      variant: "ghost",
-      label: t("open complementary sidebar label"),
-      classNames: [
-        "[&>svg]:-scale-x-100",
-        classNames
-      ],
-      icon: "ph--sidebar-simple--regular",
-      size: inR0 ? 5 : 4,
-      tooltipSide: inR0 ? "left" : void 0
-    });
-  } finally {
-    _effect.f();
-  }
-};
+import { mx as mx4 } from "@dxos/react-ui-theme";
 
 // src/components/Plank/Plank.tsx
-import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
-import React6, { memo as memo2, useCallback as useCallback4, useLayoutEffect, useMemo as useMemo2, useRef } from "react";
-import { LayoutAction as LayoutAction3, Surface as Surface2, createIntent as createIntent4, useCapability as useCapability2, useAppGraph as useAppGraph2, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
+import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
+import { useFocusFinders } from "@fluentui/react-tabster";
+import React5, { memo as memo2, useCallback as useCallback3, useLayoutEffect, useMemo as useMemo2, useRef } from "react";
+import { LayoutAction as LayoutAction2, createIntent as createIntent3 } from "@dxos/app-framework";
+import { Surface as Surface2, useAppGraph as useAppGraph2, useCapability, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework/react";
 import { debounce } from "@dxos/async";
 import { useNode } from "@dxos/plugin-graph";
 import { ATTENDABLE_PATH_SEPARATOR, useAttentionAttributes } from "@dxos/react-ui-attention";
@@ -132,35 +55,43 @@ import { StackItem as StackItem2, railGridHorizontal } from "@dxos/react-ui-stac
 import { mainIntrinsicSize, mx as mx3 } from "@dxos/react-ui-theme";
 
 // src/components/Plank/PlankError.tsx
-import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
-import React5, { useEffect as useEffect2, useState } from "react";
-import { useTranslation as useTranslation4 } from "@dxos/react-ui";
+import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
+import React4, { useEffect as useEffect2, useState } from "react";
+import { useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { descriptionMessage, mx as mx2 } from "@dxos/react-ui-theme";
 
 // src/components/Plank/PlankHeading.tsx
-import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
-import React3, { Fragment, memo, useCallback as useCallback3, useEffect, useMemo } from "react";
-import { createIntent as createIntent3, LayoutAction as LayoutAction2, Surface, useAppGraph, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
-import { Icon, IconButton as IconButton3, Popover, toLocalizedString, useTranslation as useTranslation3 } from "@dxos/react-ui";
+import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
+import React2, { Fragment, memo, useCallback as useCallback2, useEffect, useMemo } from "react";
+import { LayoutAction, createIntent as createIntent2 } from "@dxos/app-framework";
+import { Surface, useAppGraph, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework/react";
+import { Icon, IconButton as IconButton2, Popover, toLocalizedString, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { StackItem } from "@dxos/react-ui-stack";
 import { TextTooltip } from "@dxos/react-ui-text-tooltip";
 import { hoverableControls, hoverableFocusedWithinControls } from "@dxos/react-ui-theme";
 
+// src/components/fragments.ts
+import { mx } from "@dxos/react-ui-theme";
+var soloInlinePadding = "pis-[calc(env(safe-area-inset-left)+.25rem)] pie-[calc(env(safe-area-inset-left)+.25rem)]";
+var sidebarToggleStyles = "bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deckSurface lg:hidden";
+var fixedSidebarToggleStyles = mx(sidebarToggleStyles, "inline-start-2");
+var fixedComplementarySidebarToggleStyles = mx(sidebarToggleStyles, "inline-end-2");
+
 // src/components/Plank/PlankControls.tsx
-import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
-import React2, { forwardRef, useCallback as useCallback2 } from "react";
-import { createIntent as createIntent2, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
+import React, { forwardRef, useCallback } from "react";
+import { createIntent } from "@dxos/app-framework";
+import { useIntentDispatcher } from "@dxos/app-framework/react";
 import { invariant } from "@dxos/invariant";
-import { ButtonGroup, IconButton as IconButton2, useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { ButtonGroup, IconButton, useTranslation } from "@dxos/react-ui";
 var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-deck/src/components/Plank/PlankControls.tsx";
 var PlankControl = ({ icon, label: label3, ...props }) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
-    return /* @__PURE__ */ React2.createElement(IconButton2, {
-      iconOnly: true,
+    return /* @__PURE__ */ React.createElement(IconButton, {
       label: label3,
       icon,
-      size: 5,
+      iconOnly: true,
       variant: "ghost",
       tooltipSide: "bottom",
       ...props
@@ -171,29 +102,29 @@ var PlankControl = ({ icon, label: label3, ...props }) => {
 };
 var plankControlSpacing = "pli-2";
 var PlankCompanionControls = /* @__PURE__ */ forwardRef(({ primary }, forwardedRef) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
-    const { t } = useTranslation2(DECK_PLUGIN);
-    const { dispatchPromise: dispatch } = useIntentDispatcher2();
-    const handleCloseCompanion = useCallback2(() => {
+    const { t } = useTranslation(meta.id);
+    const { dispatchPromise: dispatch } = useIntentDispatcher();
+    const handleCloseCompanion = useCallback(() => {
       invariant(primary, void 0, {
         F: __dxlog_file,
-        L: 49,
+        L: 50,
         S: void 0,
         A: [
           "primary",
           ""
         ]
       });
-      return dispatch(createIntent2(DeckAction.ChangeCompanion, {
+      return dispatch(createIntent(DeckAction.ChangeCompanion, {
         primary,
         companion: null
       }));
     }, []);
-    return /* @__PURE__ */ React2.createElement("div", {
+    return /* @__PURE__ */ React.createElement("div", {
       ref: forwardedRef,
       className: "contents app-no-drag"
-    }, /* @__PURE__ */ React2.createElement(PlankControl, {
+    }, /* @__PURE__ */ React.createElement(PlankControl, {
       label: t("close companion label"),
       variant: "ghost",
       icon: "ph--x--regular",
@@ -205,52 +136,52 @@ var PlankCompanionControls = /* @__PURE__ */ forwardRef(({ primary }, forwardedR
   }
 });
 var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant = "default", capabilities, layoutMode, pin, close = false, onClick, ...props }, forwardedRef) => {
-  var _effect = _useSignals2();
+  var _effect = _useSignals();
   try {
-    const { t } = useTranslation2(DECK_PLUGIN);
+    const { t } = useTranslation(meta.id);
     const buttonClassNames = variant === "hide-disabled" ? `disabled:hidden ${plankControlSpacing}` : plankControlSpacing;
     const layoutIsAnySolo = !!layoutMode?.startsWith("solo");
-    return /* @__PURE__ */ React2.createElement(ButtonGroup, {
+    return /* @__PURE__ */ React.createElement(ButtonGroup, {
       ...props,
       classNames: [
         "app-no-drag !opacity-100",
         classNames
       ],
       ref: forwardedRef
-    }, capabilities.deck ? /* @__PURE__ */ React2.createElement(React2.Fragment, null, capabilities.solo && /* @__PURE__ */ React2.createElement(React2.Fragment, null, layoutMode === "solo" && /* @__PURE__ */ React2.createElement(PlankControl, {
+    }, capabilities.deck ? /* @__PURE__ */ React.createElement(React.Fragment, null, capabilities.solo && /* @__PURE__ */ React.createElement(React.Fragment, null, layoutMode === "solo" && /* @__PURE__ */ React.createElement(PlankControl, {
       label: t("show fullscreen plank label"),
       classNames: buttonClassNames,
       icon: "ph--corners-out--regular",
       onClick: () => onClick?.("solo--fullscreen")
-    }), /* @__PURE__ */ React2.createElement(PlankControl, {
+    }), /* @__PURE__ */ React.createElement(PlankControl, {
       label: t(layoutMode === "solo--fullscreen" ? "exit fullscreen label" : layoutIsAnySolo ? "show deck plank label" : "show solo plank label"),
       classNames: buttonClassNames,
       icon: layoutMode === "solo--fullscreen" ? "ph--corners-in--regular" : layoutIsAnySolo ? "ph--arrows-in-line-horizontal--regular" : "ph--arrows-out-line-horizontal--regular",
       onClick: () => onClick?.(layoutMode === "solo--fullscreen" ? "solo--fullscreen" : "solo")
-    })), !layoutIsAnySolo && /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(PlankControl, {
+    })), !layoutIsAnySolo && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(PlankControl, {
       label: t("increment start label"),
       disabled: !capabilities.incrementStart,
       classNames: buttonClassNames,
       icon: "ph--caret-left--regular",
       onClick: () => onClick?.("increment-start")
-    }), /* @__PURE__ */ React2.createElement(PlankControl, {
+    }), /* @__PURE__ */ React.createElement(PlankControl, {
       label: t("increment end label"),
       disabled: !capabilities.incrementEnd,
       classNames: buttonClassNames,
       icon: "ph--caret-right--regular",
       onClick: () => onClick?.("increment-end")
-    }))) : capabilities.fullscreen && /* @__PURE__ */ React2.createElement(PlankControl, {
+    }))) : capabilities.fullscreen && /* @__PURE__ */ React.createElement(PlankControl, {
       label: t(layoutMode === "solo--fullscreen" ? "exit fullscreen label" : "show fullscreen plank label"),
       classNames: buttonClassNames,
       icon: layoutMode === "solo--fullscreen" ? "ph--corners-in--regular" : "ph--corners-out--regular",
       onClick: () => onClick?.("solo--fullscreen")
-    }), close && !layoutIsAnySolo && /* @__PURE__ */ React2.createElement(PlankControl, {
+    }), close && !layoutIsAnySolo && /* @__PURE__ */ React.createElement(PlankControl, {
       label: t(`${typeof close === "string" ? "minify" : "close"} label`),
       classNames: buttonClassNames,
       "data-testid": "plankHeading.close",
       icon: close === "minify-start" ? "ph--caret-line-left--regular" : close === "minify-end" ? "ph--caret-line-right--regular" : "ph--x--regular",
       onClick: () => onClick?.("close")
-    }), capabilities.companion && /* @__PURE__ */ React2.createElement(PlankControl, {
+    }), capabilities.companion && /* @__PURE__ */ React.createElement(PlankControl, {
       label: t("open companion label"),
       classNames: buttonClassNames,
       "data-testid": "plankHeading.companion",
@@ -262,27 +193,20 @@ var PlankControls = /* @__PURE__ */ forwardRef(({ children, classNames, variant
   }
 });
 
-// src/components/fragments.ts
-import { mx } from "@dxos/react-ui-theme";
-var soloInlinePadding = "pis-[calc(env(safe-area-inset-left)+.25rem)] pie-[calc(env(safe-area-inset-left)+.25rem)]";
-var sidebarToggleStyles = "bs-[--rail-item] is-[--rail-item] absolute block-end-2 z-[1] !bg-deckSurface lg:hidden";
-var fixedSidebarToggleStyles = mx(sidebarToggleStyles, "inline-start-2");
-var fixedComplementarySidebarToggleStyles = mx(sidebarToggleStyles, "inline-end-2");
-
 // src/components/Plank/PlankHeading.tsx
 var MAX_COMPANIONS = 5;
 var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncrementStart, canIncrementEnd, popoverAnchorId, primaryId, pending, companioned, companions, layoutMode, actions = [] }) => {
-  var _effect = _useSignals3();
+  var _effect = _useSignals2();
   try {
-    const { t } = useTranslation3(DECK_PLUGIN);
-    const { dispatchPromise: dispatch } = useIntentDispatcher3();
+    const { t } = useTranslation2(meta.id);
+    const { dispatchPromise: dispatch } = useIntentDispatcher2();
     const { graph } = useAppGraph();
     const breakpoint = useBreakpoints();
     const icon = node?.properties?.icon ?? "ph--placeholder--regular";
     const label3 = pending ? t("pending heading") : toLocalizedString(node?.properties?.label ?? [
       "plank heading fallback label",
       {
-        ns: DECK_PLUGIN
+        ns: meta.id
       }
     ], t);
     const isCompanionNode = node?.type === PLANK_COMPANION_TYPE;
@@ -335,30 +259,30 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
       variant,
       graph
     ]);
-    const handleAction = useCallback3((action) => {
-      typeof action.data === "function" && action.data?.({
+    const handleAction = useCallback2((action) => {
+      typeof action.data === "function" && void action.data?.({
         parent: node,
-        caller: DECK_PLUGIN
+        caller: meta.id
       });
     }, [
       node
     ]);
-    const handlePlankAction = useCallback3((eventType) => {
+    const handlePlankAction = useCallback2((eventType) => {
       if (eventType.startsWith("solo")) {
-        return dispatch(createIntent3(DeckAction.Adjust, {
+        return dispatch(createIntent2(DeckAction.Adjust, {
           type: eventType,
           id
         }));
       } else if (eventType === "close") {
         if (part === "complementary") {
-          return dispatch(createIntent3(LayoutAction2.UpdateComplementary, {
+          return dispatch(createIntent2(LayoutAction.UpdateComplementary, {
             part: "complementary",
             options: {
               state: "collapsed"
             }
           }));
         } else {
-          return dispatch(createIntent3(LayoutAction2.Close, {
+          return dispatch(createIntent2(LayoutAction.Close, {
             part: "main",
             subject: [
               id
@@ -369,7 +293,7 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
           }));
         }
       } else {
-        return dispatch(createIntent3(DeckAction.Adjust, {
+        return dispatch(createIntent2(DeckAction.Adjust, {
           type: eventType,
           id
         }));
@@ -379,12 +303,12 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
       id,
       part
     ]);
-    const ActionRoot = node && popoverAnchorId === `dxos.org/ui/${DECK_PLUGIN}/${node.id}` ? Popover.Anchor : Fragment;
-    const handleTabClick = useCallback3((event) => {
+    const ActionRoot = node && popoverAnchorId === `dxos.org/ui/${meta.id}/${node.id}` ? Popover.Anchor : Fragment;
+    const handleTabClick = useCallback2((event) => {
       const target = event.target.closest("[data-id]");
       const tabId = target?.dataset?.id;
       if (primaryId && tabId) {
-        void dispatch(createIntent3(DeckAction.ChangeCompanion, {
+        void dispatch(createIntent2(DeckAction.ChangeCompanion, {
           primary: primaryId,
           companion: tabId
         }));
@@ -392,66 +316,65 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
     }, [
       primaryId
     ]);
-    return /* @__PURE__ */ React3.createElement(StackItem.Heading, {
+    return /* @__PURE__ */ React2.createElement(StackItem.Heading, {
       classNames: [
         "plb-1 items-stretch gap-1 sticky inline-start-12 app-drag min-is-0 contain-layout density-coarse",
         part === "solo" ? soloInlinePadding : "pli-1",
         ...layoutMode === "solo--fullscreen" ? [
           hoverableControls,
           hoverableFocusedWithinControls,
-          "*:transition-opacity *:opacity-[--controls-opacity] bg-transparent border-transparent transition-[background-color,border-color] hover-hover:hover:bg-headerSurface focus-within:bg-headerSurface hover-hover:hover:border-subduedSeparator focus-within:border-subduedSeparator"
+          "*:transition-opacity *:opacity-[--controls-opacity] bg-transparent border-transparent transition-[background-color,border-color]",
+          "hover-hover:hover:bg-headerSurface focus-within:bg-headerSurface hover-hover:hover:border-subduedSeparator focus-within:border-subduedSeparator"
         ] : []
       ],
       "data-plank-heading": true
     }, companions && isCompanionNode ? (
       /* TODO(thure): IMPORTANT: This is a tablist; it should be implemented as such. */
-      /* @__PURE__ */ React3.createElement("div", {
+      /* @__PURE__ */ React2.createElement("div", {
         role: "none",
         className: "flex-1 min-is-0 overflow-x-auto scrollbar-none flex gap-1"
-      }, companions.map(({ id: id2, properties: { icon: icon2, label: label4 } }) => /* @__PURE__ */ React3.createElement(IconButton3, {
+      }, companions.map(({ id: id2, properties: { icon: icon2, label: label4 } }) => /* @__PURE__ */ React2.createElement(IconButton2, {
         key: id2,
         "data-id": id2,
         icon: icon2,
         iconOnly: companions.length > MAX_COMPANIONS && node?.id !== id2,
         label: toLocalizedString(label4, t),
-        size: 5,
         variant: node?.id === id2 ? "primary" : "ghost",
         onClick: handleTabClick
       })))
-    ) : /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(ActionRoot, null, node && sigilActions ? /* @__PURE__ */ React3.createElement(StackItem.Sigil, {
+    ) : /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(ActionRoot, null, node && sigilActions ? /* @__PURE__ */ React2.createElement(StackItem.Sigil, {
       icon,
       related: part === "complementary",
       attendableId,
       triggerLabel: t("actions menu label"),
       actions: sigilActions,
       onAction: handleAction
-    }, /* @__PURE__ */ React3.createElement(Surface, {
+    }, /* @__PURE__ */ React2.createElement(Surface, {
       role: "menu-footer",
       data: {
         subject: node.data
       }
-    })) : /* @__PURE__ */ React3.createElement(StackItem.SigilButton, null, /* @__PURE__ */ React3.createElement("span", {
+    })) : /* @__PURE__ */ React2.createElement(StackItem.SigilButton, null, /* @__PURE__ */ React2.createElement("span", {
       className: "sr-only"
-    }, label3), /* @__PURE__ */ React3.createElement(Icon, {
-      icon,
-      size: 5
-    }))), /* @__PURE__ */ React3.createElement(TextTooltip, {
+    }, label3), /* @__PURE__ */ React2.createElement(Icon, {
+      icon
+    }))), /* @__PURE__ */ React2.createElement(TextTooltip, {
       text: label3,
       onlyWhenTruncating: true
-    }, /* @__PURE__ */ React3.createElement(StackItem.HeadingLabel, {
+    }, /* @__PURE__ */ React2.createElement(StackItem.HeadingLabel, {
       attendableId,
       related: part === "complementary",
       ...pending && {
         classNames: "text-description"
       }
-    }, label3))), node && part !== "complementary" && /* @__PURE__ */ React3.createElement(Surface, {
+    }, label3))), node && part !== "complementary" && /* @__PURE__ */ React2.createElement(Surface, {
       role: "navbar-end",
       data: {
         subject: node.data
       }
-    }), companioned === "companion" ? /* @__PURE__ */ React3.createElement(PlankCompanionControls, {
+    }), companioned === "companion" ? /* @__PURE__ */ React2.createElement(PlankCompanionControls, {
       primary: primaryId
-    }) : /* @__PURE__ */ React3.createElement(PlankControls, {
+    }) : /* @__PURE__ */ React2.createElement(PlankControls, {
       capabilities,
       layoutMode,
       close: part === "complementary" ? "minify-end" : true,
@@ -463,12 +386,12 @@ var PlankHeading = /* @__PURE__ */ memo(({ id, part, node, deckEnabled, canIncre
 });
 
 // src/components/Plank/PlankLoading.tsx
-import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
-import React4 from "react";
+import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
+import React3 from "react";
 var PlankLoading = () => {
-  var _effect = _useSignals4();
+  var _effect = _useSignals3();
   try {
-    return /* @__PURE__ */ React4.createElement("div", {
+    return /* @__PURE__ */ React3.createElement("div", {
       role: "none",
       className: "grid place-items-center attention-surface"
     });
@@ -479,36 +402,36 @@ var PlankLoading = () => {
 
 // src/components/Plank/PlankError.tsx
 var PlankContentError = ({ error }) => {
-  var _effect = _useSignals5();
+  var _effect = _useSignals4();
   try {
-    const { t } = useTranslation4(DECK_PLUGIN);
+    const { t } = useTranslation3(meta.id);
     const errorString = error?.toString() ?? "";
-    return /* @__PURE__ */ React5.createElement("div", {
+    return /* @__PURE__ */ React4.createElement("div", {
       role: "none",
-      className: "overflow-auto p-8 attention-surface grid place-items-center"
-    }, /* @__PURE__ */ React5.createElement("p", {
+      className: "overflow-y-auto p-8 attention-surface grid place-items-center"
+    }, /* @__PURE__ */ React4.createElement("p", {
       role: "alert",
-      className: mx2(descriptionMessage, "break-words rounded-md p-8", errorString.length < 256 && "text-lg")
+      className: mx2(descriptionMessage, "break-all rounded-md p-4")
     }, error ? errorString : t("error fallback message")));
   } finally {
     _effect.f();
   }
 };
 var PlankError = ({ id, part, node, error }) => {
-  var _effect = _useSignals5();
+  var _effect = _useSignals4();
   try {
     const [timedOut, setTimedOut] = useState(false);
     useEffect2(() => {
       setTimeout(() => setTimedOut(true), 5e3);
     }, []);
-    return /* @__PURE__ */ React5.createElement(React5.Fragment, null, /* @__PURE__ */ React5.createElement(PlankHeading, {
+    return /* @__PURE__ */ React4.createElement(React4.Fragment, null, /* @__PURE__ */ React4.createElement(PlankHeading, {
       id,
       part,
       node,
       pending: !timedOut
-    }), timedOut ? /* @__PURE__ */ React5.createElement(PlankContentError, {
+    }), timedOut ? /* @__PURE__ */ React4.createElement(PlankContentError, {
       error
-    }) : /* @__PURE__ */ React5.createElement(PlankLoading, null));
+    }) : /* @__PURE__ */ React4.createElement(PlankLoading, null));
   } finally {
     _effect.f();
   }
@@ -517,17 +440,18 @@ var PlankError = ({ id, part, node, error }) => {
 // src/components/Plank/Plank.tsx
 var UNKNOWN_ID = "unknown_id";
 var Plank = /* @__PURE__ */ memo2(({ id = UNKNOWN_ID, companionId, ...props }) => {
-  var _effect = _useSignals6();
+  var _effect = _useSignals5();
   try {
     const { graph } = useAppGraph2();
     const node = useNode(graph, id);
     const companions = useCompanions(id);
     const currentCompanion = companions.find(({ id: id2 }) => id2 === companionId);
     const hasCompanion = !!(companionId && currentCompanion);
-    return /* @__PURE__ */ React6.createElement(PlankContainer, {
+    return /* @__PURE__ */ React5.createElement(PlankContainer, {
       solo: props.part === "solo",
-      companion: hasCompanion
-    }, /* @__PURE__ */ React6.createElement(PlankComponent, {
+      companion: hasCompanion,
+      encapsulate: !!props.settings?.encapsulatedPlanks
+    }, /* @__PURE__ */ React5.createElement(PlankComponent, {
       id,
       node,
       companioned: hasCompanion ? "primary" : void 0,
@@ -536,7 +460,7 @@ var Plank = /* @__PURE__ */ memo2(({ id = UNKNOWN_ID, companionId, ...props }) =
       ...props.part === "solo" ? {
         part: "solo-primary"
       } : {}
-    }), hasCompanion && /* @__PURE__ */ React6.createElement(PlankComponent, {
+    }), hasCompanion && /* @__PURE__ */ React5.createElement(PlankComponent, {
       id: companionId,
       node: currentCompanion,
       primary: node,
@@ -553,16 +477,17 @@ var Plank = /* @__PURE__ */ memo2(({ id = UNKNOWN_ID, companionId, ...props }) =
     _effect.f();
   }
 });
-var PlankContainer = ({ children, solo, companion }) => {
-  var _effect = _useSignals6();
+var PlankContainer = ({ children, solo, companion, encapsulate }) => {
+  var _effect = _useSignals5();
   try {
     const sizeAttrs = useMainSize();
     if (!solo) {
       return children;
     }
-    return /* @__PURE__ */ React6.createElement("div", {
+    return /* @__PURE__ */ React5.createElement("div", {
       role: "none",
-      className: mx3("absolute inset-0 grid", companion && "grid-cols-[1fr_1fr]", railGridHorizontal, mainIntrinsicSize),
+      "data-popover-collision-boundary": true,
+      className: mx3("absolute inset-[--main-spacing] grid", encapsulate && "border border-separator rounded overflow-hidden", companion && "grid-cols-[6fr_4fr]", railGridHorizontal, mainIntrinsicSize),
       ...sizeAttrs
     }, children);
   } finally {
@@ -570,10 +495,11 @@ var PlankContainer = ({ children, solo, companion }) => {
   }
 };
 var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order, active, companioned, node, primary, companions, settings }) => {
-  var _effect = _useSignals6();
+  var _effect = _useSignals5();
   try {
-    const { dispatchPromise: dispatch } = useIntentDispatcher4();
-    const { deck, popoverAnchorId, scrollIntoView } = useCapability2(DeckCapabilities.DeckState);
+    const { dispatchPromise: dispatch } = useIntentDispatcher3();
+    const { deck, popoverAnchorId, scrollIntoView } = useCapability(DeckCapabilities.DeckState);
+    const { findFirstFocusable } = useFocusFinders();
     const canResize = layoutMode === "deck";
     const attentionAttrs = useAttentionAttributes(primary?.id ?? id);
     const index = active ? active.findIndex((entryId) => entryId === id) : 0;
@@ -584,8 +510,8 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     const { variant } = parseEntryId(id);
     const sizeKey = `${id.split("+")[0]}${variant ? `${ATTENDABLE_PATH_SEPARATOR}${variant}` : ""}`;
     const size = deck.plankSizing[sizeKey];
-    const handleSizeChange = useCallback4(debounce((nextSize) => {
-      return dispatch(createIntent4(DeckAction.UpdatePlankSize, {
+    const handleSizeChange = useCallback3(debounce((nextSize) => {
+      return dispatch(createIntent3(DeckAction.UpdatePlankSize, {
         id: sizeKey,
         size: nextSize
       }));
@@ -593,22 +519,25 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
       dispatch,
       sizeKey
     ]);
-    const handleKeyDown = useCallback4((event) => {
-      if (event.target === event.currentTarget && event.key === "Escape") {
-        rootElement.current?.closest("main")?.focus();
+    const handleKeyDown = useCallback3((event) => {
+      if (event.target === event.currentTarget) {
+        switch (event.key) {
+          case "Escape":
+            rootElement.current?.closest("main")?.focus();
+            break;
+          case "Enter":
+            rootElement.current && findFirstFocusable(rootElement.current)?.focus();
+            break;
+        }
       }
     }, []);
     useLayoutEffect(() => {
       if (scrollIntoView === id) {
-        const focusable = rootElement.current?.querySelector("button") || rootElement.current;
-        focusable?.focus({
-          preventScroll: true
-        });
-        layoutMode === "deck" && focusable?.scrollIntoView({
+        layoutMode === "deck" && rootElement.current?.scrollIntoView({
           behavior: "smooth",
           inline: "center"
         });
-        void dispatch(createIntent4(LayoutAction3.ScrollIntoView, {
+        void dispatch(createIntent3(LayoutAction2.ScrollIntoView, {
           part: "current",
           subject: void 0
         }));
@@ -622,25 +551,30 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
     const isAttendable = layoutMode.startsWith("solo") && part.startsWith("solo") || layoutMode === "deck" && part === "deck";
     const sizeAttrs = useMainSize();
     const data = useMemo2(() => node && {
+      attendableId: id,
       subject: node.data,
       companionTo: primary?.data,
+      properties: node.properties,
       variant,
       path,
       popoverAnchorId
     }, [
       node,
       node?.data,
+      node?.properties,
       path,
       popoverAnchorId,
       primary?.data,
       variant
     ]);
-    const placeholder = useMemo2(() => /* @__PURE__ */ React6.createElement(PlankLoading, null), []);
+    const placeholder = useMemo2(() => /* @__PURE__ */ React5.createElement(PlankLoading, null), []);
     const Root = part.startsWith("solo") ? "article" : StackItem2.Root;
-    const className = mx3("attention-surface relative dx-focus-ring-inset-over-all density-coarse", isSolo && mainIntrinsicSize, isSolo && railGridHorizontal, isSolo && "absolute inset-0", part.startsWith("solo") && "grid", part === "deck" && (companioned === "companion" ? "!border-separator border-ie" : "!border-separator border-li"), part.startsWith("solo-") && "row-span-2 grid-rows-subgrid min-is-0", part === "solo-companion" && "!border-separator border-is");
-    return /* @__PURE__ */ React6.createElement(Root, {
+    const fullscreen = layoutMode === "solo--fullscreen";
+    const className = mx3("attention-surface relative dx-focus-ring-inset-over-all density-coarse", isSolo && "absolute inset-0", isSolo && mainIntrinsicSize, railGridHorizontal, part.startsWith("solo") && "grid", part.startsWith("solo-") && "grid-rows-subgrid row-span-2 min-is-0", fullscreen && "grid-rows-1", part === "deck" && (companioned === "companion" ? "!border-separator border-ie" : "!border-separator border-li"), part === "solo-companion" && "!border-separator border-is", settings?.encapsulatedPlanks && !part.startsWith("solo") && "mli-[--main-spacing] !border-separator border rounded overflow-hidden");
+    return /* @__PURE__ */ React5.createElement(Root, {
       ref: rootElement,
       "data-testid": "deck.plank",
+      "data-popover-collision-boundary": true,
       tabIndex: 0,
       ...part.startsWith("solo") ? {
         ...sizeAttrs,
@@ -657,7 +591,7 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
       },
       ...isAttendable ? attentionAttrs : {},
       onKeyDown: handleKeyDown
-    }, node ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(PlankHeading, {
+    }, node ? /* @__PURE__ */ React5.createElement(React5.Fragment, null, !fullscreen && /* @__PURE__ */ React5.createElement(PlankHeading, {
       id,
       part: part.startsWith("solo-") ? "solo" : part,
       node,
@@ -669,33 +603,115 @@ var PlankComponent = /* @__PURE__ */ memo2(({ layoutMode, id, part, path, order,
       primaryId: primary?.id,
       companioned,
       companions
-    }), /* @__PURE__ */ React6.createElement(Surface2, {
+    }), /* @__PURE__ */ React5.createElement(Surface2, {
       key: node.id,
       role: "article",
       data,
       limit: 1,
       fallback: PlankContentError,
       placeholder
-    })) : /* @__PURE__ */ React6.createElement(PlankError, {
+    })) : /* @__PURE__ */ React5.createElement(PlankError, {
       id,
       part
-    }), canResize && /* @__PURE__ */ React6.createElement(StackItem2.ResizeHandle, null));
+    }), canResize && /* @__PURE__ */ React5.createElement(StackItem2.ResizeHandle, null));
   } finally {
     _effect.f();
   }
 });
 
+// src/components/Sidebar/SidebarButton.tsx
+import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
+import React6, { useCallback as useCallback4 } from "react";
+import { LayoutAction as LayoutAction3, createIntent as createIntent4 } from "@dxos/app-framework";
+import { useCapability as useCapability2, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework/react";
+import { IconButton as IconButton3, useTranslation as useTranslation4 } from "@dxos/react-ui";
+var ToggleSidebarButton = ({ classNames, variant = "ghost" }) => {
+  var _effect = _useSignals6();
+  try {
+    const layoutContext = useCapability2(DeckCapabilities.MutableDeckState);
+    const { t } = useTranslation4(meta.id);
+    return /* @__PURE__ */ React6.createElement(IconButton3, {
+      variant,
+      icon: "ph--sidebar--regular",
+      iconOnly: true,
+      size: 4,
+      label: t("open navigation sidebar label"),
+      onClick: () => layoutContext.sidebarState = layoutContext.sidebarState === "expanded" ? "collapsed" : "expanded",
+      classNames
+    });
+  } finally {
+    _effect.f();
+  }
+};
+var CloseSidebarButton = () => {
+  var _effect = _useSignals6();
+  try {
+    const layoutContext = useCapability2(DeckCapabilities.MutableDeckState);
+    const { t } = useTranslation4(meta.id);
+    return /* @__PURE__ */ React6.createElement(IconButton3, {
+      variant: "ghost",
+      icon: "ph--caret-line-left--regular",
+      iconOnly: true,
+      size: 4,
+      label: t("close navigation sidebar label"),
+      onClick: () => layoutContext.sidebarState = "collapsed",
+      classNames: "rounded-none pli-1 dx-focus-ring-inset pie-[max(.5rem,env(safe-area-inset-left))]"
+    });
+  } finally {
+    _effect.f();
+  }
+};
+var ToggleComplementarySidebarButton = ({ inR0, classNames, current }) => {
+  var _effect = _useSignals6();
+  try {
+    const { dispatchPromise: dispatch } = useIntentDispatcher4();
+    const layoutContext = useCapability2(DeckCapabilities.MutableDeckState);
+    const { t } = useTranslation4(meta.id);
+    const companions = useDeckCompanions();
+    const handleClick = useCallback4(async () => {
+      layoutContext.complementarySidebarState = layoutContext.complementarySidebarState === "expanded" ? "collapsed" : "expanded";
+      const subject = layoutContext.complementarySidebarPanel ?? (companions[0] && getCompanionId(companions[0].id));
+      if (layoutContext.complementarySidebarState === "expanded" && !current && subject) {
+        await dispatch(createIntent4(LayoutAction3.UpdateComplementary, {
+          part: "complementary",
+          subject
+        }));
+      }
+    }, [
+      layoutContext,
+      current,
+      companions,
+      dispatch
+    ]);
+    return /* @__PURE__ */ React6.createElement(IconButton3, {
+      variant: "ghost",
+      classNames: [
+        "[&>svg]:-scale-x-100",
+        classNames
+      ],
+      icon: "ph--sidebar-simple--regular",
+      iconOnly: true,
+      label: t("open complementary sidebar label"),
+      size: inR0 ? 5 : 4,
+      tooltipSide: inR0 ? "left" : void 0,
+      onClick: handleClick
+    });
+  } finally {
+    _effect.f();
+  }
+};
+
 // src/components/Sidebar/ComplementarySidebar.tsx
 var label = [
   "complementary sidebar title",
   {
-    ns: DECK_PLUGIN
+    ns: meta.id
   }
 ];
 var ComplementarySidebar = ({ current }) => {
   var _effect = _useSignals7();
   try {
-    const { t } = useTranslation5(DECK_PLUGIN);
+    const { t } = useTranslation5(meta.id);
     const { dispatchPromise: dispatch } = useIntentDispatcher5();
     const layout = useCapability3(DeckCapabilities.MutableDeckState);
     const layoutMode = getMode(layout.deck);
@@ -761,7 +777,7 @@ var ComplementarySidebar = ({ current }) => {
       classNames: "contents"
     }, /* @__PURE__ */ React7.createElement("div", {
       role: "none",
-      className: "absolute z-[1] inset-block-0 inline-end-0 !is-[--r0-size] pbs-[env(safe-area-inset-top)] pbe-[env(safe-area-inset-bottom)] border-is border-subduedSeparator grid grid-cols-1 grid-rows-[1fr_min-content] bg-baseSurface contain-layout app-drag"
+      className: mx4("absolute z-[1] inset-block-0 inline-end-0 !is-[--r0-size]", "pbs-[env(safe-area-inset-top)] pbe-[env(safe-area-inset-bottom)] border-is border-subduedSeparator", "grid grid-cols-1 grid-rows-[1fr_min-content] bg-baseSurface contain-layout app-drag")
     }, /* @__PURE__ */ React7.createElement(Tabs.Tablist, {
       classNames: "grid grid-cols-1 auto-rows-[--rail-action] p-1 gap-1 !overflow-y-auto"
     }, companions.map((companion) => /* @__PURE__ */ React7.createElement(Tabs.Tab, {
@@ -771,7 +787,6 @@ var ComplementarySidebar = ({ current }) => {
     }, /* @__PURE__ */ React7.createElement(IconButton4, {
       label: toLocalizedString2(companion.properties.label, t),
       icon: companion.properties.icon,
-      size: 5,
       iconOnly: true,
       tooltipSide: "left",
       "data-value": getCompanionId(companion.id),
@@ -789,9 +804,13 @@ var ComplementarySidebar = ({ current }) => {
     }, /* @__PURE__ */ React7.createElement(ToggleComplementarySidebarButton, null))), activeId && companions.map((companion) => /* @__PURE__ */ React7.createElement(Tabs.Tabpanel, {
       key: getCompanionId(companion.id),
       value: getCompanionId(companion.id),
-      classNames: 'absolute data-[state="inactive"]:-z-[1] inset-block-0 inline-start-0 is-[calc(100%-var(--r0-size))] lg:is-[--r1-size] grid grid-cols-1 grid-rows-[var(--rail-size)_1fr_min-content] pbs-[env(safe-area-inset-top)]',
+      classNames: [
+        'absolute data-[state="inactive"]:-z-[1] overflow-hidden',
+        "inset-block-0 inline-start-0 is-[calc(100%-var(--r0-size))] lg:is-[--r1-size]",
+        "grid grid-cols-1 grid-rows-[var(--rail-size)_1fr_min-content] pbs-[env(safe-area-inset-top)]"
+      ],
       ...layout.complementarySidebarState !== "expanded" && {
-        inert: "true"
+        inert: true
       }
     }, /* @__PURE__ */ React7.createElement(ComplementarySidebarPanel, {
       companion,
@@ -803,27 +822,29 @@ var ComplementarySidebar = ({ current }) => {
     _effect.f();
   }
 };
-var ScrollArea = ({ children }) => {
-  var _effect = _useSignals7();
-  try {
-    return /* @__PURE__ */ React7.createElement("div", {
-      className: "flex flex-col grow overflow-x-hidden overflow-y-auto scrollbar-thin"
-    }, children);
-  } finally {
-    _effect.f();
-  }
-};
 var ComplementarySidebarPanel = ({ companion, activeId, data, hoistStatusbar }) => {
   var _effect = _useSignals7();
   try {
-    const { t } = useTranslation5(DECK_PLUGIN);
+    const { t } = useTranslation5(meta.id);
     if (getCompanionId(companion.id) !== activeId && !data) {
       return null;
     }
     const Wrapper = companion.properties.fixed ? Fragment2 : ScrollArea;
-    return /* @__PURE__ */ React7.createElement(React7.Fragment, null, /* @__PURE__ */ React7.createElement("h2", {
-      className: "flex items-center pli-2 border-subduedSeparator border-be font-medium"
-    }, toLocalizedString2(companion.properties.label, t)), /* @__PURE__ */ React7.createElement(Wrapper, null, /* @__PURE__ */ React7.createElement(Surface3, {
+    return /* @__PURE__ */ React7.createElement(React7.Fragment, null, /* @__PURE__ */ React7.createElement("div", {
+      role: "none",
+      className: "flex items-center p-1 gap-1 border-be border-subduedSeparator"
+    }, /* @__PURE__ */ React7.createElement(IconButton4, {
+      label: toLocalizedString2(companion.properties.label, t),
+      icon: companion.properties.icon,
+      iconOnly: true,
+      tooltipSide: "left",
+      "data-value": getCompanionId(companion.id),
+      classNames: "bs-10 is-10",
+      variant: "default"
+    }), /* @__PURE__ */ React7.createElement("div", {
+      role: "none",
+      className: "pli-1"
+    }, toLocalizedString2(companion.properties.label, t))), /* @__PURE__ */ React7.createElement(Wrapper, null, /* @__PURE__ */ React7.createElement(Surface3, {
       role: `deck-companion--${getCompanionId(companion.id)}`,
       data,
       fallback: PlankContentError,
@@ -839,16 +860,26 @@ var ComplementarySidebarPanel = ({ companion, activeId, data, hoistStatusbar })
     _effect.f();
   }
 };
+var ScrollArea = ({ children }) => {
+  var _effect = _useSignals7();
+  try {
+    return /* @__PURE__ */ React7.createElement("div", {
+      className: "flex flex-col grow overflow-x-hidden overflow-y-auto scrollbar-thin"
+    }, children);
+  } finally {
+    _effect.f();
+  }
+};
 
 // src/components/Sidebar/Sidebar.tsx
 import { useSignals as _useSignals8 } from "@preact-signals/safe-react/tracking";
 import React8, { useMemo as useMemo4 } from "react";
-import { Surface as Surface4, useCapability as useCapability4 } from "@dxos/app-framework";
+import { Surface as Surface4, useCapability as useCapability4 } from "@dxos/app-framework/react";
 import { Main as Main2 } from "@dxos/react-ui";
 var label2 = [
   "sidebar title",
   {
-    ns: DECK_PLUGIN
+    ns: meta.id
   }
 ];
 var Sidebar = () => {
@@ -891,9 +922,9 @@ var Sidebar = () => {
 var Banner = ({ variant, classNames }) => {
   var _effect = _useSignals9();
   try {
-    const { t } = useTranslation6(DECK_PLUGIN);
+    const { t } = useTranslation6(meta.id);
     return /* @__PURE__ */ React9.createElement("header", {
-      className: mx4("flex items-stretch relative plb-1 pis-1 pie-2", variant === "topbar" && "fixed inset-inline-0 block-start-[env(safe-area-inset-top)] bs-[--rail-size] border-be border-separator", classNames)
+      className: mx5("flex items-stretch relative plb-1 pis-1 pie-2", variant === "topbar" && "fixed inset-inline-0 block-start-[env(safe-area-inset-top)] bs-[--rail-size] border-be border-separator", classNames)
     }, variant === "sidebar" ? /* @__PURE__ */ React9.createElement(CloseSidebarButton, null) : /* @__PURE__ */ React9.createElement(ToggleSidebarButton, null), /* @__PURE__ */ React9.createElement("span", {
       className: "self-center grow mis-1"
     }, t("current app name", {
@@ -923,19 +954,14 @@ var Banner = ({ variant, classNames }) => {
 };
 
 // src/components/DeckLayout/DeckLayout.tsx
-import { useSignals as _useSignals17 } from "@preact-signals/safe-react/tracking";
-import { untracked } from "@preact/signals-core";
-import React17, { useCallback as useCallback7, useEffect as useEffect5, useMemo as useMemo6, useRef as useRef3, Fragment as Fragment3 } from "react";
-import { Capabilities, LayoutAction as LayoutAction5, createIntent as createIntent6, useCapability as useCapability8, useIntentDispatcher as useIntentDispatcher6, usePluginManager } from "@dxos/app-framework";
-import { AttentionCapabilities } from "@dxos/plugin-attention";
-import { Main as Main3, useMediaQuery, useOnTransition } from "@dxos/react-ui";
-import { Stack, StackContext, DEFAULT_HORIZONTAL_SIZE } from "@dxos/react-ui-stack";
-import { mainPaddingTransitions } from "@dxos/react-ui-theme";
+import { useSignals as _useSignals18 } from "@preact-signals/safe-react/tracking";
+import React18 from "react";
+import { useCapability as useCapability9 } from "@dxos/app-framework/react";
 
 // src/components/DeckLayout/ActiveNode.tsx
 import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
 import React10 from "react";
-import { Surface as Surface6, useAppGraph as useAppGraph3 } from "@dxos/app-framework";
+import { Surface as Surface6, useAppGraph as useAppGraph3 } from "@dxos/app-framework/react";
 import { useNode as useNode2 } from "@dxos/plugin-graph";
 import { useAttended } from "@dxos/react-ui-attention";
 var ActiveNode = () => {
@@ -960,10 +986,21 @@ var ActiveNode = () => {
   }
 };
 
+// src/components/DeckLayout/DeckMain.tsx
+import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
+import { untracked } from "@preact/signals-core";
+import React14, { Fragment as Fragment3, useCallback as useCallback6, useEffect as useEffect4, useMemo as useMemo5, useRef as useRef2 } from "react";
+import { Capabilities, LayoutAction as LayoutAction5, createIntent as createIntent6 } from "@dxos/app-framework";
+import { useCapability as useCapability6, useIntentDispatcher as useIntentDispatcher6, usePluginManager } from "@dxos/app-framework/react";
+import { AttentionCapabilities } from "@dxos/plugin-attention";
+import { Main as Main3, useMediaQuery, useOnTransition } from "@dxos/react-ui";
+import { DEFAULT_HORIZONTAL_SIZE, Stack, StackContext } from "@dxos/react-ui-stack";
+import { mainPaddingTransitions, mx as mx6 } from "@dxos/react-ui-theme";
+
 // src/components/DeckLayout/ContentEmpty.tsx
 import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
 import React11 from "react";
-import { Surface as Surface7, useCapability as useCapability5 } from "@dxos/app-framework";
+import { Surface as Surface7, useCapability as useCapability5 } from "@dxos/app-framework/react";
 var ContentEmpty = () => {
   var _effect = _useSignals11();
   try {
@@ -986,156 +1023,23 @@ var ContentEmpty = () => {
   }
 };
 
-// src/components/DeckLayout/Dialog.tsx
+// src/components/DeckLayout/StatusBar.tsx
 import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
 import React12 from "react";
-import { Surface as Surface8, useCapability as useCapability6 } from "@dxos/app-framework";
-import { AlertDialog, Dialog as NaturalDialog } from "@dxos/react-ui";
-var Dialog = () => {
+import { Surface as Surface8 } from "@dxos/app-framework/react";
+import { useLandmarkMover } from "@dxos/react-ui";
+var StatusBar = ({ showHints }) => {
   var _effect = _useSignals12();
-  try {
-    const context = useCapability6(DeckCapabilities.MutableDeckState);
-    const { dialogOpen, dialogType, dialogBlockAlign, dialogOverlayClasses, dialogOverlayStyle, dialogContent } = context;
-    const Root = dialogType === "alert" ? AlertDialog.Root : NaturalDialog.Root;
-    const Overlay = dialogType === "alert" ? AlertDialog.Overlay : NaturalDialog.Overlay;
-    return /* @__PURE__ */ React12.createElement(Root, {
-      modal: dialogBlockAlign !== "end",
-      open: dialogOpen,
-      onOpenChange: (nextOpen) => context.dialogOpen = nextOpen
-    }, dialogBlockAlign === "end" ? (
-      // TODO(burdon): Placeholder creates a suspense boundary; replace with defaults.
-      /* @__PURE__ */ React12.createElement(Surface8, {
-        role: "dialog",
-        data: dialogContent,
-        limit: 1,
-        fallback: PlankContentError,
-        placeholder: /* @__PURE__ */ React12.createElement("div", null)
-      })
-    ) : /* @__PURE__ */ React12.createElement(Overlay, {
-      blockAlign: dialogBlockAlign,
-      classNames: dialogOverlayClasses,
-      style: dialogOverlayStyle
-    }, /* @__PURE__ */ React12.createElement(Surface8, {
-      role: "dialog",
-      data: dialogContent,
-      limit: 1,
-      fallback: PlankContentError
-    })));
-  } finally {
-    _effect.f();
-  }
-};
-
-// src/components/DeckLayout/Popover.tsx
-import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
-import { createContext } from "@radix-ui/react-context";
-import React13, { useCallback as useCallback6, useEffect as useEffect4, useMemo as useMemo5, useRef as useRef2, useState as useState3 } from "react";
-import { Surface as Surface9, useCapability as useCapability7 } from "@dxos/app-framework";
-import { Popover as Popover2 } from "@dxos/react-ui";
-var DEBOUNCE_DELAY = 40;
-var [DeckPopoverProvider, useDeckPopoverContext] = createContext("DeckPopover");
-var PopoverRoot = ({ children }) => {
-  var _effect = _useSignals13();
-  try {
-    const layout = useCapability7(DeckCapabilities.MutableDeckState);
-    const virtualRef = useRef2(null);
-    const [virtualIter, setVirtualIter] = useState3(0);
-    const [open, setOpen] = useState3(false);
-    const debounceRef = useRef2(null);
-    useEffect4(() => {
-      setOpen(false);
-      if (layout.popoverOpen) {
-        if (debounceRef.current) {
-          clearTimeout(debounceRef.current);
-        }
-        if (layout.popoverAnchor && virtualRef.current !== layout.popoverAnchor) {
-          virtualRef.current = layout.popoverAnchor ?? null;
-          setVirtualIter((iter) => iter + 1);
-        }
-        debounceRef.current = setTimeout(() => setOpen(true), DEBOUNCE_DELAY);
-      }
-    }, [
-      layout.popoverOpen,
-      layout.popoverAnchorId,
-      layout.popoverAnchor,
-      layout.popoverContent
-    ]);
-    return /* @__PURE__ */ React13.createElement(DeckPopoverProvider, {
-      setOpen
-    }, /* @__PURE__ */ React13.createElement(Popover2.Root, {
-      modal: false,
-      open
-    }, layout.popoverAnchor && /* @__PURE__ */ React13.createElement(Popover2.VirtualTrigger, {
-      key: virtualIter,
-      virtualRef
-    }), children));
-  } finally {
-    _effect.f();
-  }
-};
-var PopoverContent = () => {
-  var _effect = _useSignals13();
-  try {
-    const layout = useCapability7(DeckCapabilities.MutableDeckState);
-    const { setOpen } = useDeckPopoverContext("PopoverContent");
-    const handleClose = useCallback6((event) => {
-      if (
-        // TODO(thure): CodeMirror should not focus itself when it updates.
-        event.type === "dismissableLayer.focusOutside" && event.currentTarget?.classList.contains("cm-content")
-      ) {
-        event.preventDefault();
-      } else {
-        setOpen(false);
-        layout.popoverOpen = false;
-        layout.popoverAnchor = void 0;
-        layout.popoverAnchorId = void 0;
-        layout.popoverSide = void 0;
-      }
-    }, [
-      setOpen
-    ]);
-    const collisionBoundaries = useMemo5(() => {
-      const closest = layout.popoverAnchor?.closest("[data-popover-collision-boundary]");
-      return closest ? [
-        closest
-      ] : [];
-    }, [
-      layout.popoverAnchor
-    ]);
-    return /* @__PURE__ */ React13.createElement(Popover2.Portal, null, /* @__PURE__ */ React13.createElement(Popover2.Content, {
-      side: layout.popoverSide,
-      onInteractOutside: handleClose,
-      onEscapeKeyDown: handleClose,
-      collisionBoundary: collisionBoundaries,
-      sticky: "always",
-      hideWhenDetached: true
-    }, /* @__PURE__ */ React13.createElement(Popover2.Viewport, null, /* @__PURE__ */ React13.createElement(Surface9, {
-      role: "popover",
-      data: layout.popoverContent,
-      limit: 1
-    })), /* @__PURE__ */ React13.createElement(Popover2.Arrow, null)));
-  } finally {
-    _effect.f();
-  }
-};
-
-// src/components/DeckLayout/StatusBar.tsx
-import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
-import React14 from "react";
-import { Surface as Surface10 } from "@dxos/app-framework";
-import { useLandmarkMover } from "@dxos/react-ui";
-var StatusBar = ({ showHints }) => {
-  var _effect = _useSignals14();
   try {
     const mover = useLandmarkMover(void 0, "3");
-    return /* @__PURE__ */ React14.createElement("div", {
+    return /* @__PURE__ */ React12.createElement("div", {
       role: "contentinfo",
       className: "fixed block-end-0 inset-inline-0 bs-[--statusbar-size] border-bs border-separator z-[2] flex text-description",
       ...mover
-    }, showHints && /* @__PURE__ */ React14.createElement(Surface10, {
+    }, showHints && /* @__PURE__ */ React12.createElement(Surface8, {
       role: "hints",
       limit: 1
-    }), /* @__PURE__ */ React14.createElement(Surface10, {
+    }), /* @__PURE__ */ React12.createElement(Surface8, {
       role: "status-bar",
       limit: 1
     }));
@@ -1144,49 +1048,13 @@ var StatusBar = ({ showHints }) => {
   }
 };
 
-// src/components/DeckLayout/Toast.tsx
-import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
-import React15 from "react";
-import { Button, Icon as Icon2, Toast as NaturalToast, toLocalizedString as toLocalizedString3, useTranslation as useTranslation7 } from "@dxos/react-ui";
-var Toast = ({ id, title, description, icon, duration, actionLabel, actionAlt, closeLabel, onAction, onOpenChange }) => {
-  var _effect = _useSignals15();
-  try {
-    const { t } = useTranslation7(DECK_PLUGIN);
-    return /* @__PURE__ */ React15.createElement(NaturalToast.Root, {
-      "data-testid": id,
-      defaultOpen: true,
-      duration,
-      onOpenChange
-    }, /* @__PURE__ */ React15.createElement(NaturalToast.Body, null, /* @__PURE__ */ React15.createElement(NaturalToast.Title, {
-      classNames: "items-center"
-    }, icon && /* @__PURE__ */ React15.createElement(Icon2, {
-      icon,
-      size: 5,
-      classNames: "inline mr-1"
-    }), title && /* @__PURE__ */ React15.createElement("span", null, toLocalizedString3(title, t))), description && /* @__PURE__ */ React15.createElement(NaturalToast.Description, null, description && toLocalizedString3(description, t))), /* @__PURE__ */ React15.createElement(NaturalToast.Actions, null, onAction && actionAlt && actionLabel && /* @__PURE__ */ React15.createElement(NaturalToast.Action, {
-      altText: toLocalizedString3(actionAlt, t),
-      asChild: true
-    }, /* @__PURE__ */ React15.createElement(Button, {
-      "data-testid": "toast.action",
-      variant: "primary",
-      onClick: () => onAction?.()
-    }, toLocalizedString3(actionLabel, t))), closeLabel && /* @__PURE__ */ React15.createElement(NaturalToast.Close, {
-      asChild: true
-    }, /* @__PURE__ */ React15.createElement(Button, {
-      "data-testid": "toast.close"
-    }, toLocalizedString3(closeLabel, t)))));
-  } finally {
-    _effect.f();
-  }
-};
-
 // src/components/DeckLayout/Topbar.tsx
-import { useSignals as _useSignals16 } from "@preact-signals/safe-react/tracking";
-import React16 from "react";
+import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
+import React13 from "react";
 var Topbar = () => {
-  var _effect = _useSignals16();
+  var _effect = _useSignals13();
   try {
-    return /* @__PURE__ */ React16.createElement(Banner, {
+    return /* @__PURE__ */ React13.createElement(Banner, {
       variant: "topbar"
     });
   } finally {
@@ -1194,37 +1062,23 @@ var Topbar = () => {
   }
 };
 
-// src/components/DeckLayout/DeckLayout.tsx
-var PlankSeparator = ({ order }) => {
-  var _effect = _useSignals17();
-  try {
-    return order > 0 ? /* @__PURE__ */ React17.createElement("span", {
-      role: "separator",
-      className: "row-span-2 bg-deckSurface is-4",
-      style: {
-        gridColumn: order
-      }
-    }) : null;
-  } finally {
-    _effect.f();
-  }
-};
-var DeckLayout = ({ onDismissToast }) => {
-  var _effect = _useSignals17();
+// src/components/DeckLayout/DeckMain.tsx
+var DeckMain = () => {
+  var _effect = _useSignals14();
   try {
     const { dispatchPromise: dispatch } = useIntentDispatcher6();
-    const settings = useCapability8(Capabilities.SettingsStore).getStore(DECK_PLUGIN).value;
-    const context = useCapability8(DeckCapabilities.MutableDeckState);
-    const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck, toasts } = context;
+    const settings = useCapability6(Capabilities.SettingsStore).getStore(meta.id)?.value;
+    const context = useCapability6(DeckCapabilities.MutableDeckState);
+    const { sidebarState, complementarySidebarState, complementarySidebarPanel, deck } = context;
     const { active, activeCompanions, fullscreen, solo, plankSizing } = deck;
-    const breakpoint = useBreakpoints();
     const layoutMode = getMode(deck);
+    const breakpoint = useBreakpoints();
     const topbar = layoutAppliesTopbar(breakpoint, layoutMode);
     const hoistStatusbar = useHoistStatusbar(breakpoint, layoutMode);
     const pluginManager = usePluginManager();
-    const scrollLeftRef = useRef3();
-    const deckRef = useRef3(null);
-    useEffect5(() => {
+    const scrollLeftRef = useRef2(null);
+    const deckRef = useRef2(null);
+    useEffect4(() => {
       const attended = untracked(() => {
         const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
         return attention.current;
@@ -1234,11 +1088,9 @@ var DeckLayout = ({ onDismissToast }) => {
         document.querySelector(`article[data-attendable-id="${firstId}"] button`)?.focus();
       }
     }, []);
-    const [isNotMobile] = useMediaQuery("md", {
-      ssr: false
-    });
-    const shouldRevert = useRef3(false);
-    useEffect5(() => {
+    const [isNotMobile] = useMediaQuery("md");
+    const shouldRevert = useRef2(false);
+    useEffect4(() => {
       if (!isNotMobile && getMode(deck) === "deck") {
         const attended = untracked(() => {
           const attention = pluginManager.context.getCapability(AttentionCapabilities.Attention);
@@ -1265,8 +1117,8 @@ var DeckLayout = ({ onDismissToast }) => {
       deck,
       dispatch
     ]);
-    useEffect5(() => {
-      if (!settings.enableDeck && layoutMode === "deck") {
+    useEffect4(() => {
+      if (!settings?.enableDeck && layoutMode === "deck") {
         void dispatch(createIntent6(LayoutAction5.SetLayoutMode, {
           part: "mode",
           subject: active[0],
@@ -1276,27 +1128,27 @@ var DeckLayout = ({ onDismissToast }) => {
         }));
       }
     }, [
-      settings.enableDeck,
+      settings?.enableDeck,
       dispatch,
       active,
       layoutMode
     ]);
-    const handleResize = useCallback7(() => {
+    const handleResize = useCallback6(() => {
       scrollLeftRef.current = null;
     }, []);
-    useEffect5(() => {
+    useEffect4(() => {
       window.addEventListener("resize", handleResize);
       return () => window.removeEventListener("resize", handleResize);
     }, [
       handleResize
     ]);
-    const restoreScroll = useCallback7(() => {
+    const restoreScroll = useCallback6(() => {
       if (deckRef.current && scrollLeftRef.current != null) {
         deckRef.current.scrollLeft = scrollLeftRef.current;
       }
     }, []);
     useOnTransition(layoutMode, (mode) => mode !== "deck", "deck", restoreScroll);
-    const handleScroll = useCallback7((event) => {
+    const handleScroll = useCallback6((event) => {
       if (!solo && event.currentTarget === event.target) {
         scrollLeftRef.current = event.target.scrollLeft;
       }
@@ -1304,17 +1156,17 @@ var DeckLayout = ({ onDismissToast }) => {
       solo
     ]);
     const isEmpty = !solo && active.length === 0;
-    const padding = useMemo6(() => {
-      if (!solo && settings.overscroll === "centering") {
+    const padding = useMemo5(() => {
+      if (!solo && settings?.overscroll === "centering") {
         return calculateOverscroll(active.length);
       }
       return {};
     }, [
       solo,
-      settings.overscroll,
+      settings?.overscroll,
       deck
     ]);
-    const mainPosition = useMemo6(() => [
+    const mainPosition = useMemo5(() => [
       "grid !block-start-[env(safe-area-inset-top)]",
       topbar && "!block-start-[calc(env(safe-area-inset-top)+var(--rail-size))]",
       hoistStatusbar && "lg:block-end-[--statusbar-size]"
@@ -1322,7 +1174,7 @@ var DeckLayout = ({ onDismissToast }) => {
       topbar,
       hoistStatusbar
     ]);
-    const { order, itemsCount } = useMemo6(() => {
+    const { order, itemsCount } = useMemo5(() => {
       return active.reduce((acc, entryId) => {
         acc.order[entryId] = acc.itemsCount + 1;
         acc.itemsCount += activeCompanions?.[entryId] ? 3 : 2;
@@ -1335,53 +1187,55 @@ var DeckLayout = ({ onDismissToast }) => {
       active,
       activeCompanions
     ]);
-    return /* @__PURE__ */ React17.createElement(PopoverRoot, null, /* @__PURE__ */ React17.createElement(ActiveNode, null), /* @__PURE__ */ React17.createElement(Main3.Root, {
+    return /* @__PURE__ */ React14.createElement(Main3.Root, {
       navigationSidebarState: fullscreen ? "closed" : context.sidebarState,
-      onNavigationSidebarStateChange: (next) => context.sidebarState = next,
       complementarySidebarState: fullscreen ? "closed" : context.complementarySidebarState,
+      onNavigationSidebarStateChange: (next) => context.sidebarState = next,
       onComplementarySidebarStateChange: (next) => context.complementarySidebarState = next
-    }, /* @__PURE__ */ React17.createElement(Sidebar, null), /* @__PURE__ */ React17.createElement(ComplementarySidebar, {
+    }, /* @__PURE__ */ React14.createElement(Sidebar, null), /* @__PURE__ */ React14.createElement(ComplementarySidebar, {
       current: complementarySidebarPanel
-    }), /* @__PURE__ */ React17.createElement(Main3.Overlay, null), isEmpty && /* @__PURE__ */ React17.createElement(Main3.Content, {
+    }), /* @__PURE__ */ React14.createElement(Main3.Overlay, null), isEmpty && /* @__PURE__ */ React14.createElement(Main3.Content, {
       bounce: true,
       handlesFocus: true,
       classNames: mainPosition
-    }, /* @__PURE__ */ React17.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React17.createElement(Main3.Content, {
+    }, /* @__PURE__ */ React14.createElement(ContentEmpty, null)), !isEmpty && /* @__PURE__ */ React14.createElement(Main3.Content, {
       bounce: true,
       handlesFocus: true,
       classNames: mainPosition,
       style: {
+        "--main-spacing": settings?.encapsulatedPlanks ? "0.75rem" : "0",
         "--dx-main-sidebarWidth": sidebarState === "expanded" ? "var(--nav-sidebar-size)" : sidebarState === "collapsed" ? "var(--l0-size)" : "0",
         "--dx-main-complementaryWidth": complementarySidebarState === "expanded" ? "var(--complementary-sidebar-size)" : complementarySidebarState === "collapsed" ? "var(--rail-size)" : "0",
         "--dx-main-contentFirstWidth": `${plankSizing[active[0] ?? "never"] ?? DEFAULT_HORIZONTAL_SIZE}rem`,
         "--dx-main-contentLastWidth": `${plankSizing[active[(active.length ?? 1) - 1] ?? "never"] ?? DEFAULT_HORIZONTAL_SIZE}rem`
       }
-    }, /* @__PURE__ */ React17.createElement("div", {
+    }, /* @__PURE__ */ React14.createElement("div", {
       role: "none",
       className: !solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
       ...solo && {
-        inert: ""
+        inert: true
       }
-    }, !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
+    }, !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleSidebarButton, {
       classNames: fixedSidebarToggleStyles
-    }), !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
+    }), !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleComplementarySidebarButton, {
       classNames: fixedComplementarySidebarToggleStyles
-    }), /* @__PURE__ */ React17.createElement(Stack, {
+    }), /* @__PURE__ */ React14.createElement(Stack, {
       ref: deckRef,
       orientation: "horizontal",
       size: "contain",
+      itemsCount: itemsCount - 1,
       classNames: [
-        "absolute inset-block-0 -inset-inline-px",
+        "absolute inset-block-[--main-spacing] -inset-inline-px bs-[calc(100%-2*var(--main-spacing))]",
         mainPaddingTransitions
       ],
-      itemsCount: itemsCount - 1,
       style: padding,
       onScroll: handleScroll
-    }, active.map((entryId) => /* @__PURE__ */ React17.createElement(Fragment3, {
+    }, active.map((entryId) => /* @__PURE__ */ React14.createElement(Fragment3, {
       key: entryId
-    }, /* @__PURE__ */ React17.createElement(PlankSeparator, {
-      order: order[entryId] - 1
-    }), /* @__PURE__ */ React17.createElement(Plank, {
+    }, /* @__PURE__ */ React14.createElement(PlankSeparator, {
+      order: order[entryId] - 1,
+      encapsulate: !!settings?.enableDeck
+    }), /* @__PURE__ */ React14.createElement(Plank, {
       id: entryId,
       companionId: activeCompanions?.[entryId],
       part: "deck",
@@ -1389,36 +1243,217 @@ var DeckLayout = ({ onDismissToast }) => {
       active,
       layoutMode,
       settings
-    }))))), /* @__PURE__ */ React17.createElement("div", {
+    }))))), /* @__PURE__ */ React14.createElement("div", {
       role: "none",
-      className: solo ? "relative bg-deckSurface overflow-hidden" : "sr-only",
+      className: solo ? "relative overflow-hidden bg-deckSurface" : "sr-only",
       ...!solo && {
-        inert: ""
+        inert: true
       }
-    }, !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleSidebarButton, {
+    }, !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleSidebarButton, {
       classNames: fixedSidebarToggleStyles
-    }), !topbar && !fullscreen && /* @__PURE__ */ React17.createElement(ToggleComplementarySidebarButton, {
+    }), !topbar && !fullscreen && /* @__PURE__ */ React14.createElement(ToggleComplementarySidebarButton, {
       classNames: fixedComplementarySidebarToggleStyles
-    }), /* @__PURE__ */ React17.createElement(StackContext.Provider, {
+    }), /* @__PURE__ */ React14.createElement(StackContext.Provider, {
       value: {
-        size: "contain",
         orientation: "horizontal",
+        size: "contain",
         rail: true
       }
-    }, /* @__PURE__ */ React17.createElement(Plank, {
+    }, /* @__PURE__ */ React14.createElement(Plank, {
       id: solo,
       companionId: solo ? activeCompanions?.[solo] : void 0,
       part: "solo",
       layoutMode,
       settings
-    })))), topbar && /* @__PURE__ */ React17.createElement(Topbar, null), hoistStatusbar && /* @__PURE__ */ React17.createElement(StatusBar, {
-      showHints: settings.showHints
-    })), /* @__PURE__ */ React17.createElement(PopoverContent, null), /* @__PURE__ */ React17.createElement(Dialog, null), toasts?.map((toast) => /* @__PURE__ */ React17.createElement(Toast, {
+    })))), topbar && /* @__PURE__ */ React14.createElement(Topbar, null), hoistStatusbar && /* @__PURE__ */ React14.createElement(StatusBar, {
+      showHints: settings?.showHints
+    }));
+  } finally {
+    _effect.f();
+  }
+};
+var PlankSeparator = ({ order, encapsulate }) => {
+  var _effect = _useSignals14();
+  try {
+    return order > 0 ? /* @__PURE__ */ React14.createElement("span", {
+      role: "separator",
+      className: mx6("row-span-2 bg-deckSurface", encapsulate ? "is-0" : "is-4"),
+      style: {
+        gridColumn: order
+      }
+    }) : null;
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/components/DeckLayout/Dialog.tsx
+import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
+import React15 from "react";
+import { Surface as Surface9, useCapability as useCapability7 } from "@dxos/app-framework/react";
+import { AlertDialog, Dialog as NaturalDialog } from "@dxos/react-ui";
+var Dialog = () => {
+  var _effect = _useSignals15();
+  try {
+    const context = useCapability7(DeckCapabilities.MutableDeckState);
+    const { dialogOpen, dialogType, dialogBlockAlign, dialogOverlayClasses, dialogOverlayStyle, dialogContent } = context;
+    const Root = dialogType === "alert" ? AlertDialog.Root : NaturalDialog.Root;
+    const Overlay = dialogType === "alert" ? AlertDialog.Overlay : NaturalDialog.Overlay;
+    return /* @__PURE__ */ React15.createElement(Root, {
+      modal: dialogBlockAlign !== "end",
+      open: dialogOpen,
+      onOpenChange: (nextOpen) => context.dialogOpen = nextOpen
+    }, dialogBlockAlign === "end" ? (
+      // TODO(burdon): Placeholder creates a suspense boundary; replace with defaults.
+      /* @__PURE__ */ React15.createElement(Surface9, {
+        role: "dialog",
+        data: dialogContent,
+        limit: 1,
+        fallback: PlankContentError,
+        placeholder: /* @__PURE__ */ React15.createElement("div", null)
+      })
+    ) : /* @__PURE__ */ React15.createElement(Overlay, {
+      blockAlign: dialogBlockAlign,
+      classNames: dialogOverlayClasses,
+      style: dialogOverlayStyle
+    }, /* @__PURE__ */ React15.createElement(Surface9, {
+      role: "dialog",
+      data: dialogContent,
+      limit: 1,
+      fallback: PlankContentError
+    })));
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/components/DeckLayout/Popover.tsx
+import { useSignals as _useSignals16 } from "@preact-signals/safe-react/tracking";
+import { createContext } from "@radix-ui/react-context";
+import React16, { useCallback as useCallback7, useEffect as useEffect5, useRef as useRef3, useState as useState3 } from "react";
+import { Surface as Surface10, useCapability as useCapability8 } from "@dxos/app-framework/react";
+import { Popover as Popover2 } from "@dxos/react-ui";
+var DEBOUNCE_DELAY = 40;
+var [DeckPopoverProvider, useDeckPopoverContext] = createContext("DeckPopover");
+var PopoverRoot = ({ children }) => {
+  var _effect = _useSignals16();
+  try {
+    const layout = useCapability8(DeckCapabilities.MutableDeckState);
+    const virtualRef = useRef3(null);
+    const [virtualIter, setVirtualIter] = useState3(0);
+    const [open, setOpen] = useState3(false);
+    const debounceRef = useRef3(null);
+    useEffect5(() => {
+      setOpen(false);
+      if (layout.popoverOpen) {
+        if (debounceRef.current) {
+          clearTimeout(debounceRef.current);
+        }
+        if (layout.popoverAnchor && virtualRef.current !== layout.popoverAnchor) {
+          virtualRef.current = layout.popoverAnchor ?? null;
+          setVirtualIter((iter) => iter + 1);
+        }
+        debounceRef.current = setTimeout(() => setOpen(true), DEBOUNCE_DELAY);
+      }
+    }, [
+      layout.popoverOpen,
+      layout.popoverAnchorId,
+      layout.popoverAnchor,
+      layout.popoverContent
+    ]);
+    return /* @__PURE__ */ React16.createElement(DeckPopoverProvider, {
+      setOpen
+    }, /* @__PURE__ */ React16.createElement(Popover2.Root, {
+      modal: false,
+      open
+    }, layout.popoverAnchor && /* @__PURE__ */ React16.createElement(Popover2.VirtualTrigger, {
+      key: virtualIter,
+      virtualRef
+    }), children));
+  } finally {
+    _effect.f();
+  }
+};
+var PopoverContent = () => {
+  var _effect = _useSignals16();
+  try {
+    const layout = useCapability8(DeckCapabilities.MutableDeckState);
+    const { setOpen } = useDeckPopoverContext("PopoverContent");
+    const handleClose = useCallback7((event) => {
+      if (
+        // TODO(thure): CodeMirror should not focus itself when it updates.
+        event.type === "dismissableLayer.focusOutside" && event.currentTarget?.classList.contains("cm-content")
+      ) {
+        event.preventDefault();
+      } else {
+        setOpen(false);
+        layout.popoverOpen = false;
+        layout.popoverAnchor = void 0;
+        layout.popoverAnchorId = void 0;
+        layout.popoverSide = void 0;
+      }
+    }, [
+      setOpen
+    ]);
+    return /* @__PURE__ */ React16.createElement(Popover2.Portal, null, /* @__PURE__ */ React16.createElement(Popover2.Content, {
+      side: layout.popoverSide,
+      sticky: "always",
+      hideWhenDetached: true,
+      onInteractOutside: handleClose,
+      onEscapeKeyDown: handleClose
+    }, /* @__PURE__ */ React16.createElement(Popover2.Viewport, null, /* @__PURE__ */ React16.createElement(Surface10, {
+      role: "card--popover",
+      data: layout.popoverContent,
+      limit: 1
+    })), /* @__PURE__ */ React16.createElement(Popover2.Arrow, null)));
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/components/DeckLayout/Toast.tsx
+import { useSignals as _useSignals17 } from "@preact-signals/safe-react/tracking";
+import React17 from "react";
+import { Button, Icon as Icon2, Toast as NaturalToast, toLocalizedString as toLocalizedString3, useTranslation as useTranslation7 } from "@dxos/react-ui";
+var Toast = ({ id, title, description, icon, duration, actionLabel, actionAlt, closeLabel, onAction, onOpenChange }) => {
+  var _effect = _useSignals17();
+  try {
+    const { t } = useTranslation7(meta.id);
+    return /* @__PURE__ */ React17.createElement(NaturalToast.Root, {
+      "data-testid": id,
+      defaultOpen: true,
+      duration,
+      onOpenChange
+    }, /* @__PURE__ */ React17.createElement(NaturalToast.Body, null, /* @__PURE__ */ React17.createElement(NaturalToast.Title, {
+      classNames: "items-center"
+    }, icon && /* @__PURE__ */ React17.createElement(Icon2, {
+      icon,
+      classNames: "inline mr-1"
+    }), title && /* @__PURE__ */ React17.createElement("span", null, toLocalizedString3(title, t))), description && /* @__PURE__ */ React17.createElement(NaturalToast.Description, null, description && toLocalizedString3(description, t))), /* @__PURE__ */ React17.createElement(NaturalToast.Actions, null, onAction && actionAlt && actionLabel && /* @__PURE__ */ React17.createElement(NaturalToast.Action, {
+      altText: toLocalizedString3(actionAlt, t),
+      asChild: true
+    }, /* @__PURE__ */ React17.createElement(Button, {
+      "data-testid": "toast.action",
+      variant: "primary",
+      onClick: () => onAction?.()
+    }, toLocalizedString3(actionLabel, t))), closeLabel && /* @__PURE__ */ React17.createElement(NaturalToast.Close, {
+      asChild: true
+    }, /* @__PURE__ */ React17.createElement(Button, {
+      "data-testid": "toast.close"
+    }, toLocalizedString3(closeLabel, t)))));
+  } finally {
+    _effect.f();
+  }
+};
+var Toaster = ({ toasts, onDismissToast }) => {
+  var _effect = _useSignals17();
+  try {
+    return /* @__PURE__ */ React17.createElement(React17.Fragment, null, toasts?.map((toast) => /* @__PURE__ */ React17.createElement(Toast, {
       ...toast,
       key: toast.id,
       onOpenChange: (open) => {
         if (!open) {
-          onDismissToast(toast.id);
+          onDismissToast?.(toast.id);
         }
         return open;
       }
@@ -1428,59 +1463,83 @@ var DeckLayout = ({ onDismissToast }) => {
   }
 };
 
+// src/components/DeckLayout/DeckLayout.tsx
+var DeckLayout = ({ onDismissToast }) => {
+  var _effect = _useSignals18();
+  try {
+    const context = useCapability9(DeckCapabilities.MutableDeckState);
+    const { toasts } = context;
+    return /* @__PURE__ */ React18.createElement(PopoverRoot, null, /* @__PURE__ */ React18.createElement(ActiveNode, null), /* @__PURE__ */ React18.createElement(DeckMain, null), /* @__PURE__ */ React18.createElement(PopoverContent, null), /* @__PURE__ */ React18.createElement(Dialog, null), /* @__PURE__ */ React18.createElement(Toaster, {
+      toasts,
+      onDismissToast
+    }));
+  } finally {
+    _effect.f();
+  }
+};
+
 // src/components/DeckSettings/DeckSettings.tsx
-import { useSignals as _useSignals18 } from "@preact-signals/safe-react/tracking";
-import React18 from "react";
+import { useSignals as _useSignals19 } from "@preact-signals/safe-react/tracking";
+import React19 from "react";
 import { Input, Select, useTranslation as useTranslation8 } from "@dxos/react-ui";
-import { DeprecatedFormContainer, DeprecatedFormInput } from "@dxos/react-ui-form";
+import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from "@dxos/react-ui-form";
 var isSocket = !!globalThis.__args;
 var DeckSettings = ({ settings }) => {
-  var _effect = _useSignals18();
+  var _effect = _useSignals19();
   try {
-    const { t } = useTranslation8(DECK_PLUGIN);
-    return /* @__PURE__ */ React18.createElement(DeprecatedFormContainer, null, /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
-      label: t("settings enable deck label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    const { t } = useTranslation8(meta.id);
+    return /* @__PURE__ */ React19.createElement(ControlPage, null, /* @__PURE__ */ React19.createElement(ControlSection, {
+      title: t("settings title", {
+        ns: meta.id
+      })
+    }, /* @__PURE__ */ React19.createElement(ControlGroup, null, /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("settings enable deck label")
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.enableDeck,
       onCheckedChange: (checked) => settings.enableDeck = checked
-    })), /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
-      label: t("select new plank positioning label")
-    }, /* @__PURE__ */ React18.createElement(Select.Root, {
+    })), /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("settings encapsulated planks label")
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
+      checked: settings.encapsulatedPlanks ?? false,
+      onCheckedChange: (checked) => settings.encapsulatedPlanks = checked
+    })), /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("select new plank positioning label")
+    }, /* @__PURE__ */ React19.createElement(Select.Root, {
       disabled: !settings.enableDeck,
       value: settings.newPlankPositioning ?? "start",
       onValueChange: (value) => settings.newPlankPositioning = value
-    }, /* @__PURE__ */ React18.createElement(Select.TriggerButton, {
+    }, /* @__PURE__ */ React19.createElement(Select.TriggerButton, {
       placeholder: t("select new plank positioning placeholder")
-    }), /* @__PURE__ */ React18.createElement(Select.Portal, null, /* @__PURE__ */ React18.createElement(Select.Content, null, /* @__PURE__ */ React18.createElement(Select.Viewport, null, NewPlankPositions.map((position) => /* @__PURE__ */ React18.createElement(Select.Option, {
+    }), /* @__PURE__ */ React19.createElement(Select.Portal, null, /* @__PURE__ */ React19.createElement(Select.Content, null, /* @__PURE__ */ React19.createElement(Select.Viewport, null, NewPlankPositions.map((position) => /* @__PURE__ */ React19.createElement(Select.Option, {
       key: position,
       value: position
-    }, t(`settings new plank position ${position} label`)))))))), /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
-      label: t("settings overscroll label")
-    }, /* @__PURE__ */ React18.createElement(Select.Root, {
+    }, t(`settings new plank position ${position} label`)))), /* @__PURE__ */ React19.createElement(Select.Arrow, null))))), /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("settings overscroll label")
+    }, /* @__PURE__ */ React19.createElement(Select.Root, {
       disabled: !settings.enableDeck,
       value: settings.overscroll ?? "none",
       onValueChange: (value) => settings.overscroll = value
-    }, /* @__PURE__ */ React18.createElement(Select.TriggerButton, {
+    }, /* @__PURE__ */ React19.createElement(Select.TriggerButton, {
       placeholder: t("select overscroll placeholder")
-    }), /* @__PURE__ */ React18.createElement(Select.Portal, null, /* @__PURE__ */ React18.createElement(Select.Content, null, /* @__PURE__ */ React18.createElement(Select.Viewport, null, OverscrollOptions.map((option) => /* @__PURE__ */ React18.createElement(Select.Option, {
+    }), /* @__PURE__ */ React19.createElement(Select.Portal, null, /* @__PURE__ */ React19.createElement(Select.Content, null, /* @__PURE__ */ React19.createElement(Select.Viewport, null, OverscrollOptions.map((option) => /* @__PURE__ */ React19.createElement(Select.Option, {
       key: option,
       value: option
-    }, t(`settings overscroll ${option} label`)))))))), /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
-      label: t("settings enable statusbar label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    }, t(`settings overscroll ${option} label`)))), /* @__PURE__ */ React19.createElement(Select.Arrow, null))))), /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("settings enable statusbar label")
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.enableStatusbar,
       onCheckedChange: (checked) => settings.enableStatusbar = checked
-    })), /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
-      label: t("settings show hints label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    })), /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("settings show hints label")
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.showHints,
       onCheckedChange: (checked) => settings.showHints = checked
-    })), !isSocket && /* @__PURE__ */ React18.createElement(DeprecatedFormInput, {
-      label: t("settings native redirect label")
-    }, /* @__PURE__ */ React18.createElement(Input.Switch, {
+    })), !isSocket && /* @__PURE__ */ React19.createElement(ControlItemInput, {
+      title: t("settings native redirect label")
+    }, /* @__PURE__ */ React19.createElement(Input.Switch, {
       checked: settings.enableNativeRedirect,
       onCheckedChange: (checked) => settings.enableNativeRedirect = checked
-    })));
+    })))));
   } finally {
     _effect.f();
   }
@@ -1491,4 +1550,4 @@ export {
   DeckLayout,
   DeckSettings
 };
-//# sourceMappingURL=chunk-QBKDUEDV.mjs.map
+//# sourceMappingURL=chunk-VUJ6UNIJ.mjs.map