@dxos/plugin-navtree 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0

package/package.json

@@ -1,13 +1,27 @@
 {
   "name": "@dxos/plugin-navtree",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.74a063c4e0",
   "description": "DXOS Surface plugin for a tree view visualization of the graph.",
   "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,
   "type": "module",
+  "imports": {
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#testing": "./src/testing/index.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -24,65 +38,63 @@
     "src"
   ],
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
-    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.12.1",
+    "@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.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/app-graph": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/keyboard": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/lit-ui": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-observability": "0.8.4-main.72ec0f3",
-    "@dxos/protocols": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-searchlist": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-tabs": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-list": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3"
+    "date-fns": "^3.6.0",
+    "@dxos/app-framework": "0.8.4-main.74a063c4e0",
+    "@dxos/app-graph": "0.8.4-main.74a063c4e0",
+    "@dxos/async": "0.8.4-main.74a063c4e0",
+    "@dxos/app-toolkit": "0.8.4-main.74a063c4e0",
+    "@dxos/debug": "0.8.4-main.74a063c4e0",
+    "@dxos/echo": "0.8.4-main.74a063c4e0",
+    "@dxos/invariant": "0.8.4-main.74a063c4e0",
+    "@dxos/keyboard": "0.8.4-main.74a063c4e0",
+    "@dxos/log": "0.8.4-main.74a063c4e0",
+    "@dxos/lit-ui": "0.8.4-main.74a063c4e0",
+    "@dxos/operation": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-deck": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-graph": "0.8.4-main.74a063c4e0",
+    "@dxos/protocols": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-observability": "0.8.4-main.74a063c4e0",
+    "@dxos/react-client": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-list": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-attention": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-menu": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-mosaic": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-search": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-stack": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-tabs": "0.8.4-main.74a063c4e0",
+    "@dxos/util": "0.8.4-main.74a063c4e0"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/echo-signals": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-attention": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-storybook-layout": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-theme": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/plugin-client": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-attention": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/random": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-space": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-testing": "0.8.4-main.74a063c4e0",
+    "@dxos/storybook-utils": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-theme": "0.8.4-main.74a063c4e0"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@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.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui": "0.8.4-main.74a063c4e0"
   },
   "publishConfig": {
     "access": "public"

package/src/NavTreePlugin.tsx

@@ -2,93 +2,75 @@
 // Copyright 2025 DXOS.org
 //
 
-import {
-  Capabilities,
-  Events,
-  LayoutAction,
-  allOf,
-  contributes,
-  createIntent,
-  defineModule,
-  definePlugin,
-} from '@dxos/app-framework';
+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, IntentResolver, Keyboard, ReactSurface, State } from './capabilities';
-import { NODE_TYPE } from './components';
-import { NavTreeEvents } from './events';
-import { meta } from './meta';
+import { AppGraphBuilder, Keyboard, OperationHandler, ReactSurface, State } from '#capabilities';
+import { NODE_TYPE } from '#containers';
+import { meta } from '#meta';
+import { NavTreeEvents } from '#types';
+
 import { translations } from './translations';
 
-export const NavTreePlugin = definePlugin(meta, () => [
-  defineModule({
-    id: `${meta.id}/module/state`,
-    activatesOn: Events.LayoutReady,
+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.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'state',
+    activatesOn: AppActivationEvents.LayoutReady,
     activatesAfter: [NavTreeEvents.StateReady],
     activate: State,
   }),
-  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: 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 };
-            }
-          },
-        },
-      }),
-  }),
-  defineModule({
-    id: `${meta.id}/module/expose`,
-    activatesOn: allOf(Events.DispatcherReady, Events.AppGraphReady, Events.LayoutReady, NavTreeEvents.StateReady),
-    activate: async (context) => {
-      const layout = context.getCapability(Capabilities.Layout);
-      const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-      const { graph } = context.getCapability(Capabilities.AppGraph);
-      if (dispatch && layout.active.length === 1) {
+  Plugin.addModule({
+    id: 'expose',
+    activatesOn: ActivationEvent.allOf(
+      ActivationEvents.OperationInvokerReady,
+      AppActivationEvents.AppGraphReady,
+      AppActivationEvents.LayoutReady,
+      NavTreeEvents.StateReady,
+    ),
+    activate: Effect.fnUntraced(function* () {
+      const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
+      const { invokePromise } = yield* Capability.get(Capabilities.OperationInvoker);
+      const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
+      if (invokePromise && layout.active.length === 1) {
         // TODO(wittjosiah): This should really be fired once the navtree renders for the first time.
         //   That is the point at which the graph is expanded and the path should be available.
-        void graph
-          .waitForPath({ target: layout.active[0] }, { timeout: 30_000 })
-          .then(() => dispatch(createIntent(LayoutAction.Expose, { part: 'navigation', subject: layout.active[0] })))
+        void Graph.waitForPath(graph, { target: layout.active[0] }, { timeout: 30_000 })
+          .then(() => invokePromise(LayoutOperation.Expose, { subject: layout.active[0] }))
           .catch(() => {});
       }
 
       return [];
-    },
+    }),
   }),
-  defineModule({
-    id: `${meta.id}/module/keyboard`,
-    activatesOn: Events.AppGraphReady,
+  Plugin.addModule({
+    id: 'keyboard',
+    activatesOn: ActivationEvent.allOf(AppActivationEvents.AppGraphReady, ActivationEvents.OperationInvokerReady),
     activate: Keyboard,
   }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    activate: ReactSurface,
-  }),
-  defineModule({
-    id: `${meta.id}/module/intent-resolver`,
-    activatesOn: Events.SetupIntentResolver,
-    activate: IntentResolver,
-  }),
-  defineModule({
-    id: `${meta.id}/module/app-graph-builder`,
-    activatesOn: Events.SetupAppGraph,
-    activate: AppGraphBuilder,
-  }),
-]);
+  Plugin.make,
+);

package/src/capabilities/app-graph-builder.ts

@@ -2,52 +2,41 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Atom } from '@effect-atom/atom-react';
-import * as Function from 'effect/Function';
-import * as Option from 'effect/Option';
+import * as Effect from 'effect/Effect';
 
-import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
-import { ROOT_ID, createExtension } from '@dxos/plugin-graph';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 
-import { COMMANDS_DIALOG, meta } from '../meta';
+import { COMMANDS_DIALOG, meta } from '#meta';
 
-export default (context: PluginContext) =>
-  contributes(
-    Capabilities.AppGraphBuilder,
-    createExtension({
-      id: meta.id,
-      actions: (node) =>
-        Atom.make((get) =>
-          Function.pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
-            Option.map(() => [
-              {
-                id: COMMANDS_DIALOG,
-                data: async () => {
-                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                  await dispatch(
-                    createIntent(LayoutAction.UpdateDialog, {
-                      part: 'dialog',
-                      subject: COMMANDS_DIALOG,
-                      options: {
-                        blockAlign: 'start',
-                      },
-                    }),
-                  );
-                },
-                properties: {
-                  label: ['open commands label', { ns: meta.id }],
-                  icon: 'ph--magnifying-glass--regular',
-                  keyBinding: {
-                    macos: 'meta+k',
-                    windows: 'ctrl+k',
-                  },
-                },
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* GraphBuilder.createExtension({
+      id: 'root',
+      match: NodeMatcher.whenRoot,
+      actions: () =>
+        Effect.succeed([
+          Node.makeAction({
+            id: COMMANDS_DIALOG,
+            data: () =>
+              Operation.invoke(LayoutOperation.UpdateDialog, {
+                subject: COMMANDS_DIALOG,
+                blockAlign: 'start',
+              }),
+            properties: {
+              label: ['open-commands.label', { ns: meta.id }],
+              icon: 'ph--magnifying-glass--regular',
+              keyBinding: {
+                macos: 'meta+k',
+                windows: 'ctrl+k',
               },
-            ]),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-  );
+            },
+          }),
+        ]),
+    });
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/index.ts

@@ -2,12 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
 
-export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const Keyboard = lazy(() => import('./keyboard'));
-export const ReactSurface = lazy(() => import('./react-surface'));
-export const State = lazy(() => import('./state'));
-
-export * from './capabilities';
+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.ts

@@ -2,58 +2,65 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities as AppCapabilities, type PluginContext, contributes } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { debounce } from '@dxos/async';
 import { Keyboard } from '@dxos/keyboard';
-import { type Node, isAction } from '@dxos/plugin-graph';
+import { Graph, Node, runAction } from '@dxos/plugin-graph';
 import { getHostPlatform } from '@dxos/util';
 
-import { KEY_BINDING } from '../meta';
-
-export default (context: PluginContext) => {
-  const { graph } = context.getCapability(AppCapabilities.AppGraph);
-
-  // TODO(wittjosiah): Factor out.
-  // TODO(wittjosiah): Handle removal of actions.
-  const visitor = (node: Node, path: string[]) => {
-    let shortcut: string | undefined;
-    if (typeof node.properties.keyBinding === 'object') {
-      const availablePlatforms = Object.keys(node.properties.keyBinding);
-      const platform = getHostPlatform();
-      shortcut = availablePlatforms.includes(platform)
-        ? node.properties.keyBinding[platform]
-        : platform === 'ios'
-          ? node.properties.keyBinding.macos // Fallback to macos if ios-specific bindings not provided.
-          : platform === 'linux' || platform === 'unknown'
-            ? node.properties.keyBinding.windows // Fallback to windows if platform-specific bindings not provided.
-            : undefined;
-    } else {
-      shortcut = node.properties.keyBinding;
-    }
-
-    if (shortcut && isAction(node)) {
-      Keyboard.singleton.getContext(path.slice(0, -1).join('/')).bind({
-        shortcut,
-        handler: () => {
-          void node.data({ parent: node, caller: KEY_BINDING });
-        },
-        data: node.properties.label,
-      });
-    }
-  };
-
-  const eventHandler = debounce(() => {
-    graph.traverse({ visitor });
-  }, 500);
-
-  const unsubscribe = graph.onNodeChanged.on(eventHandler);
-
-  // TODO(burdon): Create context and plugin.
-  Keyboard.singleton.initialize();
-  Keyboard.singleton.setCurrentContext(graph.root.id);
-
-  return contributes(AppCapabilities.Null, null, () => {
-    unsubscribe();
-    Keyboard.singleton.destroy();
-  });
-};
+import { KEY_BINDING } from '#meta';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
+    const invoker = yield* Capability.get(Capabilities.OperationInvoker);
+    const pluginContext = yield* Capability.Service;
+
+    // TODO(wittjosiah): Factor out.
+    // TODO(wittjosiah): Handle removal of actions.
+    const visitor = (node: Node.Node, path: string[]) => {
+      let shortcut: string | undefined;
+      if (typeof node.properties.keyBinding === 'object') {
+        const availablePlatforms = Object.keys(node.properties.keyBinding);
+        const platform = getHostPlatform();
+        shortcut = availablePlatforms.includes(platform)
+          ? node.properties.keyBinding[platform]
+          : platform === 'ios'
+            ? node.properties.keyBinding.macos // Fallback to macos if ios-specific bindings not provided.
+            : platform === 'linux' || platform === 'unknown'
+              ? node.properties.keyBinding.windows // Fallback to windows if platform-specific bindings not provided.
+              : undefined;
+      } else {
+        shortcut = node.properties.keyBinding;
+      }
+
+      if (shortcut && Node.isAction(node)) {
+        Keyboard.singleton.getContext(path.slice(0, -1).join('/')).bind({
+          shortcut,
+          handler: () => void runAction(invoker, pluginContext, node, { parent: node, caller: KEY_BINDING }),
+          data: node.properties.label,
+        });
+      }
+    };
+
+    const eventHandler = debounce(() => {
+      Graph.traverse(graph, { relation: ['child', 'action'], visitor });
+    }, 500);
+
+    const unsubscribe = graph.onNodeChanged.on(eventHandler);
+
+    // TODO(burdon): Create context and plugin.
+    Keyboard.singleton.initialize();
+    Keyboard.singleton.setCurrentContext(Node.RootId);
+
+    return Capability.contributes(Capabilities.Null, null, () =>
+      Effect.sync(() => {
+        unsubscribe();
+        Keyboard.singleton.destroy();
+      }),
+    );
+  }),
+);

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/operation';
+
+import { NavTreeOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, NavTreeOperationHandlerSet);
+  }),
+);

package/src/capabilities/react-surface.tsx

@@ -2,44 +2,53 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { isGraphNode } from '@dxos/plugin-graph';
+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 '../components';
-import { COMMANDS_DIALOG, meta } from '../meta';
+import { CommandsDialogContent, CommandsTrigger, NavTreeContainer, NavTreeDocumentTitle } from '#containers';
+import { COMMANDS_DIALOG } from '#meta';
 
-export default () =>
-  contributes(Capabilities.ReactSurface, [
-    createSurface({
-      id: COMMANDS_DIALOG,
-      role: 'dialog',
-      filter: (data): data is { props: { selected?: string } } => data.component === COMMANDS_DIALOG,
-      component: ({ data }) => <CommandsDialogContent {...data.props} />,
-    }),
-    createSurface({
-      id: `${meta.id}/navigation`,
-      role: 'navigation',
-      filter: (data): data is { popoverAnchorId?: string; topbar: boolean; current: string } =>
-        typeof data.current === 'string',
-      component: ({ data }) => (
-        <NavTreeContainer
-          tab={data.current}
-          popoverAnchorId={data.popoverAnchorId as string | undefined}
-          topbar={data.topbar as boolean}
-        />
-      ),
-    }),
-    createSurface({
-      id: `${meta.id}/document-title`,
-      role: 'document-title',
-      component: ({ data }) => <NavTreeDocumentTitle node={isGraphNode(data.subject) ? data.subject : undefined} />,
-    }),
-    createSurface({
-      id: `${meta.id}/search-input`,
-      role: 'search-input',
-      position: 'fallback',
-      component: () => <CommandsTrigger />,
-    }),
-  ]);
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: COMMANDS_DIALOG,
+        role: 'dialog',
+        filter: AppSurface.componentDialog(COMMANDS_DIALOG),
+        component: ({ data, ref }) => <CommandsDialogContent {...data.props} ref={ref} />,
+      }),
+      Surface.create({
+        id: 'navigation',
+        role: 'navigation',
+        filter: (data): data is { popoverAnchorId?: string; current: string } => typeof data.current === 'string',
+        component: ({ data, ref }) => {
+          return (
+            <NavTreeContainer
+              tab={data.current}
+              popoverAnchorId={data.popoverAnchorId as string | undefined}
+              ref={ref}
+            />
+          );
+        },
+      }),
+      Surface.create({
+        id: 'document-title',
+        role: 'document-title',
+        component: ({ data }) => (
+          <NavTreeDocumentTitle node={Node.isGraphNode(data.subject) ? data.subject : undefined} />
+        ),
+      }),
+      Surface.create({
+        id: 'search-input',
+        role: 'search-input',
+        position: 'fallback',
+        component: () => <CommandsTrigger />,
+      }),
+    ]),
+  ),
+);