@dxos/plugin-debug 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-debug",
-  "version": "0.8.4-main.21d9917",
+  "version": "0.8.4-main.2244d791bb",
   "description": "DXOS Surface plugin for testing.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,84 +31,85 @@
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
     "@automerge/automerge": "3.2.3",
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
     "@tldraw/tldraw": "^3.0.0",
     "date-fns": "^3.3.1",
     "react-json-tree": "^0.18.0",
     "react-resize-detector": "^11.0.1",
     "workerize-loader": "^2.0.2",
-    "@dxos/assistant-toolkit": "0.8.4-main.21d9917",
-    "@dxos/app-framework": "0.8.4-main.21d9917",
-    "@dxos/async": "0.8.4-main.21d9917",
-    "@dxos/blueprints": "0.8.4-main.21d9917",
-    "@dxos/compute": "0.8.4-main.21d9917",
-    "@dxos/client-services": "0.8.4-main.21d9917",
-    "@dxos/conductor": "0.8.4-main.21d9917",
-    "@dxos/context": "0.8.4-main.21d9917",
-    "@dxos/devtools": "0.8.4-main.21d9917",
-    "@dxos/config": "0.8.4-main.21d9917",
-    "@dxos/echo": "0.8.4-main.21d9917",
-    "@dxos/echo-pipeline": "0.8.4-main.21d9917",
-    "@dxos/echo-generator": "0.8.4-main.21d9917",
-    "@dxos/effect": "0.8.4-main.21d9917",
-    "@dxos/functions": "0.8.4-main.21d9917",
-    "@dxos/invariant": "0.8.4-main.21d9917",
-    "@dxos/operation": "0.8.4-main.21d9917",
-    "@dxos/log": "0.8.4-main.21d9917",
-    "@dxos/plugin-client": "0.8.4-main.21d9917",
-    "@dxos/plugin-deck": "0.8.4-main.21d9917",
-    "@dxos/plugin-graph": "0.8.4-main.21d9917",
-    "@dxos/plugin-inbox": "0.8.4-main.21d9917",
-    "@dxos/keys": "0.8.4-main.21d9917",
-    "@dxos/plugin-markdown": "0.8.4-main.21d9917",
-    "@dxos/plugin-meeting": "0.8.4-main.21d9917",
-    "@dxos/plugin-sheet": "0.8.4-main.21d9917",
-    "@dxos/plugin-sketch": "0.8.4-main.21d9917",
-    "@dxos/plugin-script": "0.8.4-main.21d9917",
-    "@dxos/plugin-space": "0.8.4-main.21d9917",
-    "@dxos/plugin-status-bar": "0.8.4-main.21d9917",
-    "@dxos/plugin-table": "0.8.4-main.21d9917",
-    "@dxos/plugin-theme": "0.8.4-main.21d9917",
-    "@dxos/react-client": "0.8.4-main.21d9917",
-    "@dxos/protocols": "0.8.4-main.21d9917",
-    "@dxos/react-hooks": "0.8.4-main.21d9917",
-    "@dxos/react-ui-attention": "0.8.4-main.21d9917",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.21d9917",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.21d9917",
-    "@dxos/react-ui-form": "0.8.4-main.21d9917",
-    "@dxos/random": "0.8.4-main.21d9917",
-    "@dxos/react-ui-kanban": "0.8.4-main.21d9917",
-    "@dxos/react-ui-stack": "0.8.4-main.21d9917",
-    "@dxos/react-ui-mosaic": "0.8.4-main.21d9917",
-    "@dxos/react-ui-table": "0.8.4-main.21d9917",
-    "@dxos/schema": "0.8.4-main.21d9917",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.21d9917",
-    "@dxos/util": "0.8.4-main.21d9917",
-    "@dxos/types": "0.8.4-main.21d9917"
+    "@dxos/app-framework": "0.8.4-main.2244d791bb",
+    "@dxos/app-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/assistant-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/async": "0.8.4-main.2244d791bb",
+    "@dxos/blueprints": "0.8.4-main.2244d791bb",
+    "@dxos/client-services": "0.8.4-main.2244d791bb",
+    "@dxos/conductor": "0.8.4-main.2244d791bb",
+    "@dxos/compute": "0.8.4-main.2244d791bb",
+    "@dxos/config": "0.8.4-main.2244d791bb",
+    "@dxos/echo-generator": "0.8.4-main.2244d791bb",
+    "@dxos/devtools": "0.8.4-main.2244d791bb",
+    "@dxos/context": "0.8.4-main.2244d791bb",
+    "@dxos/echo": "0.8.4-main.2244d791bb",
+    "@dxos/echo-pipeline": "0.8.4-main.2244d791bb",
+    "@dxos/effect": "0.8.4-main.2244d791bb",
+    "@dxos/functions": "0.8.4-main.2244d791bb",
+    "@dxos/keys": "0.8.4-main.2244d791bb",
+    "@dxos/log": "0.8.4-main.2244d791bb",
+    "@dxos/operation": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-client": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-deck": "0.8.4-main.2244d791bb",
+    "@dxos/invariant": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-graph": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-markdown": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-meeting": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-script": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-status-bar": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-sketch": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-sheet": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-inbox": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-table": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-space": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-theme": "0.8.4-main.2244d791bb",
+    "@dxos/protocols": "0.8.4-main.2244d791bb",
+    "@dxos/random": "0.8.4-main.2244d791bb",
+    "@dxos/react-hooks": "0.8.4-main.2244d791bb",
+    "@dxos/react-client": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-attention": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-form": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-kanban": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-mosaic": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-table": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-stack": "0.8.4-main.2244d791bb",
+    "@dxos/types": "0.8.4-main.2244d791bb",
+    "@dxos/util": "0.8.4-main.2244d791bb",
+    "@dxos/schema": "0.8.4-main.2244d791bb"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@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.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/storybook-utils": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/storybook-utils": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui": "0.8.4-main.2244d791bb"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/random": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/random": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui": "0.8.4-main.2244d791bb"
   },
   "publishConfig": {
     "access": "public"

package/src/DebugPlugin.tsx

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvents, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { type Client } from '@dxos/react-client';
 
 import { AppGraphBuilder, DebugSettings, ReactContext, ReactSurface } from './capabilities';
@@ -13,16 +14,16 @@ import { translations } from './translations';
 
 // TODO(wittjosiah): Factor out DevtoolsPlugin?
 export const DebugPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addReactContextModule({ activate: ReactContext }),
+  AppPlugin.addSettingsModule({ activate: DebugSettings }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
     id: 'setup-devtools',
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: () => Effect.sync(() => setupDevtools()),
   }),
-  Common.Plugin.addSettingsModule({ activate: DebugSettings }),
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addReactContextModule({ activate: ReactContext }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
   Plugin.make,
 );
 

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

@@ -4,7 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Obj } from '@dxos/echo';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
@@ -26,11 +28,11 @@ export default Capability.makeModule(
         connector: (node, get) =>
           Effect.gen(function* () {
             const client = yield* Capability.get(ClientCapabilities.Client);
-            const layoutAtom = get(yield* Capability.atom(Common.Capability.Layout))[0];
+            const layoutAtom = get(yield* Capability.atom(AppCapabilities.Layout))[0];
             const layout = layoutAtom ? get(layoutAtom) : undefined;
             const { spaceId } = parseId(layout?.workspace);
             const space = spaceId ? client.spaces.get(spaceId) : undefined;
-            const [graph] = get(yield* Capability.atom(Common.Capability.AppGraph));
+            const [graph] = get(yield* Capability.atom(AppCapabilities.AppGraph));
 
             return [
               {
@@ -377,10 +379,10 @@ export default Capability.makeModule(
       GraphBuilder.createExtension({
         id: `${meta.id}/debug-object`,
         match: NodeMatcher.whenEchoObject,
-        connector: (node) =>
+        connector: (object) =>
           Effect.succeed([
             {
-              id: [node.id, 'debug'].join(ATTENDABLE_PATH_SEPARATOR),
+              id: [Obj.getDXN(object).toString(), 'debug'].join(ATTENDABLE_PATH_SEPARATOR),
               type: PLANK_COMPANION_TYPE,
               data: 'debug',
               properties: {
@@ -414,6 +416,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

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

@@ -5,14 +5,14 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { DevtoolsContextProvider } from '@dxos/devtools';
 
 import { meta } from '../../meta';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactContext, {
+    Capability.contributes(Capabilities.ReactContext, {
       id: meta.id,
       context: ({ children }) => <DevtoolsContextProvider>{children}</DevtoolsContextProvider>,
     }),

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

@@ -5,8 +5,10 @@
 import * as Effect from 'effect/Effect';
 import React, { useCallback } from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { useCapability, useLayout, useOperationInvoker, useSettingsState } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useCapability, useOperationInvoker, useSettingsState } from '@dxos/app-framework/ui';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import { useLayout } from '@dxos/app-toolkit/ui';
 import {
   AutomergePanel,
   ConfigPanel,
@@ -41,7 +43,7 @@ import { type Graph } from '@dxos/plugin-graph';
 import { ScriptOperation } from '@dxos/plugin-script/types';
 import { SpaceOperation } from '@dxos/plugin-space/types';
 import { type Space, SpaceState, isSpace, parseId } from '@dxos/react-client/echo';
-import { Layout } from '@dxos/react-ui-mosaic';
+import { Layout } from '@dxos/react-ui';
 import { Collection } from '@dxos/schema';
 
 import {
@@ -86,21 +88,21 @@ const useCurrentSpace = () => {
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const capabilities = yield* Capability.Service;
-    const registry = capabilities.get(Common.Capability.AtomRegistry);
+    const registry = capabilities.get(Capabilities.AtomRegistry);
     const settingsAtom = capabilities.get(DebugCapabilities.Settings);
 
-    return Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
+    return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
         id: `${meta.id}/plugin-settings`,
         role: 'article',
-        filter: (data): data is { subject: Common.Capability.Settings } =>
-          Common.Capability.isSettings(data.subject) && data.subject.prefix === meta.id,
+        filter: (data): data is { subject: AppCapabilities.Settings } =>
+          AppCapabilities.isSettings(data.subject) && data.subject.prefix === meta.id,
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<DebugSettingsProps>(subject.atom);
           return <DebugSettings settings={settings} onSettingsChange={updateSettings} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/space`,
         role: 'article',
         filter: (data): data is { subject: SpaceDebug } => isSpaceDebug(data.subject),
@@ -137,13 +139,13 @@ export default Capability.makeModule(
           );
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/app-graph`,
         role: 'article',
         filter: (data): data is { subject: GraphDebug } => isGraphDebug(data.subject),
         component: ({ data }) => <DebugGraph graph={data.subject.graph} root={data.subject.root} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/wireframe`,
         role: ['article', 'section'],
         position: 'hoist',
@@ -155,19 +157,19 @@ export default Capability.makeModule(
           <Wireframe label={`${role}:${name}`} object={data.subject} classNames='row-span-2 overflow-hidden' />
         ),
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/object-debug`,
         role: 'article',
         filter: (data): data is { companionTo: Obj.Unknown } =>
           data.subject === 'debug' && Obj.isObject(data.companionTo),
         component: ({ data }) => <DebugObjectPanel object={data.companionTo} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/devtools-overview`,
         role: 'deck-companion--devtools',
         component: () => <DevtoolsOverviewContainer />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/status`,
         role: 'status',
         component: () => <DebugStatus />,
@@ -177,55 +179,55 @@ export default Capability.makeModule(
       // Devtools
       //
 
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/client/config`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Client.Config,
         component: () => <ConfigPanel vaultSelector={false} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/client/storage`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Client.Storage,
         component: () => <StoragePanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/client/logs`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Client.Logs,
         component: () => <LoggingPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/client/diagnostics`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Client.Diagnostics,
         component: () => <DiagnosticsPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/client/tracing`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Client.Tracing,
         component: () => <TracingPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/halo/identity`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Halo.Identity,
         component: () => <IdentityPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/halo/devices`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Halo.Devices,
         component: () => <DeviceListPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/halo/keyring`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Halo.Keyring,
         component: () => <KeyringPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/halo/credentials`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Halo.Credentials,
@@ -234,20 +236,20 @@ export default Capability.makeModule(
           return <CredentialsPanel space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/spaces`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Spaces,
         component: () => {
           const { invokePromise } = useOperationInvoker();
           const handleSelect = useCallback(
-            () => invokePromise(Common.LayoutOperation.Open, { subject: [Devtools.Echo.Space] }),
+            () => invokePromise(LayoutOperation.Open, { subject: [Devtools.Echo.Space] }),
             [invokePromise],
           );
           return <SpaceListPanel onSelect={handleSelect} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/space`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Space,
@@ -255,13 +257,13 @@ export default Capability.makeModule(
           const space = useCurrentSpace();
           const { invokePromise } = useOperationInvoker();
           const handleSelect = useCallback(
-            () => invokePromise(Common.LayoutOperation.Open, { subject: [Devtools.Echo.Feeds] }),
+            () => invokePromise(LayoutOperation.Open, { subject: [Devtools.Echo.Feeds] }),
             [invokePromise],
           );
           return <SpaceInfoPanel space={space} onSelectFeed={handleSelect} onSelectPipeline={handleSelect} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/feeds`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Feeds,
@@ -270,7 +272,7 @@ export default Capability.makeModule(
           return <FeedsPanel space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/objects`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Objects,
@@ -279,7 +281,7 @@ export default Capability.makeModule(
           return <ObjectsPanel space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/schema`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Schema,
@@ -288,7 +290,7 @@ export default Capability.makeModule(
           return <SchemaPanel space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/automerge`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Automerge,
@@ -297,13 +299,13 @@ export default Capability.makeModule(
           return <AutomergePanel space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/queues`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Queues,
         component: () => <QueuesPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/members`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Members,
@@ -312,25 +314,25 @@ export default Capability.makeModule(
           return <MembersPanel space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/echo/metadata`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Echo.Metadata,
         component: () => <MetadataPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/mesh/signal`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Mesh.Signal,
         component: () => <SignalPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/mesh/swarm`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Mesh.Swarm,
         component: () => <SwarmPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/mesh/network`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Mesh.Network,
@@ -346,13 +348,13 @@ export default Capability.makeModule(
       //   filter: (data): data is any => data.subject === Devtools.Agent.Dashboard,
       //   component: () => <DashboardPanel />,
       // }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/edge/dashboard`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Edge.Dashboard,
         component: () => <EdgeDashboardPanel />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/edge/workflows`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Edge.Workflows,
@@ -361,7 +363,7 @@ export default Capability.makeModule(
           return <WorkflowPanel space={space} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/edge/traces`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Edge.Traces,
@@ -371,7 +373,7 @@ export default Capability.makeModule(
           return <InvocationTraceContainer db={space?.db} queueDxn={queueDxn} detailAxis='block' />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/edge/testing`,
         role: 'article',
         filter: (data): data is any => data.subject === Devtools.Edge.Testing,
@@ -394,7 +396,7 @@ export default Capability.makeModule(
               }
               log.info('script created', { result: createResult });
               if (createResult.data?.object?.id) {
-                await invokePromise(Common.LayoutOperation.Open, {
+                await invokePromise(LayoutOperation.Open, {
                   subject: [`${space.id}:${createResult.data.object.id}`],
                 });
               }

package/src/capabilities/settings/settings.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
 import { meta } from '../../meta';
@@ -20,7 +21,7 @@ export default Capability.makeModule(() =>
 
     return [
       Capability.contributes(DebugCapabilities.Settings, settingsAtom),
-      Capability.contributes(Common.Capability.Settings, {
+      Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
         schema: DebugSettingsSchema,
         atom: settingsAtom,

package/src/components/DebugObjectPanel.tsx

@@ -5,8 +5,7 @@
 import React from 'react';
 
 import { type Obj } from '@dxos/echo';
-import { Clipboard, Input, Toolbar } from '@dxos/react-ui';
-import { Layout } from '@dxos/react-ui-mosaic';
+import { Clipboard, Input, Layout, Toolbar } from '@dxos/react-ui';
 import { Json } from '@dxos/react-ui-syntax-highlighter';
 
 export type DebugObjectPanelProps = {