@dxos/plugin-navtree 0.8.4-main.d05673bc65 → 0.8.4-main.d9fc60f731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-navtree",
-  "version": "0.8.4-main.d05673bc65",
+  "version": "0.8.4-main.d9fc60f731",
   "description": "DXOS Surface plugin for a tree view visualization of the graph.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,83 +8,143 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "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"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/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",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "workerd": "./src/NavTreePlugin.workerd.ts",
+        "node": "./src/NavTreePlugin.node.ts",
+        "default": "./src/NavTreePlugin.tsx"
+      },
+      "types": "./dist/types/src/NavTreePlugin.d.ts",
+      "workerd": "./dist/lib/neutral/NavTreePlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/NavTreePlugin.node.mjs",
+      "default": "./dist/lib/neutral/NavTreePlugin.mjs"
+    },
+    "#testing": {
+      "source": "./src/testing/index.ts",
+      "types": "./dist/types/src/testing/index.d.ts",
+      "default": "./dist/lib/neutral/testing/index.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": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
+    "./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": {
-    "*": {}
-  },
   "files": [
     "dist",
-    "src"
+    "src",
+    "PLUGIN.mdl"
   ],
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "1.7.7",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
-    "@radix-ui/react-dismissable-layer": "1.1.5",
-    "@radix-ui/react-use-controllable-state": "1.1.0",
-    "date-fns": "^3.3.1",
-    "@dxos/app-framework": "0.8.4-main.d05673bc65",
-    "@dxos/app-graph": "0.8.4-main.d05673bc65",
-    "@dxos/async": "0.8.4-main.d05673bc65",
-    "@dxos/echo": "0.8.4-main.d05673bc65",
-    "@dxos/debug": "0.8.4-main.d05673bc65",
-    "@dxos/app-toolkit": "0.8.4-main.d05673bc65",
-    "@dxos/invariant": "0.8.4-main.d05673bc65",
-    "@dxos/keyboard": "0.8.4-main.d05673bc65",
-    "@dxos/lit-ui": "0.8.4-main.d05673bc65",
-    "@dxos/log": "0.8.4-main.d05673bc65",
-    "@dxos/operation": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-deck": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-graph": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-observability": "0.8.4-main.d05673bc65",
-    "@dxos/protocols": "0.8.4-main.d05673bc65",
-    "@dxos/react-client": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-attention": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-list": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-menu": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-mosaic": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-searchlist": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-stack": "0.8.4-main.d05673bc65",
-    "@dxos/util": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-tabs": "0.8.4-main.d05673bc65"
+    "@dxos/app-framework": "0.8.4-main.d9fc60f731",
+    "@dxos/async": "0.8.4-main.d9fc60f731",
+    "@dxos/app-graph": "0.8.4-main.d9fc60f731",
+    "@dxos/app-toolkit": "0.8.4-main.d9fc60f731",
+    "@dxos/compute": "0.8.4-main.d9fc60f731",
+    "@dxos/debug": "0.8.4-main.d9fc60f731",
+    "@dxos/keyboard": "0.8.4-main.d9fc60f731",
+    "@dxos/lit-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/echo": "0.8.4-main.d9fc60f731",
+    "@dxos/keys": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-graph": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-deck": "0.8.4-main.d9fc60f731",
+    "@dxos/log": "0.8.4-main.d9fc60f731",
+    "@dxos/random": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-attention": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-list": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-menu": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-stack": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-search": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-tabs": "0.8.4-main.d9fc60f731",
+    "@dxos/util": "0.8.4-main.d9fc60f731"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.94.4",
+    "@effect/platform": "0.96.1",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.21.2",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-attention": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-client": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-space": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-testing": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-theme": "0.8.4-main.d05673bc65",
-    "@dxos/random": "0.8.4-main.d05673bc65",
-    "@dxos/storybook-utils": "0.8.4-main.d05673bc65",
-    "@dxos/ui-theme": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui": "0.8.4-main.d05673bc65"
+    "vite": "^8.0.14",
+    "@dxos/plugin-attention": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-client": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-space": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-testing": "0.8.4-main.d9fc60f731",
+    "@dxos/plugin-theme": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/storybook-utils": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "@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.d05673bc65",
-    "@dxos/ui-theme": "0.8.4-main.d05673bc65"
+    "@dxos/react-ui": "0.8.4-main.d9fc60f731",
+    "@dxos/ui-theme": "0.8.4-main.d9fc60f731"
   },
   "publishConfig": {
     "access": "public"

package/src/NavTreePlugin.node.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { AppGraphBuilder, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const NavTreePlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.make,
+);
+
+export default NavTreePlugin;

package/src/NavTreePlugin.test.ts

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

package/src/NavTreePlugin.tsx

@@ -7,46 +7,30 @@ import * as Effect from 'effect/Effect';
 import { ActivationEvent, ActivationEvents, Capabilities, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppCapabilities, AppPlugin, LayoutOperation } from '@dxos/app-toolkit';
 import { Graph } from '@dxos/plugin-graph';
-import { type TreeData } from '@dxos/react-ui-list';
 
-import { AppGraphBuilder, Keyboard, OperationResolver, ReactSurface, State } from './capabilities';
-import { NODE_TYPE } from './containers';
-import { meta } from './meta';
-import { translations } from './translations';
-import { NavTreeEvents } from './types';
+import { AppGraphBuilder, Keyboard, OperationHandler, ReactSurface, State } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { NavTreeEvents } from '#types';
+
+// eslint-disable-next-line import/no-relative-packages
+import pluginSpec from '../PLUGIN.mdl?raw';
 
 export const NavTreePlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: NODE_TYPE,
-      metadata: {
-        parse: ({ item }: TreeData, type: string) => {
-          switch (type) {
-            case 'node':
-              return item;
-            case 'object':
-              return item.data;
-            case 'view-object':
-              return { id: `${item.id}-view`, object: item.data };
-          }
-        },
-      },
-    },
-  }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
     id: 'state',
     activatesOn: AppActivationEvents.LayoutReady,
-    activatesAfter: [NavTreeEvents.StateReady],
+    firesAfterActivation: [NavTreeEvents.StateReady],
     activate: State,
   }),
   Plugin.addModule({
     id: 'expose',
     activatesOn: ActivationEvent.allOf(
-      ActivationEvents.OperationInvokerReady,
+      ActivationEvents.ProcessManagerReady,
       AppActivationEvents.AppGraphReady,
       AppActivationEvents.LayoutReady,
       NavTreeEvents.StateReady,
@@ -68,8 +52,13 @@ export const NavTreePlugin = Plugin.define(meta).pipe(
   }),
   Plugin.addModule({
     id: 'keyboard',
-    activatesOn: ActivationEvent.allOf(AppActivationEvents.AppGraphReady, ActivationEvents.OperationInvokerReady),
+    activatesOn: ActivationEvent.allOf(AppActivationEvents.AppGraphReady, ActivationEvents.ProcessManagerReady),
     activate: Keyboard,
   }),
+  AppPlugin.addPluginAssetModule({
+    asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+  }),
   Plugin.make,
 );
+
+export default NavTreePlugin;

package/src/NavTreePlugin.workerd.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const NavTreePlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.make,
+);
+
+export default NavTreePlugin;

package/src/capabilities/{app-graph-builder/app-graph-builder.ts → app-graph-builder.ts}

@@ -6,19 +6,19 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
-import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { Operation } from '@dxos/compute';
+import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 
-import { COMMANDS_DIALOG, meta } from '../../meta';
+import { COMMANDS_DIALOG, meta } from '#meta';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* GraphBuilder.createExtension({
-      id: meta.id,
+      id: 'root',
       match: NodeMatcher.whenRoot,
       actions: () =>
         Effect.succeed([
-          {
+          Node.makeAction({
             id: COMMANDS_DIALOG,
             data: () =>
               Operation.invoke(LayoutOperation.UpdateDialog, {
@@ -26,14 +26,14 @@ export default Capability.makeModule(
                 blockAlign: 'start',
               }),
             properties: {
-              label: ['open commands label', { ns: meta.id }],
+              label: ['open-commands.label', { ns: meta.id }],
               icon: 'ph--magnifying-glass--regular',
               keyBinding: {
                 macos: 'meta+k',
                 windows: 'ctrl+k',
               },
             },
-          },
+          }),
         ]),
     });
 

package/src/capabilities/index.ts

@@ -2,8 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './keyboard';
-export * from './operation-resolver';
-export * from './react-surface';
-export * from './state';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const Keyboard = Capability.lazy('Keyboard', () => import('./keyboard'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const State = Capability.lazy('State', () => import('./state'));

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

@@ -11,7 +11,7 @@ import { Keyboard } from '@dxos/keyboard';
 import { Graph, Node, runAction } from '@dxos/plugin-graph';
 import { getHostPlatform } from '@dxos/util';
 
-import { KEY_BINDING } from '../../meta';
+import { KEY_BINDING } from '#meta';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/compute';
+
+import { NavTreeOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, NavTreeOperationHandlerSet);
+  }),
+);

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

@@ -3,26 +3,26 @@
 //
 
 import * as Effect from 'effect/Effect';
-import React from 'react';
+import React, { type ComponentProps } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Node } from '@dxos/plugin-graph';
 
-import { CommandsDialogContent, CommandsTrigger, NavTreeContainer, NavTreeDocumentTitle } from '../../containers';
-import { COMMANDS_DIALOG, meta } from '../../meta';
+import { CommandsDialogContent, CommandsTrigger, NavTreeContainer, NavTreeDocumentTitle } from '#containers';
+import { COMMANDS_DIALOG } from '#meta';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         id: COMMANDS_DIALOG,
-        role: 'dialog',
-        filter: (data): data is { props: { selected?: string } } => data.component === COMMANDS_DIALOG,
+        filter: AppSurface.component<ComponentProps<typeof CommandsDialogContent>>(AppSurface.Dialog, COMMANDS_DIALOG),
         component: ({ data, ref }) => <CommandsDialogContent {...data.props} ref={ref} />,
       }),
       Surface.create({
-        id: `${meta.id}.navigation`,
+        id: 'navigation',
         role: 'navigation',
         filter: (data): data is { popoverAnchorId?: string; current: string } => typeof data.current === 'string',
         component: ({ data, ref }) => {
@@ -36,16 +36,16 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: `${meta.id}.document-title`,
+        id: 'documentTitle',
         role: 'document-title',
         component: ({ data }) => (
           <NavTreeDocumentTitle node={Node.isGraphNode(data.subject) ? data.subject : undefined} />
         ),
       }),
       Surface.create({
-        id: `${meta.id}.search-input`,
+        id: 'searchInput',
         role: 'search-input',
-        position: 'fallback',
+        position: 'last',
         component: () => <CommandsTrigger />,
       }),
     ]),

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

@@ -10,22 +10,24 @@ import { AppCapabilities } from '@dxos/app-toolkit';
 import { Graph, Node } from '@dxos/plugin-graph';
 import { Path } from '@dxos/react-ui-list';
 
-import { meta } from '../../meta';
-import { type NavTreeCapabilities as NC, NavTreeCapabilities } from '../../types';
+import { meta } from '#meta';
+import { NavTreeCapabilities } from '#types';
 
 const KEY = `${meta.id}.state.v1`;
 
 /** Default item state for new entries. */
-const defaultItemState: NC.NavTreeItemState = { open: false, current: false, alternateTree: false };
+const defaultItemState: NavTreeCapabilities.NavTreeItemState = { open: false, current: false };
 
 /** L0 (top-level workspace) paths are direct children of root — not part of the expandable tree model. */
 const isTopLevelPath = (path: string[]): boolean => path.length === 2 && path[0] === Node.RootId;
 
 /** Default state entries for initial tree structure. */
 // TODO(thure): Initialize these dynamically.
-const defaultStateEntries: [string, NC.NavTreeItemState][] = [['root', { open: true, current: false }]];
+const defaultStateEntries: [string, NavTreeCapabilities.NavTreeItemState][] = [
+  ['root', { open: true, current: false }],
+];
 
-const getInitialState = (): Map<string, NC.NavTreeItemState> => {
+const getInitialState = (): Map<string, NavTreeCapabilities.NavTreeItemState> => {
   const stringified = localStorage.getItem(KEY);
   if (!stringified) {
     return new Map(defaultStateEntries);
@@ -51,10 +53,12 @@ export default Capability.makeModule(
     // keepAlive prevents atoms from being garbage collected when components unmount,
     // ensuring state is preserved across deletion/restoration cycles.
     const itemAtomFamily = Atom.family((pathString: string) =>
-      Atom.make<NC.NavTreeItemState>(backingState.get(pathString) ?? { ...defaultItemState }).pipe(Atom.keepAlive),
+      Atom.make<NavTreeCapabilities.NavTreeItemState>(backingState.get(pathString) ?? { ...defaultItemState }).pipe(
+        Atom.keepAlive,
+      ),
     );
 
-    const getItemAtom = (path: string[]): Atom.Atom<NC.NavTreeItemState> => {
+    const getItemAtom = (path: string[]): Atom.Atom<NavTreeCapabilities.NavTreeItemState> => {
       const pathString = Path.create(...path);
       if (!backingState.has(pathString)) {
         backingState.set(pathString, { ...defaultItemState });
@@ -62,11 +66,11 @@ export default Capability.makeModule(
       return itemAtomFamily(pathString);
     };
 
-    const getItem = (path: string[]): NC.NavTreeItemState => {
+    const getItem = (path: string[]): NavTreeCapabilities.NavTreeItemState => {
       return registry.get(getItemAtom(path));
     };
 
-    const setItem = (path: string[], key: 'open' | 'current' | 'alternateTree', next: boolean) => {
+    const setItem = (path: string[], key: 'open' | 'current', next: boolean) => {
       const pathString = Path.create(...path);
       const atom = itemAtomFamily(pathString);
       const currentValue = registry.get(atom);

package/src/components/NavTree/NavTree.stories.tsx

@@ -12,38 +12,35 @@ import { Capabilities, Capability } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { useAtomCapability } from '@dxos/app-framework/ui';
 import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
-import { OperationResolver } from '@dxos/operation';
+import { Operation, OperationHandlerSet } from '@dxos/compute';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { IconButton, Input, Main, Toolbar } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { useAttention, useAttentionAttributes } from '@dxos/react-ui-attention';
 import { Stack, StackItem } from '@dxos/react-ui-stack';
+import { withLayout } from '@dxos/react-ui/testing';
 import { mx } from '@dxos/ui-theme';
 
-import { NavTreeContainer } from '../../containers';
+import { NavTreeContainer } from '#containers';
+import { storybookGraphBuilders } from '#testing';
+import { translations } from '#translations';
+
 import { NavTreePlugin } from '../../NavTreePlugin';
-import { storybookGraphBuilders } from '../../testing';
-import { translations } from '../../translations';
 
-faker.seed(1234);
+random.seed(1234);
 
 const StoryState = Capability.make<Atom.Atom<{ tab: string }>>('story-state');
 
-// TODO(burdon): Fix outline (e.g., button in sidebar nav is clipped when focused).
-// TODO(burdon): Consider similar containment of: Table, Sheet, Kanban Column, Form, etc.
-
 const container = 'flex flex-col grow gap-2 p-4 rounded-md';
 
-// TODO(burdon): Factor out PlankHeader.
 const StoryPlankHeading = ({ attendableId }: { attendableId: string }) => {
   const { hasAttention } = useAttention(attendableId);
   console.log('hasAttention', hasAttention);
   return (
     <div className='flex p-1 items-center border-b border-separator'>
       <IconButton
-        density='coarse'
-        icon='ph--atom--regular'
+        density='lg'
+        icon='ph--circle--regular'
         label='Test'
         iconOnly
         variant={hasAttention ? 'primary' : 'ghost'}
@@ -81,7 +78,7 @@ const StoryPlank = ({ attendableId }: { attendableId: string }) => {
           <Toolbar.Button>Test</Toolbar.Button>
         </Toolbar.Root>
 
-        <div className={mx(container, 'm-2 bg-active-surface')}>
+        <div className={mx(container, 'm-2 bg-current-surface')}>
           <Input.Root>
             <Input.Label>Level 1 (group)</Input.Label>
           </Input.Root>
@@ -120,7 +117,6 @@ const meta = {
   component: NavTreeContainer,
   render: DefaultStory,
   decorators: [
-    withTheme(),
     withLayout({ layout: 'fullscreen' }),
     withPluginManager({
       plugins: [
@@ -136,16 +132,17 @@ const meta = {
         return [
           Capability.contributes(StoryState, storyStateAtom),
           Capability.contributes(AppCapabilities.AppGraphBuilder, storybookGraphBuilders()),
-          Capability.contributes(Capabilities.OperationResolver, [
-            OperationResolver.make({
-              operation: LayoutOperation.SwitchWorkspace,
-              handler: ({ subject }) =>
+          Capability.contributes(
+            Capabilities.OperationHandler,
+            OperationHandlerSet.make(
+              Operation.withHandler(LayoutOperation.SwitchWorkspace, ({ subject }) =>
                 Effect.gen(function* () {
                   const registry: Registry.Registry = yield* Capability.get(Capabilities.AtomRegistry);
                   registry.set(storyStateAtom, { tab: subject });
                 }),
-            }),
-          ]),
+              ),
+            ),
+          ),
         ];
       },
     }),
@@ -164,8 +161,10 @@ export const Default: Story = {
   play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
     const canvas = within(canvasElement);
 
-    // Find the element with treegrid role and click on its parent
-    const treegridElement = await canvas.findByRole('treegrid');
+    // Plugin startup is async; the treegrid only appears after the Startup event
+    // fires and the graph is built. Use a generous timeout so slower CI runners
+    // don't race the default 1 s limit.
+    const treegridElement = await canvas.findByRole('treegrid', {}, { timeout: 10000 });
     const treegridParent = treegridElement.parentElement;
     if (treegridParent) {
       await userEvent.click(treegridParent);