@dxos/plugin-sheet 0.8.4-main.3fbcb4aa9b → 0.8.4-main.43cb759274

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.4-main.3fbcb4aa9b",
+  "version": "0.8.4-main.43cb759274",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
@@ -40,10 +40,12 @@
     },
     "#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"
     },
@@ -65,6 +67,7 @@
       "types": "./dist/types/src/index.d.ts",
       "default": "./dist/lib/neutral/index.mjs"
     },
+    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
     "./plugin": {
       "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
@@ -79,100 +82,80 @@
   "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
-    "src"
+    "src",
+    "PLUGIN.mdl"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.19.0",
-    "@codemirror/language": "^6.11.3",
-    "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.5",
-    "@dnd-kit/core": "^6.0.5",
-    "@dnd-kit/modifiers": "^6.0.0",
-    "@dnd-kit/sortable": "^7.0.1",
-    "@dnd-kit/utilities": "^3.2.0",
-    "@lezer/common": "^1.2.2",
-    "@lezer/highlight": "^1.2.1",
-    "@lezer/lezer": "^1.1.2",
-    "@lezer/lr": "^1.4.2",
-    "@radix-ui/react-context": "1.1.1",
+    "@codemirror/autocomplete": "^6.20.2",
+    "@codemirror/language": "^6.12.3",
+    "@codemirror/state": "^6.6.0",
+    "@codemirror/view": "^6.43.0",
+    "@lezer/common": "^1.5.2",
+    "@lezer/highlight": "^1.2.3",
     "codemirror-lang-spreadsheet": "^1.3.0",
-    "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-framework": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/compute-hyperformula": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/app-toolkit": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/context": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/crypto": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/debug": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-db": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/invariant": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-react": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/keys": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/lit-grid": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-attention": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-automation": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-deck": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-graph": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-markdown": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-script": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-space": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-stack": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-thread": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-hooks": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-editor": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-attention": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-form": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-grid": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-list": "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-menu": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/types": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/util": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-editor": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/app-framework": "0.8.4-main.43cb759274",
+    "@dxos/app-toolkit": "0.8.4-main.43cb759274",
+    "@dxos/async": "0.8.4-main.43cb759274",
+    "@dxos/client": "0.8.4-main.43cb759274",
+    "@dxos/compute": "0.8.4-main.43cb759274",
+    "@dxos/context": "0.8.4-main.43cb759274",
+    "@dxos/debug": "0.8.4-main.43cb759274",
+    "@dxos/echo": "0.8.4-main.43cb759274",
+    "@dxos/compute-hyperformula": "0.8.4-main.43cb759274",
+    "@dxos/crypto": "0.8.4-main.43cb759274",
+    "@dxos/echo-db": "0.8.4-main.43cb759274",
+    "@dxos/echo-react": "0.8.4-main.43cb759274",
+    "@dxos/invariant": "0.8.4-main.43cb759274",
+    "@dxos/lit-grid": "0.8.4-main.43cb759274",
+    "@dxos/log": "0.8.4-main.43cb759274",
+    "@dxos/plugin-client": "0.8.4-main.43cb759274",
+    "@dxos/keys": "0.8.4-main.43cb759274",
+    "@dxos/plugin-markdown": "0.8.4-main.43cb759274",
+    "@dxos/plugin-thread": "0.8.4-main.43cb759274",
+    "@dxos/react-client": "0.8.4-main.43cb759274",
+    "@dxos/react-hooks": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-attention": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-form": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-editor": "0.8.4-main.43cb759274",
+    "@dxos/plugin-space": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-list": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-menu": "0.8.4-main.43cb759274",
+    "@dxos/types": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-grid": "0.8.4-main.43cb759274",
+    "@dxos/ui-editor": "0.8.4-main.43cb759274",
+    "@dxos/util": "0.8.4-main.43cb759274"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.94.4",
-    "@lezer/generator": "^1.7.1",
+    "@effect/platform": "0.96.1",
+    "@lezer/generator": "^1.8.0",
     "@tldraw/indices": "^2.0.0-alpha.14",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.20.0",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/echo-generator": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/lit-grid": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-testing": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/test-utils": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-types": "0.8.4-main.3fbcb4aa9b"
+    "vite": "^8.0.14",
+    "@dxos/echo-generator": "0.8.4-main.43cb759274",
+    "@dxos/lit-grid": "0.8.4-main.43cb759274",
+    "@dxos/plugin-testing": "0.8.4-main.43cb759274",
+    "@dxos/random": "0.8.4-main.43cb759274",
+    "@dxos/react-ui": "0.8.4-main.43cb759274",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.43cb759274",
+    "@dxos/storybook-utils": "0.8.4-main.43cb759274",
+    "@dxos/ui-theme": "0.8.4-main.43cb759274",
+    "@dxos/ui-types": "0.8.4-main.43cb759274",
+    "@dxos/test-utils": "0.8.4-main.43cb759274"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.94.4",
-    "effect": "3.20.0",
+    "@effect/platform": "0.96.1",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/react-ui": "0.8.4-main.43cb759274",
+    "@dxos/ui-theme": "0.8.4-main.43cb759274"
   },
   "publishConfig": {
     "access": "public"

package/src/SheetPlugin.test.ts

@@ -22,7 +22,7 @@ describe('SheetPlugin', () => {
 
     expect(harness.manager.getActive()).toEqual(expect.arrayContaining([moduleId('CreateObject'), moduleId('schema')]));
 
-    await harness.fire(ActivationEvents.SetupOperationHandler);
+    await harness.fire(ActivationEvents.SetupProcessManager);
     expect(harness.manager.getActive()).toEqual(
       expect.arrayContaining([moduleId('OperationHandler'), moduleId('UndoMappings')]),
     );

package/src/SheetPlugin.tsx

@@ -2,9 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { ActivationEvent, Plugin } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { AutomationEvents } from '@dxos/plugin-automation';
 import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 
@@ -23,6 +22,9 @@ import { meta } from '#meta';
 import { translations } from '#translations';
 import { Sheet } from '#types';
 
+// eslint-disable-next-line import/no-relative-packages
+import pluginSpec from '../PLUGIN.mdl?raw';
+
 export const SheetPlugin = Plugin.define(meta).pipe(
   AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
   AppPlugin.addCreateObjectModule({ activate: CreateObject }),
@@ -36,7 +38,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({
@@ -48,6 +50,9 @@ export const SheetPlugin = Plugin.define(meta).pipe(
     activatesOn: AppActivationEvents.AppGraphReady,
     activate: AnchorSort,
   }),
+  AppPlugin.addPluginAssetModule({
+    asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+  }),
   Plugin.make,
 );
 

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.ts

@@ -6,14 +6,14 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { Relation } from '@dxos/echo';
+import { Relation, Type } from '@dxos/echo';
 
 import { Sheet, compareIndexPositions } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(AppCapabilities.AnchorSort, {
-      key: Sheet.Sheet.typename,
+      key: Type.getTypename(Sheet.Sheet),
       sort: (anchorA, anchorB) => {
         const sheet = Relation.getTarget(anchorA) as Sheet.Sheet;
         if (sheet !== Relation.getTarget(anchorB)) {

package/src/capabilities/comment-config.ts

@@ -8,6 +8,7 @@ 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 { Type } from '@dxos/echo';
 
 import { SheetOperation } from '#types';
 import { Sheet } from '#types';
@@ -15,7 +16,7 @@ import { Sheet } from '#types';
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const config: AppCapabilities.CommentConfig = {
-      id: Sheet.Sheet.typename,
+      id: Type.getTypename(Sheet.Sheet),
       comments: 'anchored',
       scrollToAnchor: SheetOperation.ScrollToAnchor,
     };

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

@@ -4,24 +4,37 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability } from '@dxos/app-framework';
-import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Operation, ServiceResolver } from '@dxos/compute';
+import { type SpaceId } from '@dxos/keys';
 
 import { SheetCapabilities } from '#types';
 
-// Locally declare the Automation ComputeRuntime capability by ID to avoid direct import dependency.
-
+/**
+ * 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 computeRuntimeResolver = yield* Capability.get(AutomationCapabilities.ComputeRuntime);
-    // TODO(wittjosiah): This can probably be a module level import now due to lazy capability loading.
+    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: computeRuntimeResolver,
+      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

@@ -6,6 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { Operation } from '@dxos/compute';
+import { Type } from '@dxos/echo';
 import { SpaceOperation } from '@dxos/plugin-space';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 
@@ -14,7 +15,7 @@ import { Sheet } from '#types';
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
-      id: Sheet.Sheet.typename,
+      id: Type.getTypename(Sheet.Sheet),
       createObject: (props, options) =>
         Effect.gen(function* () {
           const object = Sheet.make(props);

package/src/capabilities/react-surface.tsx

@@ -11,7 +11,7 @@ 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 { RangeList, SheetArticle } from '#containers';
 import { Sheet, SheetCapabilities } from '#types';
 
 export default Capability.makeModule(() =>
@@ -24,12 +24,12 @@ export default Capability.makeModule(() =>
         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}
@@ -40,7 +40,7 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: 'object-properties',
+        id: 'objectProperties',
         filter: AppSurface.object(AppSurface.ObjectProperties, Sheet.Sheet),
         component: ({ data }) => <RangeList sheet={data.subject} />,
       }),

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

@@ -7,8 +7,7 @@ import React, { useEffect, useRef, useState } from 'react';
 
 import { Operation } from '@dxos/compute';
 import { testFunctionPlugins } from '@dxos/compute-hyperformula/testing';
-import { Filter } from '@dxos/echo';
-import { Obj } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { useSpaces } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Button, Input, Toolbar } from '@dxos/react-ui';
@@ -45,7 +44,13 @@ const DefaultStory = () => {
         setResult({ functions: { standard: f1.length, echo: f2.length } });
       });
 
-      space.db.add(Obj.make(Operation.PersistentOperation, { name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
+      space.db.add(
+        Obj.make(Operation.PersistentOperation, {
+          [Obj.Meta]: { version: '0.0.1' },
+          name: 'test',
+          binding: FUNCTION_NAME,
+        }),
+      );
     }
   }, [space, graph]);
 

package/src/components/SheetContent/SheetContent.stories.tsx

@@ -5,7 +5,7 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { ProcessManagerPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { testFunctionPlugins } from '@dxos/compute-hyperformula/testing';
 import { useSpaces } from '@dxos/react-client/echo';
@@ -46,7 +46,7 @@ const meta = {
     withClientProvider({ types: [Sheet.Sheet], createSpace: true }),
     withComputeGraphDecorator({ plugins: testFunctionPlugins }),
     withPluginManager({
-      plugins: [OperationPlugin(), RuntimePlugin()],
+      plugins: [ProcessManagerPlugin()],
     }),
   ],
   parameters: {

package/src/components/SheetContent/SheetContent.tsx

@@ -19,6 +19,7 @@ import { type CellRange, rangeToA1Notation } from '@dxos/compute-hyperformula';
 import { Obj } from '@dxos/echo';
 import { defaultColSize, defaultRowSize } from '@dxos/lit-grid';
 import { DropdownMenu, Icon, useTranslation } from '@dxos/react-ui';
+import { composable, composableProps } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
 import {
   type DxGridCellIndex,
@@ -33,7 +34,6 @@ import {
   editorKeys,
   parseCellIndex,
 } from '@dxos/react-ui-grid';
-import { composable, composableProps } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
 import { SheetOperation } from '#types';

package/src/components/SheetContent/util.ts

@@ -66,7 +66,7 @@ const projectCellProps = (model: SheetModel, col: number, row: number): DxGridCe
   //     const range = thread.target?.anchor && parseThreadAnchorAsCellRange(thread.target!.anchor);
   //     return thread && range ? inRange(range, address) : false;
   //   })
-  //   .map((thread) => Obj.getDXN(thread!).toString())
+  //   .map((thread) => Obj.getURI(thread!))
   //   .join(' ');
 
   const description = model.getValueDescription(address);

package/src/components/SheetStatusbar/SheetStatusbar.tsx

@@ -6,7 +6,8 @@ import React from 'react';
 
 import { addressToA1Notation, isFormula, rangeToA1Notation } from '@dxos/compute-hyperformula';
 import { Icon } from '@dxos/react-ui';
-import { composable, composableProps, mx } from '@dxos/ui-theme';
+import { composable, composableProps } from '@dxos/react-ui';
+import { mx } from '@dxos/ui-theme';
 
 import { mapFormulaIndicesToRefs } from '#types';
 

package/src/components/SheetToolbar/SheetToolbar.tsx

@@ -7,8 +7,8 @@ import React, { useContext, useMemo } from 'react';
 
 import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { type CompleteCellRange } from '@dxos/compute-hyperformula';
+import { composable, composableProps } from '@dxos/react-ui';
 import { type ActionGraphProps, Menu, createGapSeparator, useMenuActions } from '@dxos/react-ui-menu';
-import { composable, composableProps } from '@dxos/ui-theme';
 
 import { type SheetModel } from '../../model';
 import { useSheetContext } from '../SheetRoot';

package/src/containers/{SheetContainer/SheetContainer.stories.tsx → SheetArticle/SheetArticle.stories.tsx}

@@ -23,11 +23,11 @@ import { SheetOperation } from '#types';
 import { Sheet } from '#types';
 
 import RangeList from '../RangeList';
-import { SheetContainer } from './SheetContainer';
+import { SheetArticle } from './SheetArticle';
 
 const meta = {
-  title: 'plugins/plugin-sheet/containers/SheetContainer',
-  component: SheetContainer,
+  title: 'plugins/plugin-sheet/containers/SheetArticle',
+  component: SheetArticle,
   decorators: [
     withTheme(),
     withLayout({ layout: 'fullscreen' }),
@@ -54,7 +54,7 @@ const meta = {
     layout: 'fullscreen',
     translations,
   },
-} satisfies Meta<typeof SheetContainer>;
+} satisfies Meta<typeof SheetArticle>;
 
 export default meta;
 
@@ -68,8 +68,8 @@ export const Default = () => {
   }
 
   return (
-    <AttendableContainer id={Obj.getDXN(sheet).toString()} classNames='contents'>
-      <SheetContainer
+    <AttendableContainer id={Obj.getURI(sheet)} classNames='contents'>
+      <SheetArticle
         role='article'
         space={space}
         subject={sheet}
@@ -91,9 +91,9 @@ export const Spec = () => {
   }
 
   return (
-    <AttendableContainer id={Obj.getDXN(sheet).toString()} classNames='contents'>
+    <AttendableContainer id={Obj.getURI(sheet)} classNames='contents'>
       <div className='w-full grid grid-cols-[1fr_20rem]'>
-        <SheetContainer
+        <SheetArticle
           role='article'
           space={space}
           subject={sheet}

package/src/containers/{SheetContainer/SheetContainer.tsx → SheetArticle/SheetArticle.tsx}

@@ -12,7 +12,7 @@ import { Panel } from '@dxos/react-ui';
 import { ComputeGraphContextProvider, Sheet, useComputeGraph } from '#components';
 import { type Sheet as SheetType } from '#types';
 
-export type SheetContainerProps = AppSurface.ObjectArticleProps<
+export type SheetArticleProps = AppSurface.ObjectArticleProps<
   SheetType.Sheet,
   {
     space: Space;
@@ -21,19 +21,19 @@ export type SheetContainerProps = AppSurface.ObjectArticleProps<
   }
 >;
 
-export const SheetContainer = ({ registry, ...props }: SheetContainerProps) => (
+export const SheetArticle = ({ registry, ...props }: SheetArticleProps) => (
   <ComputeGraphContextProvider registry={registry}>
-    <SheetContainerInner {...props} />
+    <SheetArticleInner {...props} />
   </ComputeGraphContextProvider>
 );
 
-const SheetContainerInner = ({
+const SheetArticleInner = ({
   role,
   subject: sheet,
   attendableId,
   space,
   ignoreAttention,
-}: Omit<SheetContainerProps, 'registry'>) => {
+}: Omit<SheetArticleProps, 'registry'>) => {
   const graph = useComputeGraph(space);
   if (!graph) {
     return null;

package/src/containers/SheetArticle/index.ts

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

package/src/containers/index.ts

@@ -5,4 +5,4 @@
 import { type ComponentType, lazy } from 'react';
 
 export const RangeList: ComponentType<any> = lazy(() => import('./RangeList'));
-export const SheetContainer: ComponentType<any> = lazy(() => import('./SheetContainer'));
+export const SheetArticle: ComponentType<any> = lazy(() => import('./SheetArticle'));

package/src/extensions/compute.stories.tsx

@@ -5,7 +5,7 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useMemo } from 'react';
 
-import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { ProcessManagerPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { PublicKey } from '@dxos/keys';
 import { useSpaces } from '@dxos/react-client/echo';
@@ -115,7 +115,7 @@ const meta = {
       createSpace: true,
     }),
     // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
-    withPluginManager({ plugins: [OperationPlugin(), RuntimePlugin()] }),
+    withPluginManager({ plugins: [ProcessManagerPlugin()] }),
     withComputeGraphDecorator(),
   ],
   parameters: {

package/src/extensions/editor/sheet-extension.ts

@@ -170,7 +170,7 @@ export const sheetExtension = ({ debug, functions = [] }: SheetExtensionOptions)
       tooltipClass: () =>
         mx(
           '!-left-[1px] !top-[33px] !-m-0 border border-h-0! [&>ul]:!min-w-[198px]',
-          '[&>ul>li[aria-selected]]:!bg-accent-surface',
+          '[&>ul>li[aria-selected]]:!bg-accent-bg',
           'border-separator',
         ),
     }),

package/src/integrations/thread-ranges.ts

@@ -8,9 +8,9 @@ import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation } from '@dxos/app-toolkit';
 import { debounce } from '@dxos/async';
 import { type CellAddress, type CompleteCellRange, inRange } from '@dxos/compute-hyperformula';
-import { Obj, Relation } from '@dxos/echo';
+import { Filter, Obj, Query, Relation } from '@dxos/echo';
 import { ThreadOperation } from '@dxos/plugin-thread';
-import { Filter, Query, useQuery } from '@dxos/react-client/echo';
+import { useQuery } from '@dxos/react-client/echo';
 import { linkedSegment } from '@dxos/react-ui-attention';
 import { AnchoredTo, Thread } from '@dxos/types';
 
@@ -58,7 +58,7 @@ export const useSelectThreadOnCellFocus = () => {
 
       if (closestThread) {
         void (async () => {
-          await invokePromise(ThreadOperation.Select, { current: Relation.getDXN(closestThread).toString() });
+          await invokePromise(ThreadOperation.Select, { current: Relation.getURI(closestThread) });
           await invokePromise(LayoutOperation.UpdateCompanion, {
             subject: linkedSegment('comments'),
           });