@dxos/plugin-sheet 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.4-main.c4373fc",
+  "version": "0.8.4-main.c85a9c8dae",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
@@ -11,15 +15,15 @@
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "types": "./dist/types/src/index.d.ts"
     },
     "./types": {
       "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+      "node": "./dist/lib/node-esm/types/index.mjs",
+      "types": "./dist/types/src/types/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -47,8 +51,6 @@
     "@lezer/highlight": "^1.2.1",
     "@lezer/lezer": "^1.1.2",
     "@lezer/lr": "^1.4.2",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.12.1",
     "@radix-ui/react-context": "1.1.1",
     "codemirror-lang-spreadsheet": "^1.3.0",
     "date-fns": "^3.3.1",
@@ -56,73 +58,78 @@
     "re-resizable": "^6.9.17",
     "react-markdown": "^10.1.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.4-main.c4373fc",
-    "@dxos/client": "0.8.4-main.c4373fc",
-    "@dxos/async": "0.8.4-main.c4373fc",
-    "@dxos/compute": "0.8.4-main.c4373fc",
-    "@dxos/crypto": "0.8.4-main.c4373fc",
-    "@dxos/context": "0.8.4-main.c4373fc",
-    "@dxos/echo": "0.8.4-main.c4373fc",
-    "@dxos/debug": "0.8.4-main.c4373fc",
-    "@dxos/functions": "0.8.4-main.c4373fc",
-    "@dxos/invariant": "0.8.4-main.c4373fc",
-    "@dxos/keys": "0.8.4-main.c4373fc",
-    "@dxos/live-object": "0.8.4-main.c4373fc",
-    "@dxos/lit-grid": "0.8.4-main.c4373fc",
-    "@dxos/log": "0.8.4-main.c4373fc",
-    "@dxos/plugin-attention": "0.8.4-main.c4373fc",
-    "@dxos/plugin-client": "0.8.4-main.c4373fc",
-    "@dxos/plugin-automation": "0.8.4-main.c4373fc",
-    "@dxos/plugin-script": "0.8.4-main.c4373fc",
-    "@dxos/plugin-markdown": "0.8.4-main.c4373fc",
-    "@dxos/plugin-space": "0.8.4-main.c4373fc",
-    "@dxos/plugin-stack": "0.8.4-main.c4373fc",
-    "@dxos/plugin-thread": "0.8.4-main.c4373fc",
-    "@dxos/plugin-deck": "0.8.4-main.c4373fc",
-    "@dxos/plugin-graph": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-attention": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-editor": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-form": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-grid": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-list": "0.8.4-main.c4373fc",
-    "@dxos/react-hooks": "0.8.4-main.c4373fc",
-    "@dxos/react-client": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-menu": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-stack": "0.8.4-main.c4373fc",
-    "@dxos/schema": "0.8.4-main.c4373fc",
-    "@dxos/util": "0.8.4-main.c4373fc"
+    "@dxos/app-toolkit": "0.8.4-main.c85a9c8dae",
+    "@dxos/app-framework": "0.8.4-main.c85a9c8dae",
+    "@dxos/async": "0.8.4-main.c85a9c8dae",
+    "@dxos/compute": "0.8.4-main.c85a9c8dae",
+    "@dxos/client": "0.8.4-main.c85a9c8dae",
+    "@dxos/context": "0.8.4-main.c85a9c8dae",
+    "@dxos/debug": "0.8.4-main.c85a9c8dae",
+    "@dxos/crypto": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo-db": "0.8.4-main.c85a9c8dae",
+    "@dxos/functions": "0.8.4-main.c85a9c8dae",
+    "@dxos/invariant": "0.8.4-main.c85a9c8dae",
+    "@dxos/lit-grid": "0.8.4-main.c85a9c8dae",
+    "@dxos/keys": "0.8.4-main.c85a9c8dae",
+    "@dxos/operation": "0.8.4-main.c85a9c8dae",
+    "@dxos/log": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-attention": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-client": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-automation": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-deck": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-graph": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-markdown": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-script": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-space": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-stack": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-client": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-hooks": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-thread": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-attention": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-form": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-grid": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-editor": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-list": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-menu": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-mosaic": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-stack": "0.8.4-main.c85a9c8dae",
+    "@dxos/types": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-editor": "0.8.4-main.c85a9c8dae",
+    "@dxos/schema": "0.8.4-main.c85a9c8dae",
+    "@dxos/util": "0.8.4-main.c85a9c8dae"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.42.4",
-    "@effect/platform": "0.92.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@lezer/generator": "^1.7.1",
     "@tldraw/indices": "^2.0.0-alpha.14",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
-    "@types/react-window": "^1.8.8",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/echo-generator": "0.8.4-main.c4373fc",
-    "@dxos/lit-grid": "0.8.4-main.c4373fc",
-    "@dxos/random": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c4373fc",
-    "@dxos/react-ui": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-theme": "0.8.4-main.c4373fc",
-    "@dxos/storybook-utils": "0.8.4-main.c4373fc",
-    "@dxos/test-utils": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-types": "0.8.4-main.c4373fc"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/echo-generator": "0.8.4-main.c85a9c8dae",
+    "@dxos/lit-grid": "0.8.4-main.c85a9c8dae",
+    "@dxos/random": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-testing": "0.8.4-main.c85a9c8dae",
+    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
+    "@dxos/test-utils": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-types": "0.8.4-main.c85a9c8dae"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.c4373fc",
-    "@dxos/react-ui-theme": "0.8.4-main.c4373fc"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui": "0.8.4-main.c85a9c8dae"
   },
   "publishConfig": {
     "access": "public"

package/src/SheetPlugin.tsx

@@ -2,83 +2,63 @@
 // Copyright 2023 DXOS.org
 //
 
-import {
-  Capabilities,
-  Events,
-  allOf,
-  contributes,
-  createIntent,
-  defineModule,
-  definePlugin,
-} from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { ActivationEvent, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
 import { AutomationEvents } from '@dxos/plugin-automation';
 import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { type CreateObject } from '@dxos/plugin-space/types';
 
-import { AnchorSort, ComputeGraphRegistry, IntentResolver, Markdown, ReactSurface } from './capabilities';
+import { AnchorSort, ComputeGraphRegistry, Markdown, OperationResolver, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { serializer } from './serializer';
 import { translations } from './translations';
-import { SheetAction, SheetType } from './types';
+import { Sheet, SheetOperation } from './types';
 
-export const SheetPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: `${meta.id}/module/compute-graph-registry`,
-    activatesOn: allOf(ClientEvents.ClientReady, AutomationEvents.ComputeRuntimeReady),
-    activate: ComputeGraphRegistry,
+export const SheetPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addMetadataModule({
+    metadata: {
+      id: Sheet.Sheet.typename,
+      metadata: {
+        label: (object: Sheet.Sheet) => object.name,
+        icon: 'ph--grid-nine--regular',
+        iconHue: 'indigo',
+        serializer,
+        comments: 'anchored',
+        createObject: ((props) => Effect.sync(() => Sheet.make(props))) satisfies CreateObject,
+      },
+    },
   }),
-  defineModule({
-    id: `${meta.id}/module/translations`,
-    activatesOn: Events.SetupTranslations,
-    activate: () => contributes(Capabilities.Translations, translations),
-  }),
-  defineModule({
-    id: `${meta.id}/module/metadata`,
-    activatesOn: Events.SetupMetadata,
-    activate: () =>
-      contributes(Capabilities.Metadata, {
-        id: SheetType.typename,
-        metadata: {
-          label: (object: SheetType) => object.name,
-          icon: 'ph--grid-nine--regular',
-          serializer,
-          comments: 'anchored',
-        },
-      }),
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addSchemaModule({ schema: [Sheet.Sheet] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(ClientEvents.ClientReady, AutomationEvents.ComputeRuntimeReady),
+    activate: ComputeGraphRegistry,
   }),
-  defineModule({
-    id: `${meta.id}/module/object-form`,
-    activatesOn: ClientEvents.SetupSchema,
+  Plugin.addModule({
+    id: 'on-space-created',
+    activatesOn: SpaceEvents.SpaceCreated,
     activate: () =>
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: SheetType,
-          getIntent: (props, options) => createIntent(SheetAction.Create, { ...props, space: options.space }),
-        }),
+      Effect.succeed(
+        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
+          Operation.invoke(SheetOperation.OnCreateSpace, params),
+        ),
       ),
   }),
-  defineModule({
-    id: `${meta.id}/module/markdown`,
+  Plugin.addModule({
     activatesOn: MarkdownEvents.SetupExtensions,
     activate: Markdown,
   }),
-  defineModule({
-    id: `${meta.id}/module/anchor-sort`,
+  Plugin.addModule({
     // TODO(wittjosiah): More relevant event?
-    activatesOn: Events.AppGraphReady,
+    activatesOn: AppActivationEvents.AppGraphReady,
     activate: AnchorSort,
   }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    activate: ReactSurface,
-  }),
-  defineModule({
-    id: `${meta.id}/module/intent-resolver`,
-    activatesOn: Events.SetupIntentResolver,
-    activate: IntentResolver,
-  }),
-]);
+  Plugin.make,
+);

package/src/capabilities/anchor-sort/anchor-sort.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Relation } from '@dxos/echo';
+
+import { Sheet, compareIndexPositions } from '../../types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(AppCapabilities.AnchorSort, {
+      key: Sheet.Sheet.typename,
+      sort: (anchorA, anchorB) => {
+        const sheet = Relation.getTarget(anchorA) as Sheet.Sheet;
+        if (sheet !== Relation.getTarget(anchorB)) {
+          return 0;
+        }
+
+        return !anchorA.anchor || !anchorB.anchor ? 0 : compareIndexPositions(sheet, anchorA.anchor, anchorB.anchor);
+      },
+    }),
+  ),
+);

package/src/capabilities/anchor-sort/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const AnchorSort = Capability.lazy('AnchorSort', () => import('./anchor-sort'));

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

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+
+import { SheetCapabilities } from '../../types';
+
+// Locally declare the Automation ComputeRuntime capability by ID to avoid direct import dependency.
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const computeRuntimeResolver = yield* Capability.get(AutomationCapabilities.ComputeRuntime);
+    // TODO(wittjosiah): This can probably be a module level import now due to lazy capability loading.
+    // Async import removes direct dependency on hyperformula.
+    const { defaultPlugins, ComputeGraphRegistry } = yield* Effect.tryPromise(() => import('@dxos/compute'));
+    const computeGraphRegistry = new ComputeGraphRegistry({
+      plugins: defaultPlugins,
+      computeRuntime: computeRuntimeResolver,
+    });
+
+    return Capability.contributes(SheetCapabilities.ComputeGraphRegistry, computeGraphRegistry);
+  }),
+);

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

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const ComputeGraphRegistry = Capability.lazy('ComputeGraphRegistry', () => import('./compute-graph-registry'));

package/src/capabilities/index.ts

@@ -2,12 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
-
-export const AnchorSort = lazy(() => import('./anchor-sort'));
-export const ComputeGraphRegistry = lazy(() => import('./compute-graph-registry'));
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const Markdown = lazy(() => import('./markdown'));
-export const ReactSurface = lazy(() => import('./react-surface'));
-
-export * from './capabilities';
+export * from './anchor-sort';
+export * from './compute-graph-registry';
+export * from './markdown';
+export * from './operation-resolver';
+export * from './react-surface';

package/src/capabilities/markdown/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const Markdown = Capability.lazy('Markdown', () => import('./markdown'));

package/src/capabilities/markdown/markdown.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+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';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get context for lazy capability access in callbacks.
+    const capabilities = yield* Capability.Service;
+
+    return Capability.contributes(MarkdownCapabilities.Extensions, [
+      ({ document: doc }) => {
+        const computeGraphRegistry = capabilities.get(SheetCapabilities.ComputeGraphRegistry);
+        const space = getSpace(doc);
+        if (space) {
+          const computeGraph = computeGraphRegistry.getOrCreateGraph(space);
+          return computeGraphFacet.of(computeGraph);
+        }
+      },
+    ]);
+  }),
+);

package/src/capabilities/operation-resolver/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const OperationResolver = Capability.lazy('OperationResolver', () => import('./operation-resolver'));

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -0,0 +1,77 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability, UndoMapping } from '@dxos/app-framework';
+import { Obj, Ref, Type } from '@dxos/echo';
+import { OperationResolver } from '@dxos/operation';
+import { ManagedCollection } from '@dxos/schema';
+
+import { meta } from '../../meta';
+import { Sheet, SheetOperation } from '../../types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed([
+    Capability.contributes(Capabilities.UndoMapping, [
+      UndoMapping.make({
+        operation: SheetOperation.DropAxis,
+        inverse: SheetOperation.RestoreAxis,
+        deriveContext: (input, output) => ({
+          model: input.model,
+          axis: output.axis,
+          axisIndex: output.axisIndex,
+          index: output.index,
+          axisMeta: output.axisMeta,
+          values: output.values,
+        }),
+        message: ['axis dropped label', { ns: meta.id }],
+      }),
+    ]),
+    Capability.contributes(Capabilities.OperationResolver, [
+      OperationResolver.make({
+        operation: SheetOperation.OnCreateSpace,
+        handler: Effect.fnUntraced(function* ({ rootCollection }) {
+          const collection = ManagedCollection.makeManagedCollection({ key: Type.getTypename(Sheet.Sheet) });
+          Obj.change(rootCollection, (c) => {
+            c.objects.push(Ref.make(collection));
+          });
+        }),
+      }),
+      OperationResolver.make({
+        operation: SheetOperation.InsertAxis,
+        handler: ({ model, axis, index, count }) =>
+          Effect.sync(() => {
+            model[axis === 'col' ? 'insertColumns' : 'insertRows'](index, count);
+          }),
+      }),
+      OperationResolver.make({
+        operation: SheetOperation.DropAxis,
+        handler: ({ model, axis, axisIndex }) =>
+          Effect.sync(() => {
+            const undoData = model[axis === 'col' ? 'dropColumn' : 'dropRow'](axisIndex);
+            // Return data needed for undo.
+            return {
+              axis: undoData.axis,
+              axisIndex: undoData.axisIndex,
+              index: undoData.index,
+              axisMeta: undoData.axisMeta,
+              values: undoData.values,
+            };
+          }),
+      }),
+
+      //
+      // RestoreAxis (inverse of DropAxis)
+      //
+      OperationResolver.make({
+        operation: SheetOperation.RestoreAxis,
+        handler: ({ model, axis, ...restoreData }) =>
+          Effect.sync(() => {
+            model[axis === 'col' ? 'restoreColumn' : 'restoreRow'](restoreData);
+          }),
+      }),
+    ]),
+  ]),
+);

package/src/capabilities/react-surface/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface/react-surface.tsx

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useCapability } from '@dxos/app-framework/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';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: `${meta.id}/sheet`,
+        role: ['article', 'section'],
+        filter: (data): data is { subject: Sheet.Sheet } =>
+          Obj.instanceOf(Sheet.Sheet, data.subject) && !!getSpace(data.subject),
+        component: ({ data, role }) => {
+          const computeGraphRegistry = useCapability(SheetCapabilities.ComputeGraphRegistry);
+
+          return (
+            <SheetContainer
+              role={role}
+              subject={data.subject}
+              space={getSpace(data.subject)!}
+              registry={computeGraphRegistry}
+            />
+          );
+        },
+      }),
+      Surface.create({
+        id: `${meta.id}/object-settings`,
+        role: 'object-settings',
+        filter: (data): data is { subject: Sheet.Sheet } => Obj.instanceOf(Sheet.Sheet, data.subject),
+        component: ({ data }) => <RangeList sheet={data.subject} />,
+      }),
+    ]),
+  ),
+);

package/src/components/ComputeGraph/compute-graph.stories.tsx

@@ -6,8 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useRef, useState } from 'react';
 
 import { testFunctionPlugins } from '@dxos/compute/testing';
-import { Filter, Obj } from '@dxos/echo';
-import { FunctionType } from '@dxos/functions';
+import { Filter } from '@dxos/echo';
+import { Function } from '@dxos/functions';
 import { useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Button, Input, Toolbar } from '@dxos/react-ui';
@@ -16,7 +16,7 @@ import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 
 import { useSheetModel } from '../../model';
 import { withComputeGraphDecorator } from '../../testing';
-import { SheetType, createSheet } from '../../types';
+import { Sheet } from '../../types';
 
 import { useComputeGraph } from './ComputeGraphContextProvider';
 
@@ -25,13 +25,13 @@ const FUNCTION_NAME = 'TEST';
 const DefaultStory = () => {
   const space = useSpace();
   const graph = useComputeGraph(space);
-  const [sheet, setSheet] = useState<SheetType>();
+  const [sheet, setSheet] = useState<Sheet.Sheet>();
   const [text, setText] = useState(`${FUNCTION_NAME}(100)`);
   const [result, setResult] = useState<any>();
   const model = useSheetModel(graph, sheet);
   useEffect(() => {
     if (space) {
-      const sheet = space.db.add(createSheet());
+      const sheet = space.db.add(Sheet.make());
       setSheet(sheet);
     }
   }, [space]);
@@ -44,14 +44,14 @@ const DefaultStory = () => {
         setResult({ functions: { standard: f1.length, echo: f2.length } });
       });
 
-      space.db.add(Obj.make(FunctionType, { name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
+      space.db.add(Function.make({ name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
     }
   }, [space, graph]);
 
   const inputRef = useRef<HTMLInputElement | null>(null);
   const handleTest = async () => {
     if (space && graph) {
-      const { objects } = await space.db.query(Filter.type(FunctionType)).run();
+      const objects = await space.db.query(Filter.type(Function.Function)).run();
       const mapped = graph.mapFunctionBindingToId(text);
       const unmapped = graph.mapFunctionBindingFromId(mapped);
       const internal = graph.mapFormulaToNative(text);
@@ -84,11 +84,11 @@ const DefaultStory = () => {
 export const Default: Story = {};
 
 const meta = {
-  title: 'plugins/plugin-sheet/functions',
+  title: 'plugins/plugin-sheet/components/functions',
   render: DefaultStory,
   decorators: [
-    withTheme,
-    withClientProvider({ types: [FunctionType, SheetType], createIdentity: true, createSpace: true }),
+    withTheme(),
+    withClientProvider({ types: [Function.Function, Sheet.Sheet], createIdentity: true, createSpace: true }),
     withComputeGraphDecorator({ plugins: testFunctionPlugins }),
   ],
 } satisfies Meta<typeof DefaultStory>;