@dxos/plugin-sheet 0.8.4-main.7996785055 → 0.8.4-main.8baae0fced

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.4-main.7996785055",
+  "version": "0.8.4-main.8baae0fced",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,41 +8,77 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
-  "exports": {
-    ".": {
-      "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
+  "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"
     },
-    "./operations": {
+    "#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"
+    },
+    "#operations": {
       "source": "./src/operations/index.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "node": "./dist/lib/node-esm/operations/index.mjs",
-      "types": "./dist/types/src/operations/index.d.ts"
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "workerd": "./src/SheetPlugin.workerd.ts",
+        "node": "./src/SheetPlugin.node.ts",
+        "default": "./src/SheetPlugin.tsx"
+      },
+      "types": "./dist/types/src/SheetPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/SheetPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/SheetPlugin.node.mjs",
+      "default": "./dist/lib/neutral/SheetPlugin.mjs"
+    },
+    "#testing": "./src/testing/index.ts",
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     },
-    "./types": {
+    "#types": {
       "source": "./src/types/index.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "types": "./dist/types/src/types/index.d.ts"
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
     }
   },
-  "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "operations": [
-        "dist/types/src/operations/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./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",
   "files": [
     "dist",
     "src"
@@ -51,7 +87,7 @@
     "@codemirror/autocomplete": "^6.19.0",
     "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/modifiers": "^6.0.0",
     "@dnd-kit/sortable": "^7.0.1",
@@ -62,51 +98,51 @@
     "@lezer/lr": "^1.4.2",
     "@radix-ui/react-context": "1.1.1",
     "codemirror-lang-spreadsheet": "^1.3.0",
-    "date-fns": "^3.3.1",
+    "date-fns": "^3.6.0",
     "lodash.defaultsdeep": "^4.6.1",
     "re-resizable": "^6.9.17",
     "react-markdown": "^10.1.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-toolkit": "0.8.4-main.7996785055",
-    "@dxos/app-framework": "0.8.4-main.7996785055",
-    "@dxos/async": "0.8.4-main.7996785055",
-    "@dxos/compute": "0.8.4-main.7996785055",
-    "@dxos/context": "0.8.4-main.7996785055",
-    "@dxos/crypto": "0.8.4-main.7996785055",
-    "@dxos/client": "0.8.4-main.7996785055",
-    "@dxos/echo": "0.8.4-main.7996785055",
-    "@dxos/echo-db": "0.8.4-main.7996785055",
-    "@dxos/invariant": "0.8.4-main.7996785055",
-    "@dxos/keys": "0.8.4-main.7996785055",
-    "@dxos/debug": "0.8.4-main.7996785055",
-    "@dxos/log": "0.8.4-main.7996785055",
-    "@dxos/lit-grid": "0.8.4-main.7996785055",
-    "@dxos/plugin-attention": "0.8.4-main.7996785055",
-    "@dxos/operation": "0.8.4-main.7996785055",
-    "@dxos/functions": "0.8.4-main.7996785055",
-    "@dxos/plugin-automation": "0.8.4-main.7996785055",
-    "@dxos/plugin-client": "0.8.4-main.7996785055",
-    "@dxos/plugin-graph": "0.8.4-main.7996785055",
-    "@dxos/plugin-deck": "0.8.4-main.7996785055",
-    "@dxos/plugin-markdown": "0.8.4-main.7996785055",
-    "@dxos/plugin-space": "0.8.4-main.7996785055",
-    "@dxos/plugin-thread": "0.8.4-main.7996785055",
-    "@dxos/plugin-script": "0.8.4-main.7996785055",
-    "@dxos/react-client": "0.8.4-main.7996785055",
-    "@dxos/react-hooks": "0.8.4-main.7996785055",
-    "@dxos/react-ui-attention": "0.8.4-main.7996785055",
-    "@dxos/react-ui-editor": "0.8.4-main.7996785055",
-    "@dxos/plugin-stack": "0.8.4-main.7996785055",
-    "@dxos/react-ui-form": "0.8.4-main.7996785055",
-    "@dxos/react-ui-menu": "0.8.4-main.7996785055",
-    "@dxos/react-ui-grid": "0.8.4-main.7996785055",
-    "@dxos/react-ui-mosaic": "0.8.4-main.7996785055",
-    "@dxos/react-ui-list": "0.8.4-main.7996785055",
-    "@dxos/react-ui-stack": "0.8.4-main.7996785055",
-    "@dxos/types": "0.8.4-main.7996785055",
-    "@dxos/schema": "0.8.4-main.7996785055",
-    "@dxos/util": "0.8.4-main.7996785055",
-    "@dxos/ui-editor": "0.8.4-main.7996785055"
+    "@dxos/async": "0.8.4-main.8baae0fced",
+    "@dxos/app-framework": "0.8.4-main.8baae0fced",
+    "@dxos/app-toolkit": "0.8.4-main.8baae0fced",
+    "@dxos/client": "0.8.4-main.8baae0fced",
+    "@dxos/compute": "0.8.4-main.8baae0fced",
+    "@dxos/crypto": "0.8.4-main.8baae0fced",
+    "@dxos/compute-hyperformula": "0.8.4-main.8baae0fced",
+    "@dxos/context": "0.8.4-main.8baae0fced",
+    "@dxos/debug": "0.8.4-main.8baae0fced",
+    "@dxos/echo": "0.8.4-main.8baae0fced",
+    "@dxos/echo-db": "0.8.4-main.8baae0fced",
+    "@dxos/invariant": "0.8.4-main.8baae0fced",
+    "@dxos/keys": "0.8.4-main.8baae0fced",
+    "@dxos/echo-react": "0.8.4-main.8baae0fced",
+    "@dxos/lit-grid": "0.8.4-main.8baae0fced",
+    "@dxos/log": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-attention": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-automation": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-client": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-graph": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-markdown": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-deck": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-script": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-space": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-stack": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-thread": "0.8.4-main.8baae0fced",
+    "@dxos/react-client": "0.8.4-main.8baae0fced",
+    "@dxos/react-hooks": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-attention": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-editor": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-form": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-grid": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-list": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-menu": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-stack": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-mosaic": "0.8.4-main.8baae0fced",
+    "@dxos/schema": "0.8.4-main.8baae0fced",
+    "@dxos/ui-editor": "0.8.4-main.8baae0fced",
+    "@dxos/types": "0.8.4-main.8baae0fced",
+    "@dxos/util": "0.8.4-main.8baae0fced"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -119,17 +155,17 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/lit-grid": "0.8.4-main.7996785055",
-    "@dxos/echo-generator": "0.8.4-main.7996785055",
-    "@dxos/plugin-testing": "0.8.4-main.7996785055",
-    "@dxos/random": "0.8.4-main.7996785055",
-    "@dxos/react-ui": "0.8.4-main.7996785055",
-    "@dxos/test-utils": "0.8.4-main.7996785055",
-    "@dxos/ui-theme": "0.8.4-main.7996785055",
-    "@dxos/storybook-utils": "0.8.4-main.7996785055",
-    "@dxos/ui-types": "0.8.4-main.7996785055",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7996785055"
+    "vite": "^8.0.13",
+    "@dxos/echo-generator": "0.8.4-main.8baae0fced",
+    "@dxos/lit-grid": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-testing": "0.8.4-main.8baae0fced",
+    "@dxos/random": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/storybook-utils": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.8baae0fced",
+    "@dxos/test-utils": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced",
+    "@dxos/ui-types": "0.8.4-main.8baae0fced"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -137,8 +173,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.7996785055",
-    "@dxos/react-ui": "0.8.4-main.7996785055"
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "publishConfig": {
     "access": "public"

package/src/SheetPlugin.node.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { CommentConfig, CreateObject, OperationHandler, UndoMappings } from '#capabilities';
+import { meta } from '#meta';
+import { Sheet } from '#types';
+
+export const SheetPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
+  AppPlugin.addSchemaModule({ schema: [Sheet.Sheet] }),
+  Plugin.make,
+);
+
+export default SheetPlugin;

package/src/SheetPlugin.test.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ActivationEvents } from '@dxos/app-framework';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { SheetPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('SheetPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), SheetPlugin()],
+    });
+
+    expect(harness.manager.getActive()).toEqual(expect.arrayContaining([moduleId('CreateObject'), moduleId('schema')]));
+
+    await harness.fire(ActivationEvents.SetupProcessManager);
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('OperationHandler'), moduleId('UndoMappings')]),
+    );
+  });
+});

package/src/SheetPlugin.tsx

@@ -2,60 +2,31 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-
-import { ActivationEvent, Plugin } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Annotation } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { AutomationEvents } from '@dxos/plugin-automation';
 import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { type CreateObject } from '@dxos/plugin-space/types';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
 
 import {
   AnchorSort,
+  CommentConfig,
   ComputeGraphRegistry,
+  CreateObject,
   Markdown,
   OperationHandler,
   UndoMappings,
   ReactSurface,
   SheetState,
-} from './capabilities';
-import { meta } from './meta';
-import { serializer } from './serializer';
-import { translations } from './translations';
-import { Sheet } from './types';
-import { SheetOperation } from './operations';
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { Sheet } from '#types';
 
 export const SheetPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Sheet.Sheet.typename,
-      metadata: {
-        label: (object: Sheet.Sheet) => object.name,
-        icon: Annotation.IconAnnotation.get(Sheet.Sheet).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(Sheet.Sheet).pipe(Option.getOrThrow).hue ?? 'white',
-        serializer,
-        comments: 'anchored',
-        createObject: ((props, options) =>
-          Effect.gen(function* () {
-            const object = Sheet.make(props);
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              hidden: true,
-              targetNodeId: options.targetNodeId,
-            });
-          })) satisfies CreateObject,
-        scrollToAnchor: SheetOperation.ScrollToAnchor,
-      },
-    },
-  }),
+  AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
-  AppPlugin.addOperationHandlerModule({ id: 'undo-mappings', activate: UndoMappings }),
+  AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
   AppPlugin.addSchemaModule({ schema: [Sheet.Sheet] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
@@ -64,7 +35,7 @@ export const SheetPlugin = Plugin.define(meta).pipe(
     activate: SheetState,
   }),
   Plugin.addModule({
-    activatesOn: ActivationEvent.allOf(ClientEvents.ClientReady, AutomationEvents.ComputeRuntimeReady),
+    activatesOn: ActivationEvent.allOf(ClientEvents.ClientReady, ActivationEvents.ProcessManagerReady),
     activate: ComputeGraphRegistry,
   }),
   Plugin.addModule({
@@ -78,3 +49,5 @@ export const SheetPlugin = Plugin.define(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default SheetPlugin;

package/src/SheetPlugin.workerd.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+import { Sheet } from '#types';
+
+export const SheetPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Sheet.Sheet] }),
+  Plugin.make,
+);
+
+export default SheetPlugin;

package/src/capabilities/{anchor-sort/anchor-sort.ts → anchor-sort.ts}

@@ -8,7 +8,7 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { Relation } from '@dxos/echo';
 
-import { Sheet, compareIndexPositions } from '../../types';
+import { Sheet, compareIndexPositions } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(

package/src/capabilities/comment-config.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Operation } from '@dxos/compute';
+
+import { SheetOperation } from '#types';
+import { Sheet } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const config: AppCapabilities.CommentConfig = {
+      id: Sheet.Sheet.typename,
+      comments: 'anchored',
+      scrollToAnchor: SheetOperation.ScrollToAnchor,
+    };
+    return Capability.contributes(AppCapabilities.CommentConfig, config);
+  }),
+);

package/src/capabilities/compute-graph-registry.ts

@@ -0,0 +1,42 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Operation, ServiceResolver } from '@dxos/compute';
+import { type SpaceId } from '@dxos/keys';
+
+import { SheetCapabilities } from '#types';
+
+/**
+ * Builds the per-space compute graph registry by adapting the shared
+ * {@link Capabilities.ProcessManagerRuntime} into a
+ * {@link FunctionsRuntimeProvider} that resolves {@link Operation.Service}
+ * from the space's service layer.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const processManagerRuntime = yield* Capability.get(Capabilities.ProcessManagerRuntime);
+
+    // Async import removes direct dependency on hyperformula.
+    const { defaultPlugins, ComputeGraphRegistry } = yield* Effect.tryPromise(
+      () => import('@dxos/compute-hyperformula'),
+    );
+
+    const computeGraphRegistry = new ComputeGraphRegistry({
+      plugins: defaultPlugins,
+      computeRuntime: {
+        getRuntime: (spaceId: SpaceId) => ({
+          runPromise: <A, E>(effect: Effect.Effect<A, E, Operation.Service>) =>
+            processManagerRuntime.runPromise(
+              effect.pipe(Effect.provide(ServiceResolver.provide({ space: spaceId }, Operation.Service))),
+            ),
+        }),
+      },
+    });
+
+    return Capability.contributes(SheetCapabilities.ComputeGraphRegistry, computeGraphRegistry);
+  }),
+);

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 { Sheet } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: Sheet.Sheet.typename,
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const object = Sheet.make(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -2,10 +2,20 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './anchor-sort';
-export * from './compute-graph-registry';
-export * from './markdown';
-export * from './operation-handler';
-export * from './undo-mappings';
-export * from './react-surface';
-export * from './state';
+import { Capability } from '@dxos/app-framework';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Operation } from '@dxos/compute';
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const AnchorSort = Capability.lazy('AnchorSort', () => import('./anchor-sort'));
+export const CommentConfig = Capability.lazy('CommentConfig', () => import('./comment-config'));
+export const ComputeGraphRegistry = Capability.lazy('ComputeGraphRegistry', () => import('./compute-graph-registry'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
+export const Markdown = Capability.lazy('Markdown', () => import('./markdown'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const SheetState = Capability.lazy('SheetState', () => import('./state'));
+export const UndoMappings = Capability.lazy('UndoMappings', () => import('./undo-mappings'));

package/src/capabilities/{markdown/markdown.ts → markdown.ts}

@@ -8,8 +8,9 @@ import { Capability } from '@dxos/app-framework';
 import { getSpace } from '@dxos/client/echo';
 import { MarkdownCapabilities } from '@dxos/plugin-markdown';
 
-import { computeGraphFacet } from '../../extensions';
-import { SheetCapabilities } from '../../types';
+import { SheetCapabilities } from '#types';
+
+import { computeGraphFacet } from '../extensions';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {

package/src/capabilities/{operation-handler/operation-handler.ts → operation-handler.ts}

@@ -5,9 +5,9 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
-import { SheetOperationHandlerSet } from '../../operations';
+import { SheetOperationHandlerSet } from '#operations';
 
 export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
   Effect.fnUntraced(function* () {

package/src/capabilities/{react-surface/react-surface.tsx → react-surface.tsx}

@@ -7,28 +7,29 @@ import React from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useCapability } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { getSpace } from '@dxos/react-client/echo';
 
-import { RangeList, SheetContainer } from '../../containers';
-import { meta } from '../../meta';
-import { Sheet, SheetCapabilities } from '../../types';
+import { RangeList, SheetArticle } from '#containers';
+import { Sheet, SheetCapabilities } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: `${meta.id}.sheet`,
+        id: 'sheet',
+        // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
         role: ['article', 'section'],
         filter: (data): data is { attendableId: string; subject: Sheet.Sheet } =>
           typeof data.attendableId === 'string' &&
           Obj.instanceOf(Sheet.Sheet, data.subject) &&
-          !!getSpace(data.subject),
+          !!Obj.getDatabase(data.subject),
         component: ({ data, role }) => {
           const computeGraphRegistry = useCapability(SheetCapabilities.ComputeGraphRegistry);
 
           return (
-            <SheetContainer
+            <SheetArticle
               role={role}
               subject={data.subject}
               attendableId={data.attendableId}
@@ -39,9 +40,8 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: `${meta.id}.object-settings`,
-        role: 'object-settings',
-        filter: (data): data is { subject: Sheet.Sheet } => Obj.instanceOf(Sheet.Sheet, data.subject),
+        id: 'object-properties',
+        filter: AppSurface.object(AppSurface.ObjectProperties, Sheet.Sheet),
         component: ({ data }) => <RangeList sheet={data.subject} />,
       }),
     ]),

package/src/capabilities/{state/state.ts → state.ts}

@@ -6,10 +6,10 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 
-import { type GridEntry, type GridRegistry, SheetCapabilities } from '../../types';
+import { SheetCapabilities } from '#types';
 
-const createGridRegistry = (): GridRegistry => {
-  const grids = new Map<string, GridEntry>();
+const createGridRegistry = (): SheetCapabilities.GridRegistry => {
+  const grids = new Map<string, SheetCapabilities.GridEntry>();
   return {
     register: (attendableId, grid, setActiveRefs) => {
       grids.set(attendableId, { grid, setActiveRefs });