@dxos/plugin-board 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-board",
-  "version": "0.8.4-main.3eb6e50203",
+  "version": "0.8.4-main.3fbcb4aa9b",
   "description": "Surface plugin for card baords",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,83 +12,119 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": "./src/BoardPlugin.tsx",
+      "types": "./dist/types/src/BoardPlugin.d.ts",
+      "default": "./dist/lib/neutral/BoardPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "exports": {
     ".": {
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
       "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./types": {
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "effect": "3.19.16",
-    "@dxos/ai": "0.8.4-main.3eb6e50203",
-    "@dxos/app-framework": "0.8.4-main.3eb6e50203",
-    "@dxos/assistant": "0.8.4-main.3eb6e50203",
-    "@dxos/blueprints": "0.8.4-main.3eb6e50203",
-    "@dxos/async": "0.8.4-main.3eb6e50203",
-    "@dxos/client": "0.8.4-main.3eb6e50203",
-    "@dxos/echo": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-react": "0.8.4-main.3eb6e50203",
-    "@dxos/effect": "0.8.4-main.3eb6e50203",
-    "@dxos/invariant": "0.8.4-main.3eb6e50203",
-    "@dxos/log": "0.8.4-main.3eb6e50203",
-    "@dxos/operation": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-client": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-search": "0.8.4-main.3eb6e50203",
-    "@dxos/app-toolkit": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-space": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-graph": "0.8.4-main.3eb6e50203",
-    "@dxos/random": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-attention": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-form": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-board": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-mosaic": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-stack": "0.8.4-main.3eb6e50203",
-    "@dxos/schema": "0.8.4-main.3eb6e50203",
-    "@dxos/types": "0.8.4-main.3eb6e50203",
-    "@dxos/util": "0.8.4-main.3eb6e50203",
-    "@dxos/react-client": "0.8.4-main.3eb6e50203"
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "effect": "3.20.0",
+    "@dxos/ai": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/assistant": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/app-toolkit": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/effect": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-atom": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-react": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/invariant": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/app-framework": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-graph": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-markdown": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-search": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-space": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-board": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-form": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-attention": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-mosaic": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-stack": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/schema": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/types": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/util": "0.8.4-main.3fbcb4aa9b"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/plugin-preview": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-testing": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3eb6e50203",
-    "@dxos/storybook-utils": "0.8.4-main.3eb6e50203",
-    "@dxos/test-utils": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-theme": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-theme": "0.8.4-main.3eb6e50203"
+    "vite": "^8.0.10",
+    "@dxos/plugin-preview": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-testing": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-theme": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/test-utils": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
   },
   "peerDependencies": {
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-theme": "0.8.4-main.3eb6e50203"
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
   },
   "publishConfig": {
     "access": "public"

package/src/BoardPlugin.test.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { BoardPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('BoardPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), BoardPlugin()],
+    });
+
+    // Modules expected to be active after a normal startup.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('CreateObject'), moduleId('schema'), moduleId('ReactSurface')]),
+    );
+  });
+});

package/src/BoardPlugin.tsx

@@ -2,32 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { type CreateObject } from '@dxos/plugin-space/types';
-import { translations as boardTranslations } from '@dxos/react-ui-board';
+import { translations as boardTranslations } from '@dxos/react-ui-board/translations';
 
-import { ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { Board } from './types';
+import { CreateObject, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { Board } from '#types';
 
 export const BoardPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Board.Board.typename,
-      metadata: {
-        icon: 'ph--squares-four--regular',
-        iconHue: 'green',
-        createObject: ((props) => Effect.sync(() => Board.makeBoard(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
-      },
-    },
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addSchemaModule({ schema: [Board.Board] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations: [...translations, ...boardTranslations] }),
   Plugin.make,
 );
+
+export default BoardPlugin;

package/src/capabilities/create-object.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+
+import { Board } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: Board.Board.typename,
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const object = Board.makeBoard(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -2,4 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,31 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+
+import { BoardContainer } from '#containers';
+import { Board } from '#types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'root',
+        // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
+        filter: AppSurface.oneOf(
+          AppSurface.object(AppSurface.Article, Board.Board),
+          AppSurface.object(AppSurface.Section, Board.Board),
+        ),
+        component: ({ role, data }) => (
+          <BoardContainer role={role} subject={data.subject} attendableId={data.attendableId} />
+        ),
+      }),
+    ]),
+  ),
+);

package/src/components/index.ts

@@ -1,5 +1,3 @@
 //
 // Copyright 2024 DXOS.org
 //
-
-export * from './BoardContainer';

package/src/{components → containers/BoardContainer}/BoardContainer.stories.tsx

@@ -8,21 +8,22 @@ import React, { useEffect, useState } from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Obj } from '@dxos/echo';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { PreviewPlugin } from '@dxos/plugin-preview';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { PreviewPlugin } from '@dxos/plugin-preview/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { Filter, Ref, useQuery, useSpaces } from '@dxos/react-client/echo';
-import { withTheme } from '@dxos/react-ui/testing';
-import { translations as stackTranslations } from '@dxos/react-ui-stack';
+import { translations as stackTranslations } from '@dxos/react-ui-stack/translations';
+import { withLayout } from '@dxos/react-ui/testing';
 import { Organization, Person } from '@dxos/types';
 
-import { translations } from '../translations';
-import { Board } from '../types';
+import { translations } from '#translations';
+import { Board } from '#types';
 
 import { BoardContainer } from './BoardContainer';
 
-faker.seed(0);
+random.seed(0);
 
 const createBoard = () =>
   Obj.make(Board.Board, {
@@ -36,12 +37,12 @@ const createBoard = () =>
 
 const createOrg = () =>
   Obj.make(Organization.Organization, {
-    name: faker.commerce.productName(),
-    description: faker.lorem.paragraph(),
-    image: faker.image.url(),
-    website: faker.internet.url(),
+    name: random.commerce.productName(),
+    description: random.lorem.paragraph(),
+    image: random.image.url(),
+    website: random.internet.url(),
     // TODO(burdon): Fix.
-    // status: faker.helpers.arrayElement(Organization.StatusOptions).id,
+    // status: random.helpers.arrayElement(Organization.StatusOptions).id,
   });
 
 const DefaultStory = () => {
@@ -61,7 +62,7 @@ const DefaultStory = () => {
     return null;
   }
 
-  return <BoardContainer role='board' subject={board} />;
+  return <BoardContainer role='board' subject={board} attendableId='test' />;
 };
 
 //
@@ -69,10 +70,10 @@ const DefaultStory = () => {
 //
 
 const meta = {
-  title: 'plugins/plugin-board/Board',
+  title: 'plugins/plugin-board/containers/BoardContainer',
   render: DefaultStory,
   decorators: [
-    withTheme(),
+    withLayout({ layout: 'fullscreen' }),
     withPluginManager({
       plugins: [
         ...corePlugins(),
@@ -80,18 +81,18 @@ const meta = {
           types: [Organization.Organization, Person.Person, Board.Board],
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
-              yield* Effect.promise(() => client.halo.createIdentity());
+              yield* initializeIdentity(client);
               const space = yield* Effect.promise(() => client.spaces.create());
               yield* Effect.promise(() => space.waitUntilReady());
               const board = space.db.add(createBoard());
 
-              Obj.change(board, (b) => {
+              Obj.update(board, (board) => {
                 // Add some sample items
                 Array.from({ length: 10 }).map(() => {
                   const org = createOrg();
                   space.db.add(org);
-                  b.items.push(Ref.make(org));
-                  b.layout.cells[org.id] = {
+                  board.items.push(Ref.make(org));
+                  board.layout.cells[org.id] = {
                     x: Math.floor(Math.random() * 5) - 2,
                     y: Math.floor(Math.random() * 5) - 2,
                     width: 1,

package/src/{components → containers/BoardContainer}/BoardContainer.tsx

@@ -2,21 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
+import { useAtomValue } from '@effect-atom/atom-react';
+import * as Atom from '@effect-atom/atom/Atom';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Filter, Obj, Ref } from '@dxos/echo';
-import { useObject, useObjects } from '@dxos/echo-react';
+import { AtomObj } from '@dxos/echo-atom';
+import { useObject } from '@dxos/echo-react';
 import { invariant } from '@dxos/invariant';
+import { Markdown } from '@dxos/plugin-markdown';
 import { useQuery } from '@dxos/react-client/echo';
-import { Layout } from '@dxos/react-ui';
+import { Panel } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
 import { Board, type BoardController, type BoardRootProps, type Position } from '@dxos/react-ui-board';
 import { ObjectPicker, type ObjectPickerContentProps } from '@dxos/react-ui-form';
 import { isNonNullable } from '@dxos/util';
 
-import { type Board as BoardType } from '../types';
+import { type Board as BoardType } from '#types';
 
 const DEFAULT_POSITION = { x: 0, y: 0 } satisfies Position;
 
@@ -24,18 +28,32 @@ type PickerState = {
   position: Position;
 };
 
-export type BoardContainerProps = SurfaceComponentProps<BoardType.Board>;
+export type BoardContainerProps = AppSurface.ObjectArticleProps<BoardType.Board>;
 
-export const BoardContainer = ({ role, subject: board }: BoardContainerProps) => {
-  const controller = useRef<BoardController>(null);
+export const BoardContainer = ({ role, subject: board, attendableId }: BoardContainerProps) => {
+  const { hasAttention } = useAttention(attendableId);
+  const db = Obj.getDatabase(board);
   const [boardItems] = useObject(board, 'items');
-  const items = useObjects(boardItems ?? []);
+  const itemsAtom = useMemo(
+    () =>
+      Atom.make((get) => {
+        const result: Obj.Unknown[] = [];
+        for (const ref of boardItems ?? []) {
+          const obj = get(AtomObj.makeWithReactive(ref));
+          if (obj) {
+            result.push(obj);
+          }
+        }
+        return result;
+      }),
+    [boardItems],
+  );
+  const items = useAtomValue(itemsAtom);
+
+  const controller = useRef<BoardController>(null);
   const addTriggerRef = useRef<HTMLButtonElement | null>(null);
   const [pickerState, setPickerState] = useState<PickerState | null>(null);
-  const attendableId = Obj.getDXN(board).toString();
-  const { hasAttention } = useAttention(attendableId);
 
-  const db = Obj.getDatabase(board);
   // TODO(burdon): Use search.
   const objects = useQuery(db, Filter.everything());
   const options = useMemo<ObjectPickerContentProps['options']>(
@@ -58,13 +76,22 @@ export const BoardContainer = ({ role, subject: board }: BoardContainerProps) =>
   );
 
   const handleAdd = useCallback<NonNullable<BoardRootProps['onAdd']>>(
-    async (anchor, position = DEFAULT_POSITION) => {
+    async (anchor, position) => {
       const db = Obj.getDatabase(board);
       invariant(db);
+      // Grid backdrop "+" supplies a position → create a new Markdown document directly.
+      // Toolbar "+" omits position → fall back to the picker over existing objects.
+      if (position) {
+        const doc = db.add(Markdown.make());
+        Obj.update(board, (board) => {
+          board.items.push(Ref.make(doc));
+          board.layout.cells[doc.id.toString()] = position;
+        });
+        return;
+      }
+
       addTriggerRef.current = anchor;
-      setPickerState({
-        position,
-      });
+      setPickerState({ position: DEFAULT_POSITION });
     },
     [board],
   );
@@ -74,11 +101,11 @@ export const BoardContainer = ({ role, subject: board }: BoardContainerProps) =>
     (id) => {
       // TODO(burdon): Impl. DXN.equals and pass in DXN from `id`.
       const idx = board.items.findIndex((ref) => ref.dxn.asEchoDXN()?.echoId === id);
-      Obj.change(board, (b) => {
+      Obj.update(board, (board) => {
         if (idx !== -1) {
-          b.items.splice(idx, 1);
+          board.items.splice(idx, 1);
         }
-        delete b.layout.cells[id];
+        delete board.layout.cells[id];
       });
     },
     [board],
@@ -87,8 +114,8 @@ export const BoardContainer = ({ role, subject: board }: BoardContainerProps) =>
   const handleMove = useCallback<NonNullable<BoardRootProps['onMove']>>(
     (id, position) => {
       const layout = board.layout.cells[id];
-      Obj.change(board, (b) => {
-        b.layout.cells[id] = { ...layout, ...position };
+      Obj.update(board, (board) => {
+        board.layout.cells[id] = { ...layout, ...position };
       });
     },
     [board],
@@ -107,11 +134,11 @@ export const BoardContainer = ({ role, subject: board }: BoardContainerProps) =>
       }
 
       // Create a reference to the selected object and add it to the board.
-      Obj.change(board, (b) => {
-        b.items.push(Ref.make(selectedObject));
+      Obj.update(board, (board) => {
+        board.items.push(Ref.make(selectedObject));
 
         // Set the layout position for the new item.
-        b.layout.cells[selectedObject.id.toString()] = pickerState.position;
+        board.layout.cells[selectedObject.id.toString()] = pickerState.position;
       });
 
       // Close the picker.
@@ -128,22 +155,26 @@ export const BoardContainer = ({ role, subject: board }: BoardContainerProps) =>
           setPickerState(nextOpen ? { position: DEFAULT_POSITION } : null);
         }}
       >
-        <Layout.Main role={role} toolbar>
-          <Board.Toolbar disabled={!hasAttention} />
-          <Board.Container>
-            <Board.Viewport classNames='border-none'>
-              <Board.Backdrop />
-              <Board.Content>
-                {items?.map((item, index) => (
-                  <Board.Cell item={item} key={index} layout={board.layout?.cells[item.id] ?? { x: 0, y: 0 }}>
-                    <Surface.Surface role='card--content' data={{ subject: item }} limit={1} />
-                  </Board.Cell>
-                ))}
-              </Board.Content>
-            </Board.Viewport>
-          </Board.Container>
-        </Layout.Main>
-        <ObjectPicker.Content options={options} onSelect={handleSelect} classNames='popover-card-width' />
+        <Panel.Root role={role}>
+          <Panel.Toolbar asChild>
+            <Board.Toolbar disabled={!hasAttention} />
+          </Panel.Toolbar>
+          <Panel.Content asChild>
+            <Board.Container>
+              <Board.Viewport classNames='border-none'>
+                <Board.Backdrop />
+                <Board.Content>
+                  {items?.map((item, index) => (
+                    <Board.Cell item={item} key={index} layout={board.layout?.cells[item.id] ?? { x: 0, y: 0 }}>
+                      <Surface.Surface type={AppSurface.Card} data={{ subject: item, editable: true }} limit={1} />
+                    </Board.Cell>
+                  ))}
+                </Board.Content>
+              </Board.Viewport>
+            </Board.Container>
+          </Panel.Content>
+        </Panel.Root>
+        <ObjectPicker.Content options={options} onSelect={handleSelect} classNames='dx-card-popover-width' />
         <ObjectPicker.VirtualTrigger virtualRef={addTriggerRef} />
       </ObjectPicker.Root>
     </Board.Root>

package/src/containers/BoardContainer/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { BoardContainer as default } from './BoardContainer';

package/src/containers/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const BoardContainer: ComponentType<any> = lazy(() => import('./BoardContainer'));

package/src/index.ts

@@ -2,8 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './components';
 export * from './meta';
 export * from './types';
-
-export * from './BoardPlugin';

package/src/meta.ts

@@ -6,7 +6,7 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/board',
+  id: 'org.dxos.plugin.board',
   name: 'Board',
   description: trim`
     Infinite canvas workspace that combines sticky notes, media, and whiteboarding tools.

package/src/plugin.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const BoardPlugin = Plugin.lazy(meta, () => import('#plugin'));