@dxos/plugin-debug 0.11.1 → 0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-debug",
-  "version": "0.11.1",
+  "version": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
   "description": "DXOS developer debugging utilities plugin.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -48,11 +48,6 @@
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
       "default": "./dist/lib/translations.mjs"
-    },
-    "#types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/types.mjs"
     }
   },
   "exports": {
@@ -61,7 +56,33 @@
       "types": "./dist/types/src/index.d.ts",
       "import": "./dist/lib/index.mjs"
     },
+    "./Debug": {
+      "source": "./src/types/Debug.ts",
+      "types": "./dist/types/src/types/Debug.d.ts",
+      "import": "./dist/lib/Debug.mjs"
+    },
+    "./DebugEvents": {
+      "source": "./src/types/DebugEvents.ts",
+      "types": "./dist/types/src/types/DebugEvents.d.ts",
+      "import": "./dist/lib/DebugEvents.mjs"
+    },
+    "./DebugNodes": {
+      "source": "./src/types/DebugNodes.ts",
+      "types": "./dist/types/src/types/DebugNodes.d.ts",
+      "import": "./dist/lib/DebugNodes.mjs"
+    },
+    "./DebugSurface": {
+      "source": "./src/types/DebugSurface.ts",
+      "types": "./dist/types/src/types/DebugSurface.d.ts",
+      "import": "./dist/lib/DebugSurface.mjs"
+    },
+    "./Settings": {
+      "source": "./src/types/Settings.ts",
+      "types": "./dist/types/src/types/Settings.d.ts",
+      "import": "./dist/lib/Settings.mjs"
+    },
     "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
+    "./package.json": "./package.json",
     "./plugin": {
       "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
@@ -74,6 +95,25 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "Debug": [
+        "dist/types/src/types/Debug.d.ts"
+      ],
+      "DebugEvents": [
+        "dist/types/src/types/DebugEvents.d.ts"
+      ],
+      "DebugNodes": [
+        "dist/types/src/types/DebugNodes.d.ts"
+      ],
+      "DebugSurface": [
+        "dist/types/src/types/DebugSurface.d.ts"
+      ],
+      "Settings": [
+        "dist/types/src/types/Settings.d.ts"
+      ]
+    }
+  },
   "files": [
     "dist",
     "dx.config.ts",
@@ -81,64 +121,63 @@
     "PLUGIN.mdl"
   ],
   "dependencies": {
-    "@antv/graphlib": "^2.0.4",
-    "@antv/layout": "^1.2.13",
     "@effect-atom/atom": "^0.5.3",
     "@effect-atom/atom-react": "^0.5.0",
-    "@tldraw/tldraw": "^3.0.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.11.1",
-    "@dxos/assistant-toolkit": "0.11.1",
-    "@dxos/app-toolkit": "0.11.1",
-    "@dxos/async": "0.11.1",
-    "@dxos/compute": "0.11.1",
-    "@dxos/compute-hyperformula": "0.11.1",
-    "@dxos/conductor": "0.11.1",
-    "@dxos/config": "0.11.1",
-    "@dxos/devtools": "0.11.1",
-    "@dxos/echo": "0.11.1",
-    "@dxos/echo-react": "0.11.1",
-    "@dxos/effect": "0.11.1",
-    "@dxos/invariant": "0.11.1",
-    "@dxos/keys": "0.11.1",
-    "@dxos/log": "0.11.1",
-    "@dxos/log-store-idb": "0.11.1",
-    "@dxos/operation": "0.11.1",
-    "@dxos/plugin-graph": "0.11.1",
-    "@dxos/plugin-illustrator": "0.11.1",
-    "@dxos/plugin-inbox": "0.11.1",
-    "@dxos/plugin-sheet": "0.11.1",
-    "@dxos/plugin-markdown": "0.11.1",
-    "@dxos/plugin-tldraw": "0.11.1",
-    "@dxos/protocols": "0.11.1",
-    "@dxos/plugin-status-bar": "0.11.1",
-    "@dxos/plugin-space": "0.11.1",
-    "@dxos/random": "0.11.1",
-    "@dxos/react-client": "0.11.1",
-    "@dxos/react-ui-attention": "0.11.1",
-    "@dxos/react-ui-canvas-compute": "0.11.1",
-    "@dxos/react-ui-canvas-editor": "0.11.1",
-    "@dxos/react-ui-syntax-highlighter": "0.11.1",
-    "@dxos/react-ui-debug": "0.11.1",
-    "@dxos/react-ui-form": "0.11.1",
-    "@dxos/schema": "0.11.1",
-    "@dxos/tracing": "0.11.1",
-    "@dxos/types": "0.11.1",
-    "@dxos/util": "0.11.1"
+    "@dxos/app-framework": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/app-toolkit": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/async": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/assistant-toolkit": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/compute": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/compute-hyperformula": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/conductor": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/config": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/echo": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/devtools": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/effect": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/invariant": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/keys": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/echo-react": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/log": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/log-store-idb": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/operation": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-graph": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-illustrator": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-inbox": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-markdown": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-sheet": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-space": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-status-bar": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-tldraw": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/protocols": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/random": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-client": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-attention": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-canvas-compute": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-canvas-editor": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-debug": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-form": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-syntax-highlighter": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/schema": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/tracing": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/types": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/util": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.96.2",
+    "@storybook/react-vite": "^10.4.2",
     "@types/react": "~19.2.17",
     "@types/react-dom": "~19.2.3",
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
     "vite": "^8.1.4",
-    "@dxos/plugin-testing": "0.11.1",
-    "@dxos/react-ui": "0.11.1",
-    "@dxos/storybook-utils": "0.11.1",
-    "@dxos/ui-theme": "0.11.1"
+    "@dxos/plugin-client": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/plugin-testing": "0.12.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui-list": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/ui-theme": "1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -146,9 +185,9 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "@dxos/random": "^0.11.1",
-    "@dxos/react-ui": "^0.11.1",
-    "@dxos/ui-theme": "^0.11.1"
+    "@dxos/random": "^1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/react-ui": "^1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d",
+    "@dxos/ui-theme": "^1.0.0-next-bbabc02363f18d7643ea4160e3a7a7809870fd0d"
   },
   "publishConfig": {
     "access": "public"

package/src/DebugPlugin.node.ts

@@ -2,16 +2,16 @@
 // Copyright 2026 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-import { AppPlugin } from '@dxos/app-toolkit';
+import * as Plugin from '@dxos/app-framework/Plugin';
 
 import { AppGraphBuilder, DebugSettings } from '#capabilities';
 import { meta } from '#meta';
-import { type DebugPluginOptions } from '#types';
 
-export const DebugPlugin = Plugin.define<DebugPluginOptions>(meta).pipe(
-  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addSettingsModule({ activate: DebugSettings }),
+import * as Debug from './types/Debug';
+
+export const DebugPlugin = Plugin.define<Debug.DebugPluginOptions>(meta).pipe(
+  Plugin.addModule(AppGraphBuilder),
+  Plugin.addModule(DebugSettings),
   Plugin.make,
 );
 

package/src/DebugPlugin.tsx

@@ -2,39 +2,32 @@
 // Copyright 2026 DXOS.org
 //
 
-import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
-import { AppPlugin } from '@dxos/app-toolkit';
+import * as Plugin from '@dxos/app-framework/Plugin';
+import * as AppCapability from '@dxos/app-toolkit/AppCapability';
 
 import { AppGraphBuilder, DebugSettings, LogRecording, ReactSurface, StatsPanel } from '#capabilities';
 import { meta } from '#meta';
 import { translations } from '#translations';
-import { type DebugPluginOptions } from '#types';
 
 // eslint-disable-next-line import/no-relative-packages
 import pluginSpec from '../PLUGIN.mdl?raw';
+import * as Debug from './types/Debug';
 
-export const DebugPlugin = Plugin.define<DebugPluginOptions>(meta).pipe(
-  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addSettingsModule({ activate: DebugSettings }),
-  Plugin.addModule(({ logStore }) => ({
-    id: Capability.getModuleTag(ReactSurface) ?? 'surfaces',
-    activatesOn: ActivationEvents.SetupReactSurface,
-    activate: () => ReactSurface({ logStore }),
-  })),
-  Plugin.addModule({
-    id: 'log-recording',
-    activatesOn: ActivationEvents.Startup,
-    activate: LogRecording,
-  }),
-  AppPlugin.addTranslationsModule({ translations }),
-  Plugin.addModule(({ persistStats }) => ({
-    id: 'stats-panel',
-    activatesOn: ActivationEvents.Startup,
-    activate: () => StatsPanel({ persist: persistStats ?? true }),
-  })),
-  AppPlugin.addPluginAssetModule({
-    asset: { pluginId: meta.profile.key, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
-  }),
+export const DebugPlugin = Plugin.define<Debug.DebugPluginOptions>(meta).pipe(
+  Plugin.addModule(AppGraphBuilder),
+  Plugin.addModule(DebugSettings),
+  Plugin.addModule(ReactSurface),
+  Plugin.addModule(LogRecording),
+  Plugin.addModule(AppCapability.translations(translations)),
+  Plugin.addModule(StatsPanel),
+  Plugin.addModule(
+    AppCapability.pluginAsset({
+      pluginId: meta.profile.key,
+      path: 'PLUGIN.mdl',
+      content: pluginSpec,
+      mimeType: 'application/x-mdl',
+    }),
+  ),
   Plugin.make,
 );
 

package/src/DebugPlugin.workerd.ts

@@ -2,11 +2,12 @@
 // Copyright 2026 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
+import * as Plugin from '@dxos/app-framework/Plugin';
 
 import { meta } from '#meta';
-import { type DebugPluginOptions } from '#types';
 
-export const DebugPlugin = Plugin.define<DebugPluginOptions>(meta).pipe(Plugin.make);
+import * as Debug from './types/Debug';
+
+export const DebugPlugin = Plugin.define<Debug.DebugPluginOptions>(meta).pipe(Plugin.make);
 
 export default DebugPlugin;

package/src/capabilities/DebugSurfaces.tsx

@@ -9,24 +9,29 @@ import * as Option from 'effect/Option';
 import React, { useCallback, useMemo } from 'react';
 
 import { useAtomCapability, useOperationInvoker, useSettingsState } from '@dxos/app-framework/ui';
-import { AppAnnotation, type AppCapabilities, GraphPath, LayoutOperation } from '@dxos/app-toolkit';
+import * as AppAnnotation from '@dxos/app-toolkit/AppAnnotation';
+import type * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
+import * as GraphPath from '@dxos/app-toolkit/GraphPath';
+import * as LayoutOperation from '@dxos/app-toolkit/LayoutOperation';
 import { useActiveSpace } from '@dxos/app-toolkit/ui';
 import { Annotation, Collection, Entity, Filter, Obj, Type } from '@dxos/echo';
 import { HiddenAnnotation } from '@dxos/echo/Annotation';
 import { type IdbLogStore } from '@dxos/log-store-idb';
-import { SpaceCapabilities, SpaceOperation } from '@dxos/plugin-space';
+import { SpaceOperation } from '@dxos/plugin-space';
+import * as SpaceCapabilities from '@dxos/plugin-space/SpaceCapabilities';
 import { useClient } from '@dxos/react-client';
 import { type Space, SpaceState } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
 import { Logger } from '@dxos/react-ui-debug';
 
 import { DebugObjectPanel, DebugSettings, DebugSpaceObjectsPanel, SpaceGenerator } from '#containers';
-import { type Settings } from '#types';
+
+import * as Settings from '../types/Settings';
 
 /** Returns `onOpen` and `canOpen` for the ObjectsTree "Open" action. */
 const useObjectOpenAction = (invokePromise: ReturnType<typeof useOperationInvoker>['invokePromise']) => {
   const client = useClient();
-  const spaceSettings = useAtomCapability(SpaceCapabilities.Settings);
+  const spaceSettings = useAtomCapability(SpaceCapabilities.SettingsAtom);
   const showHidden = spaceSettings?.showHidden ?? false;
 
   const allTypes = useAtomValue(useMemo(() => client.graph.registry.query(Filter.type(Type.Type)).atom, [client]));

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

@@ -4,14 +4,18 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, AppNode, AppNodeMatcher, GraphPath } from '@dxos/app-toolkit';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
+import * as AppNode from '@dxos/app-toolkit/AppNode';
+import * as AppNodeMatcher from '@dxos/app-toolkit/AppNodeMatcher';
+import * as GraphPath from '@dxos/app-toolkit/GraphPath';
 import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 import { type Space } from '@dxos/react-client/echo';
 import { Position } from '@dxos/util';
 
 import { meta } from '#meta';
-import { DebugNodes } from '#types';
+
+import * as DebugNodes from '../types/DebugNodes';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
@@ -95,6 +99,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+    return Capability.contribute(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/index.ts

@@ -2,10 +2,44 @@
 // Copyright 2026 DXOS.org
 //
 
-import { Capability } from '@dxos/app-framework';
+import * as ActivationEvents from '@dxos/app-framework/ActivationEvents';
+import * as Capabilities from '@dxos/app-framework/Capabilities';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
+import * as AppCapability from '@dxos/app-toolkit/AppCapability';
 
-export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
-export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
-export const DebugSettings = Capability.lazy('DebugSettings', () => import('./settings'));
-export const StatsPanel = Capability.lazy('StatsPanel', () => import('./stats-panel'));
-export const LogRecording = Capability.lazy('LogRecording', () => import('./log-recording'));
+import * as Debug from '../types/Debug';
+import * as DebugEvents from '../types/DebugEvents';
+
+export const AppGraphBuilder = AppCapability.appGraphBuilder(() => import('./app-graph-builder'));
+export const ReactSurface = AppCapability.surface(() => import('./react-surface'), {
+  roles: [
+    'org.dxos.plugin.debug.surface.stats',
+    'org.dxos.role.article',
+    'org.dxos.role.deckCompanion.logs',
+    'org.dxos.role.deckCompanion.spaceObjects',
+    'org.dxos.role.section',
+    'org.dxos.role.statusIndicator',
+  ],
+  requires: [Capabilities.AtomRegistry, Debug.DebugCapabilities.Settings, AppCapabilities.FileUploader],
+  props: ({ logStore }: Debug.DebugPluginOptions) => ({ logStore }),
+});
+export const DebugSettings = AppCapability.settings(() => import('./settings'), {
+  activatesOn: ActivationEvents.Idle,
+  provides: [Debug.DebugCapabilities.Settings],
+});
+export const StatsPanel = Capability.lazyModule(
+  'StatsPanel',
+  {
+    requires: [Capabilities.AtomRegistry],
+    provides: [AppCapabilities.StatsPanel],
+    props: ({ persistStats }: Debug.DebugPluginOptions) => ({ persist: persistStats ?? true }),
+    activatesOn: DebugEvents.Start,
+  },
+  () => import('./stats-panel'),
+);
+export const LogRecording = Capability.lazyModule(
+  'LogRecording',
+  { provides: [], activatesOn: DebugEvents.Start },
+  () => import('./log-recording'),
+);

package/src/capabilities/log-recording.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capabilities, Capability } from '@dxos/app-framework';
+import * as Capability from '@dxos/app-framework/Capability';
 import { logBuffer } from '@dxos/react-ui-debug';
 
 /**
@@ -15,6 +15,7 @@ import { logBuffer } from '@dxos/react-ui-debug';
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     logBuffer.start();
-    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => logBuffer.stop()));
+    yield* Effect.addFinalizer(() => Effect.sync(() => logBuffer.stop()));
+    return [];
   }),
 );

package/src/capabilities/react-surface.ts

@@ -4,9 +4,10 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capabilities, Capability } from '@dxos/app-framework';
+import * as Capabilities from '@dxos/app-framework/Capabilities';
+import * as Capability from '@dxos/app-framework/Capability';
 import { Surface } from '@dxos/app-framework/ui';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
 import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { type IdbLogStore } from '@dxos/log-store-idb';
@@ -15,8 +16,10 @@ import { Position } from '@dxos/util';
 
 import { DebugStatus, LogStatus, StatsPanel, Wireframe } from '#containers';
 import { meta } from '#meta';
-import { DebugCapabilities, DebugNodes, DebugSurface } from '#types';
 
+import { DebugCapabilities } from '../types/Debug';
+import * as DebugNodes from '../types/DebugNodes';
+import * as DebugSurface from '../types/DebugSurface';
 import {
   DebugSettingsSurface,
   LoggerSurface,
@@ -44,12 +47,11 @@ type ReactSurfaceOptions = {
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* ({ logStore }: ReactSurfaceOptions) {
-    const capabilities = yield* Capability.Service;
-    const registry = capabilities.get(Capabilities.AtomRegistry);
-    const settingsAtom = capabilities.get(DebugCapabilities.Settings);
-    const fileUploader = capabilities.getAll(AppCapabilities.FileUploader)[0];
+    const registry = yield* Capabilities.AtomRegistry;
+    const settingsAtom = yield* DebugCapabilities.Settings;
+    const fileUploader = (yield* Capability.getAll(AppCapabilities.FileUploader))[0];
 
-    return Capability.contributes(Capabilities.ReactSurface, [
+    return Capability.contribute(Capabilities.ReactSurface, [
       Surface.create({
         id: 'pluginSettings',
         filter: AppSurface.settings(AppSurface.Article, meta.profile.key),

package/src/capabilities/settings.ts

@@ -4,12 +4,14 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
 import { createKvsStore } from '@dxos/effect';
 
 import { meta } from '#meta';
-import { DebugCapabilities, Settings } from '#types';
+
+import * as Debug from '../types/Debug';
+import * as Settings from '../types/Settings';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {
@@ -20,8 +22,8 @@ export default Capability.makeModule(() =>
     });
 
     return [
-      Capability.contributes(DebugCapabilities.Settings, settingsAtom),
-      Capability.contributes(AppCapabilities.Settings, {
+      Capability.contribute(Debug.DebugCapabilities.Settings, settingsAtom),
+      Capability.contribute(AppCapabilities.Settings, {
         prefix: meta.profile.key,
         schema: Settings.Settings,
         atom: settingsAtom,

package/src/capabilities/stats-panel.ts

@@ -5,8 +5,9 @@
 import { Atom } from '@effect-atom/atom';
 import * as Effect from 'effect/Effect';
 
-import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import * as Capabilities from '@dxos/app-framework/Capabilities';
+import * as Capability from '@dxos/app-framework/Capability';
+import * as AppCapabilities from '@dxos/app-toolkit/AppCapabilities';
 
 import { meta } from '#meta';
 
@@ -26,7 +27,7 @@ const STORAGE_KEY = `${meta.profile.key}.statsPanel`;
  */
 export default Capability.makeModule(
   Effect.fnUntraced(function* ({ persist = true }: StatsPanelOptions = {}) {
-    const registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const registry = yield* Capabilities.AtomRegistry;
     const canPersist = persist && typeof localStorage !== 'undefined';
 
     const hydrate = (): Record<string, unknown> => {
@@ -55,7 +56,7 @@ export default Capability.makeModule(
       }
     };
 
-    return Capability.contributes(AppCapabilities.StatsPanel, {
+    return Capability.contribute(AppCapabilities.StatsPanel, {
       statsAtom,
       get: (pluginKey) => registry.get(statsAtom)[pluginKey],
       compartment: (pluginKey) => ({

package/src/components/SchemaTable/SchemaTable.tsx

@@ -4,6 +4,7 @@
 
 import React from 'react';
 
+import { Type } from '@dxos/echo';
 import { IconButton, ThemedClassName } from '@dxos/react-ui';
 import { mx } from '@dxos/ui-theme';
 
@@ -18,19 +19,24 @@ export const SchemaTable = ({ classNames, types, objects = {}, label, onClick }:
   return (
     <div className={mx('grid grid-cols-[1fr_80px_40px] gap-1 overflow-none', classNames)}>
       <h2 className='p-2'>{label}</h2>
-      {types.map((type) => (
-        <div key={type.typename} className='grid grid-cols-subgrid col-span-3 items-center'>
-          <div className='px-2 text-sm font-mono text-subdued'>{type.typename}</div>
-          <div className='px-2 text-right font-mono'>{objects[type.typename] ?? 0}</div>
-          <IconButton
-            variant='ghost'
-            icon='ph--plus--regular'
-            iconOnly
-            label='Create data'
-            onClick={() => onClick(type.typename)}
-          />
-        </div>
-      ))}
+      {types.map((type) => {
+        // Preset descriptors are plain `{ typename }` objects, while class-based type entities carry
+        // no `typename` property — those resolve via `Type.getTypename`.
+        const typename = typeof type.typename === 'string' ? type.typename : Type.getTypename(type);
+        return (
+          <div key={typename} className='grid grid-cols-subgrid col-span-3 items-center'>
+            <div className='px-2 text-sm font-mono text-subdued'>{typename}</div>
+            <div className='px-2 text-right font-mono'>{typename ? (objects[typename] ?? 0) : 0}</div>
+            <IconButton
+              variant='ghost'
+              icon='ph--plus--regular'
+              iconOnly
+              label='Create data'
+              onClick={() => typename && onClick(typename)}
+            />
+          </div>
+        );
+      })}
     </div>
   );
 };

package/src/components/SpaceGenerator/ObjectGenerator.tsx

@@ -2,15 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { addressToA1Notation } from '@dxos/compute-hyperformula';
+import { addressToA1Notation } from '@dxos/compute-hyperformula/types';
 import { ComputeGraph, ComputeGraphModel, DEFAULT_OUTPUT, NODE_INPUT, NODE_OUTPUT } from '@dxos/conductor';
 import { EID, Filter, Key, Type, View } from '@dxos/echo';
 import { OperationInvoker } from '@dxos/operation';
-import { Drawing } from '@dxos/plugin-illustrator';
-import { Markdown } from '@dxos/plugin-markdown';
-import { Sheet } from '@dxos/plugin-sheet';
+import * as Drawing from '@dxos/plugin-illustrator/Drawing';
+import * as Markdown from '@dxos/plugin-markdown/Markdown';
+import * as Sheet from '@dxos/plugin-sheet/Sheet';
 import { SpaceOperation } from '@dxos/plugin-space';
-import { Tldraw } from '@dxos/plugin-tldraw';
+import * as Tldraw from '@dxos/plugin-tldraw/Tldraw';
 import { random } from '@dxos/random';
 import { type Client } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';

package/src/components/SpaceGenerator/presets.ts

@@ -5,14 +5,16 @@
 import * as Schema from 'effect/Schema';
 
 import { RunInstructions, WebSearchSkill } from '@dxos/assistant-toolkit';
-import { Instructions, Operation, Trigger } from '@dxos/compute';
+import * as Instructions from '@dxos/compute/Instructions';
+import * as Operation from '@dxos/compute/Operation';
+import * as Trigger from '@dxos/compute/Trigger';
 import { type ComputeGraphModel, NODE_INPUT } from '@dxos/conductor';
 import { Feed, Filter, JsonSchema, Key, Obj, Query, type QueryAST, Ref, Scope, Tag } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { DXN, EID } from '@dxos/keys';
-import { InboxOperation } from '@dxos/plugin-inbox';
-import { Mailbox } from '@dxos/plugin-inbox';
-import { Markdown } from '@dxos/plugin-markdown';
+import * as InboxOperation from '@dxos/plugin-inbox/InboxOperation';
+import * as Mailbox from '@dxos/plugin-inbox/Mailbox';
+import * as Markdown from '@dxos/plugin-markdown/Markdown';
 import { type Space } from '@dxos/react-client/echo';
 import {
   type ComputeShape,