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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fffef41",
   "description": "DXOS Surface plugin for the main application layout.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,19 +10,21 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     },
     "./types": {
-      "types": "./dist/types/src/types.d.ts",
-      "browser": "./dist/lib/browser/types.mjs"
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "browser": "./dist/lib/browser/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
       "types": [
-        "dist/types/src/types.d.ts"
+        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -31,57 +33,59 @@
     "src"
   ],
   "dependencies": {
+    "@effect/ai": "0.29.1",
+    "@effect/experimental": "0.56.0",
     "@fluentui/react-tabster": "^9.24.2",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.16.13",
     "immer": "^10.1.1",
-    "@dxos/ai": "0.8.4-main.f9ba587",
-    "@dxos/app-framework": "0.8.4-main.f9ba587",
-    "@dxos/artifact": "0.8.4-main.f9ba587",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/echo": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/echo-signals": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/keyboard": "0.8.4-main.f9ba587",
-    "@dxos/local-storage": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/plugin-graph": "0.8.4-main.f9ba587",
-    "@dxos/plugin-attention": "0.8.4-main.f9ba587",
-    "@dxos/plugin-theme": "0.8.4-main.f9ba587",
-    "@dxos/plugin-observability": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-attention": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-stack": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-tabs": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@dxos/app-framework": "0.8.4-main.fffef41",
+    "@dxos/ai": "0.8.4-main.fffef41",
+    "@dxos/assistant": "0.8.4-main.fffef41",
+    "@dxos/async": "0.8.4-main.fffef41",
+    "@dxos/blueprints": "0.8.4-main.fffef41",
+    "@dxos/debug": "0.8.4-main.fffef41",
+    "@dxos/echo-signals": "0.8.4-main.fffef41",
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/live-object": "0.8.4-main.fffef41",
+    "@dxos/keyboard": "0.8.4-main.fffef41",
+    "@dxos/local-storage": "0.8.4-main.fffef41",
+    "@dxos/plugin-attention": "0.8.4-main.fffef41",
+    "@dxos/echo": "0.8.4-main.fffef41",
+    "@dxos/plugin-graph": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/plugin-observability": "0.8.4-main.fffef41",
+    "@dxos/plugin-theme": "0.8.4-main.fffef41",
+    "@dxos/react-client": "0.8.4-main.fffef41",
+    "@dxos/react-ui-attention": "0.8.4-main.fffef41",
+    "@dxos/react-ui-form": "0.8.4-main.fffef41",
+    "@dxos/react-ui-tabs": "0.8.4-main.fffef41",
+    "@dxos/react-ui-stack": "0.8.4-main.fffef41",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "@effect-atom/atom-react": "^0.3.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41",
+    "@dxos/storybook-utils": "0.8.4-main.fffef41",
+    "@dxos/react-ui": "0.8.4-main.fffef41"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41"
   },
   "publishConfig": {
     "access": "public"

package/src/DeckPlugin.ts

@@ -4,7 +4,7 @@
 
 import { setAutoFreeze } from 'immer';
 
-import { allOf, Capabilities, contributes, defineModule, definePlugin, Events, oneOf } from '@dxos/app-framework';
+import { Capabilities, Events, allOf, contributes, defineModule, definePlugin, oneOf } from '@dxos/app-framework';
 import { translations as stackTranslations } from '@dxos/react-ui-stack';
 
 import {
@@ -15,7 +15,7 @@ import {
   LayoutIntentResolver,
   ReactRoot,
   ReactSurface,
-  Tools,
+  Toolkit,
   UrlHandler,
 } from './capabilities';
 import { DeckEvents } from './events';
@@ -27,60 +27,65 @@ import { translations } from './translations';
 // TODO(Zan): Move this to a more global location if we use immer more broadly.
 setAutoFreeze(false);
 
-export const DeckPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/check-app-scheme`,
-      activatesOn: Events.SettingsReady,
-      activate: CheckAppScheme,
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: DeckSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/layout`,
-      // TODO(wittjosiah): Does not integrate with settings store.
-      //   Should this be a different event?
-      //   Should settings store be renamed to be more generic?
-      activatesOn: oneOf(Events.SetupSettings, Events.SetupAppGraph),
-      activatesAfter: [Events.LayoutReady, DeckEvents.StateReady],
-      activate: DeckState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...stackTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-root`,
-      activatesOn: Events.Startup,
-      activate: ReactRoot,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/layout-intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: LayoutIntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/tools`,
-      activatesOn: Events.SetupArtifactDefinition,
-      activate: Tools,
-    }),
-    defineModule({
-      id: `${meta.id}/module/url`,
-      activatesOn: allOf(Events.DispatcherReady, DeckEvents.StateReady),
-      activate: UrlHandler,
-    }),
-  ]);
+export const DeckPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/check-app-scheme`,
+    activatesOn: Events.SettingsReady,
+    activate: CheckAppScheme,
+  }),
+  defineModule({
+    id: `${meta.id}/module/settings`,
+    activatesOn: Events.SetupSettings,
+    activate: DeckSettings,
+  }),
+  defineModule({
+    id: `${meta.id}/module/layout`,
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: oneOf(Events.SetupSettings, Events.SetupAppGraph),
+    activatesAfter: [Events.LayoutReady, DeckEvents.StateReady],
+    activate: DeckState,
+  }),
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, [...translations, ...stackTranslations]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-root`,
+    activatesOn: Events.Startup,
+    activate: ReactRoot,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/layout-intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: LayoutIntentResolver,
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-builder`,
+    activatesOn: Events.SetupAppGraph,
+    activate: AppGraphBuilder,
+  }),
+  // defineModule({
+  //   id: `${meta.id}/module/tools`,
+  //   activatesOn: Events.SetupArtifactDefinition,
+  //   activate: Tools,
+  // }),
+  defineModule({
+    id: `${meta.id}/module/toolkit`,
+    // TODO(wittjosiah): Shouldn't use the startup event.
+    activatesOn: Events.Startup,
+    activate: Toolkit,
+  }),
+  defineModule({
+    id: `${meta.id}/module/url`,
+    activatesOn: allOf(Events.DispatcherReady, DeckEvents.StateReady),
+    activate: UrlHandler,
+  }),
+]);

package/src/capabilities/app-graph-builder.ts

@@ -2,24 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import { Atom } from '@effect-atom/atom-react';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
-import { Capabilities, contributes, createIntent, LayoutAction, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
-import { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
+import { ROOT_ID, atomFromSignal, createExtension } from '@dxos/plugin-graph';
+
+import { meta } from '../meta';
 
 import { DeckCapabilities } from './capabilities';
-import { DECK_PLUGIN } from '../meta';
 
 export default (context: PluginContext) =>
   contributes(
     Capabilities.AppGraphBuilder,
     createExtension({
-      id: DECK_PLUGIN,
+      id: meta.id,
       actions: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => {
@@ -27,23 +29,23 @@ export default (context: PluginContext) =>
 
               // NOTE(Zan): This is currently disabled.
               // TODO(Zan): Fullscreen needs to know the active node and provide that to the layout part.
-              const _fullscreen = {
-                id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,
-                data: async () => {
-                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                  await dispatch(
-                    createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }),
-                  );
-                },
-                properties: {
-                  label: ['toggle fullscreen label', { ns: DECK_PLUGIN }],
-                  icon: 'ph--arrows-out--regular',
-                  keyBinding: {
-                    macos: 'ctrl+meta+f',
-                    windows: 'shift+ctrl+f',
-                  },
-                },
-              };
+              // const _fullscreen = {
+              //   id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,
+              //   data: async () => {
+              //     const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+              //     await dispatch(
+              //       createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }),
+              //     );
+              //   },
+              //   properties: {
+              //     label: ['toggle fullscreen label', { ns: meta.id }],
+              //     icon: 'ph--arrows-out--regular',
+              //     keyBinding: {
+              //       macos: 'ctrl+meta+f',
+              //       windows: 'shift+ctrl+f',
+              //     },
+              //   },
+              // };
 
               const closeCurrent = {
                 id: `${LayoutAction.Close._tag}/current`,
@@ -62,7 +64,7 @@ export default (context: PluginContext) =>
                   }
                 },
                 properties: {
-                  label: ['close current label', { ns: DECK_PLUGIN }],
+                  label: ['close current label', { ns: meta.id }],
                   icon: 'ph--x--regular',
                 },
               };
@@ -79,7 +81,7 @@ export default (context: PluginContext) =>
                   );
                 },
                 properties: {
-                  label: ['close others label', { ns: DECK_PLUGIN }],
+                  label: ['close others label', { ns: meta.id }],
                   icon: 'ph--x-square--regular',
                 },
               };
@@ -97,7 +99,7 @@ export default (context: PluginContext) =>
                   );
                 },
                 properties: {
-                  label: ['close all label', { ns: DECK_PLUGIN }],
+                  label: ['close all label', { ns: meta.id }],
                   icon: 'ph--x-circle--regular',
                 },
               };
@@ -110,13 +112,13 @@ export default (context: PluginContext) =>
                 properties: {
                   label: [
                     get(
-                      rxFromSignal(() =>
+                      atomFromSignal(() =>
                         state.sidebarState === 'expanded'
                           ? 'collapse navigation sidebar label'
                           : 'open navigation sidebar label',
                       ),
                     ),
-                    { ns: DECK_PLUGIN },
+                    { ns: meta.id },
                   ],
                   icon: 'ph--sidebar--regular',
                   keyBinding: {
@@ -129,7 +131,7 @@ export default (context: PluginContext) =>
               };
 
               return get(
-                rxFromSignal(() =>
+                atomFromSignal(() =>
                   !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar],
                 ),
               );

package/src/capabilities/capabilities.ts

@@ -5,10 +5,10 @@
 import { defineCapability } from '@dxos/app-framework';
 import { type DeepReadonly } from '@dxos/util';
 
-import { DECK_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type DeckPluginState } from '../types';
 
 export namespace DeckCapabilities {
-  export const DeckState = defineCapability<DeepReadonly<DeckPluginState>>(`${DECK_PLUGIN}/capability/state`);
-  export const MutableDeckState = defineCapability<DeckPluginState>(`${DECK_PLUGIN}/capability/state`);
+  export const DeckState = defineCapability<DeepReadonly<DeckPluginState>>(`${meta.id}/capability/state`);
+  export const MutableDeckState = defineCapability<DeckPluginState>(`${meta.id}/capability/state`);
 }

package/src/capabilities/check-app-scheme.ts

@@ -2,9 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 
-import { DECK_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type DeckSettingsProps } from '../types';
 
 const isSocket = !!(globalThis as any).__args;
@@ -31,7 +31,7 @@ const checkAppScheme = (url: string) => {
 };
 
 export default async (context: PluginContext) => {
-  const settings = context.getCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(DECK_PLUGIN)?.value;
+  const settings = context.getCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(meta.id)?.value;
   if (!isSocket && settings?.enableNativeRedirect) {
     checkAppScheme(appScheme);
   }

package/src/capabilities/index.ts

@@ -11,7 +11,8 @@ export const DeckState = lazy(() => import('./state'));
 export const LayoutIntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactRoot = lazy(() => import('./react-root'));
 export const ReactSurface = lazy(() => import('./react-surface'));
-export const Tools = lazy(() => import('./tools'));
+// export const Tools = lazy(() => import('./tools'));
+export const Toolkit = lazy(() => import('./toolkit'));
 export const UrlHandler = lazy(() => import('./url-handler'));
 
 export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -3,17 +3,20 @@
 //
 
 import { batch } from '@preact/signals-core';
-import { Schema, Effect, pipe, Option } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
 
 import {
   Capabilities,
-  createResolver,
-  contributes,
   IntentAction,
   LayoutAction,
   type PluginContext,
-  createIntent,
   chain,
+  contributes,
+  createIntent,
+  createResolver,
 } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
@@ -24,20 +27,21 @@ import { isActionLike } from '@dxos/plugin-graph';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { byPosition, isNonNullable } from '@dxos/util';
 
-import { DeckCapabilities } from './capabilities';
 import { closeEntry, createEntryId, incrementPlank, openEntry } from '../layout';
-import { DECK_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import {
   DeckAction,
-  type LayoutMode,
   type DeckSettingsProps,
-  isLayoutMode,
-  getMode,
-  defaultDeck,
+  type LayoutMode,
   PLANK_COMPANION_TYPE,
+  defaultDeck,
+  getMode,
+  isLayoutMode,
 } from '../types';
 import { setActive } from '../util';
 
+import { DeckCapabilities } from './capabilities';
+
 export default (context: PluginContext) =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
@@ -55,11 +59,11 @@ export default (context: PluginContext) =>
           ...layout.toasts,
           {
             id: layout.currentUndoId,
-            title: data.message ?? ['undo available label', { ns: DECK_PLUGIN }],
+            title: data.message ?? ['undo available label', { ns: meta.id }],
             duration: 10_000,
-            actionLabel: ['undo action label', { ns: DECK_PLUGIN }],
-            actionAlt: ['undo action alt', { ns: DECK_PLUGIN }],
-            closeLabel: ['undo close label', { ns: DECK_PLUGIN }],
+            actionLabel: ['undo action label', { ns: meta.id }],
+            actionAlt: ['undo action alt', { ns: meta.id }],
+            closeLabel: ['undo close label', { ns: meta.id }],
             onAction: () => undo(),
           },
         ];
@@ -87,12 +91,11 @@ export default (context: PluginContext) =>
         Schema.is(LayoutAction.UpdateComplementary.fields.input)(data),
       resolve: ({ subject, options }) => {
         const layout = context.getCapability(DeckCapabilities.MutableDeckState);
-
         if (layout.complementarySidebarPanel !== subject) {
           layout.complementarySidebarPanel = subject;
         }
 
-        const next = subject ? 'expanded' : options?.state ?? layout.complementarySidebarState;
+        const next = subject ? 'expanded' : (options?.state ?? layout.complementarySidebarState);
         if (next !== layout.complementarySidebarState) {
           layout.complementarySidebarState = next;
         }
@@ -260,7 +263,7 @@ export default (context: PluginContext) =>
           const attention = context.getCapability(AttentionCapabilities.Attention);
           const settings = context
             .getCapabilities(Capabilities.SettingsStore)[0]
-            ?.getStore<DeckSettingsProps>(DECK_PLUGIN)?.value;
+            ?.getStore<DeckSettingsProps>(meta.id)?.value;
 
           if (options?.workspace && state.activeDeck !== options?.workspace) {
             const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
@@ -402,7 +405,7 @@ export default (context: PluginContext) =>
           }
 
           if (adjustment.type === 'companion') {
-            return pipe(
+            return Function.pipe(
               graph.getNode(adjustment.id),
               Option.map((node) =>
                 graph
@@ -453,7 +456,7 @@ export default (context: PluginContext) =>
                 return {
                   intents: [
                     // NOTE: The order of these is important.
-                    pipe(
+                    Function.pipe(
                       createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'deck' } }),
                       chain(LayoutAction.Open, { part: 'main', subject: [entryId] }),
                     ),

package/src/capabilities/react-root.tsx

@@ -4,15 +4,17 @@
 
 import React, { useCallback } from 'react';
 
-import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
+import { Capabilities, contributes } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 
-import { DeckCapabilities } from './capabilities';
 import { DeckLayout } from '../components';
-import { DECK_PLUGIN } from '../meta';
+import { meta } from '../meta';
+
+import { DeckCapabilities } from './capabilities';
 
 export default () =>
   contributes(Capabilities.ReactRoot, {
-    id: DECK_PLUGIN,
+    id: meta.id,
     root: () => {
       const layout = useCapability(DeckCapabilities.MutableDeckState);
 

package/src/capabilities/react-surface.tsx

@@ -7,21 +7,21 @@ import React from 'react';
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { SettingsStore } from '@dxos/local-storage';
 
-import { DeckSettings, Banner } from '../components';
-import { DECK_PLUGIN } from '../meta';
+import { Banner, DeckSettings } from '../components';
+import { meta } from '../meta';
 import { type DeckSettingsProps } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: `${DECK_PLUGIN}/plugin-settings`,
+      id: `${meta.id}/plugin-settings`,
       role: 'article',
       filter: (data): data is { subject: SettingsStore<DeckSettingsProps> } =>
-        data.subject instanceof SettingsStore && data.subject.prefix === DECK_PLUGIN,
+        data.subject instanceof SettingsStore && data.subject.prefix === meta.id,
       component: ({ data: { subject } }) => <DeckSettings settings={subject.value} />,
     }),
     createSurface({
-      id: `${DECK_PLUGIN}/banner`,
+      id: `${meta.id}/banner`,
       role: 'banner',
       component: ({ data }) => {
         return <Banner variant={data.variant} />;

package/src/capabilities/settings.ts

@@ -6,7 +6,7 @@ import { Capabilities, contributes } from '@dxos/app-framework';
 import { live } from '@dxos/live-object';
 
 import { meta } from '../meta';
-import { DeckSettingsSchema, type DeckSettingsProps } from '../types';
+import { type DeckSettingsProps, DeckSettingsSchema } from '../types';
 
 export default () => {
   const settings = live<DeckSettingsProps>({
@@ -16,6 +16,7 @@ export default () => {
     enableNativeRedirect: false,
     newPlankPositioning: 'start',
     overscroll: 'none',
+    encapsulatedPlanks: false,
   });
 
   return contributes(Capabilities.Settings, {