@dxos/plugin-debug 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-debug",
-  "version": "0.8.4-main.69d29f4",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "DXOS Surface plugin for testing.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,9 +14,9 @@
   "type": "module",
   "exports": {
     ".": {
-      "browser": "./dist/lib/browser/index.mjs",
       "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "browser": "./dist/lib/browser/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -31,84 +31,84 @@
     "@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/app-framework": "0.8.4-main.69d29f4",
-    "@dxos/blueprints": "0.8.4-main.69d29f4",
-    "@dxos/client-services": "0.8.4-main.69d29f4",
-    "@dxos/async": "0.8.4-main.69d29f4",
-    "@dxos/assistant-toolkit": "0.8.4-main.69d29f4",
-    "@dxos/compute": "0.8.4-main.69d29f4",
-    "@dxos/conductor": "0.8.4-main.69d29f4",
-    "@dxos/config": "0.8.4-main.69d29f4",
-    "@dxos/context": "0.8.4-main.69d29f4",
-    "@dxos/echo": "0.8.4-main.69d29f4",
-    "@dxos/devtools": "0.8.4-main.69d29f4",
-    "@dxos/echo-generator": "0.8.4-main.69d29f4",
-    "@dxos/functions": "0.8.4-main.69d29f4",
-    "@dxos/echo-pipeline": "0.8.4-main.69d29f4",
-    "@dxos/invariant": "0.8.4-main.69d29f4",
-    "@dxos/effect": "0.8.4-main.69d29f4",
-    "@dxos/keys": "0.8.4-main.69d29f4",
-    "@dxos/log": "0.8.4-main.69d29f4",
-    "@dxos/operation": "0.8.4-main.69d29f4",
-    "@dxos/plugin-client": "0.8.4-main.69d29f4",
-    "@dxos/plugin-deck": "0.8.4-main.69d29f4",
-    "@dxos/plugin-graph": "0.8.4-main.69d29f4",
-    "@dxos/plugin-inbox": "0.8.4-main.69d29f4",
-    "@dxos/plugin-markdown": "0.8.4-main.69d29f4",
-    "@dxos/plugin-meeting": "0.8.4-main.69d29f4",
-    "@dxos/plugin-sheet": "0.8.4-main.69d29f4",
-    "@dxos/plugin-script": "0.8.4-main.69d29f4",
-    "@dxos/plugin-space": "0.8.4-main.69d29f4",
-    "@dxos/plugin-table": "0.8.4-main.69d29f4",
-    "@dxos/plugin-sketch": "0.8.4-main.69d29f4",
-    "@dxos/plugin-status-bar": "0.8.4-main.69d29f4",
-    "@dxos/protocols": "0.8.4-main.69d29f4",
-    "@dxos/plugin-theme": "0.8.4-main.69d29f4",
-    "@dxos/random": "0.8.4-main.69d29f4",
-    "@dxos/react-client": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-attention": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.69d29f4",
-    "@dxos/react-hooks": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-form": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-mosaic": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-kanban": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-stack": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.69d29f4",
-    "@dxos/types": "0.8.4-main.69d29f4",
-    "@dxos/util": "0.8.4-main.69d29f4",
-    "@dxos/schema": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-table": "0.8.4-main.69d29f4"
+    "@dxos/async": "0.8.4-main.6fa680abb7",
+    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
+    "@dxos/assistant-toolkit": "0.8.4-main.6fa680abb7",
+    "@dxos/app-toolkit": "0.8.4-main.6fa680abb7",
+    "@dxos/client-services": "0.8.4-main.6fa680abb7",
+    "@dxos/compute": "0.8.4-main.6fa680abb7",
+    "@dxos/conductor": "0.8.4-main.6fa680abb7",
+    "@dxos/config": "0.8.4-main.6fa680abb7",
+    "@dxos/context": "0.8.4-main.6fa680abb7",
+    "@dxos/devtools": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-generator": "0.8.4-main.6fa680abb7",
+    "@dxos/effect": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-pipeline": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/keys": "0.8.4-main.6fa680abb7",
+    "@dxos/functions": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/operation": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-client": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-deck": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-inbox": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-graph": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-markdown": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-meeting": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-script": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-sketch": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-space": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-sheet": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-status-bar": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-table": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-theme": "0.8.4-main.6fa680abb7",
+    "@dxos/protocols": "0.8.4-main.6fa680abb7",
+    "@dxos/react-client": "0.8.4-main.6fa680abb7",
+    "@dxos/random": "0.8.4-main.6fa680abb7",
+    "@dxos/react-hooks": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-form": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-mosaic": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-stack": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-attention": "0.8.4-main.6fa680abb7",
+    "@dxos/schema": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-table": "0.8.4-main.6fa680abb7",
+    "@dxos/types": "0.8.4-main.6fa680abb7",
+    "@dxos/util": "0.8.4-main.6fa680abb7",
+    "@dxos/blueprints": "0.8.4-main.6fa680abb7"
   },
   "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/storybook-utils": "0.8.4-main.69d29f4",
-    "@dxos/react-ui": "0.8.4-main.69d29f4",
-    "@dxos/ui-theme": "0.8.4-main.69d29f4"
+    "vite": "^7.1.11",
+    "@dxos/storybook-utils": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "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/random": "0.8.4-main.69d29f4",
-    "@dxos/ui-theme": "0.8.4-main.69d29f4",
-    "@dxos/react-ui": "0.8.4-main.69d29f4"
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/random": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "publishConfig": {
     "access": "public"

package/src/DebugPlugin.tsx

@@ -4,25 +4,36 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { type LogBuffer } from '@dxos/log';
 import { type Client } from '@dxos/react-client';
 
 import { AppGraphBuilder, DebugSettings, ReactContext, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
 
+export type DebugPluginOptions = {
+  /** Shared log buffer for capturing and downloading logs. */
+  logBuffer: LogBuffer;
+};
+
 // TODO(wittjosiah): Factor out DevtoolsPlugin?
-export const DebugPlugin = Plugin.define(meta).pipe(
+export const DebugPlugin = Plugin.define<DebugPluginOptions>(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addReactContextModule({ activate: ReactContext }),
+  AppPlugin.addSettingsModule({ activate: DebugSettings }),
+  Plugin.addModule(({ logBuffer }) => ({
+    id: Capability.getModuleTag(ReactSurface) ?? 'surfaces',
+    activatesOn: ActivationEvents.SetupReactSurface,
+    activate: () => ReactSurface({ logBuffer }),
+  })),
+  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,37 +4,38 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, getSpaceIdFromPath } 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 { DECK_COMPANION_TYPE, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 import { meta as spaceMeta } from '@dxos/plugin-space';
-import { parseId } from '@dxos/react-client/echo';
 
 import { meta } from '../../meta';
 import { Devtools } from '../../types';
 
-const DEVTOOLS_TYPE = `${meta.id}/devtools`;
+const DEVTOOLS_TYPE = `${meta.id}.devtools`;
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* Effect.all([
       // Devtools node.
       GraphBuilder.createExtension({
-        id: `${meta.id}/devtools`,
-        match: NodeMatcher.whenAny(NodeMatcher.whenRoot, NodeMatcher.whenNodeType(`${spaceMeta.id}/settings`)),
+        id: `${meta.id}.devtools`,
+        match: NodeMatcher.whenAny(NodeMatcher.whenRoot, NodeMatcher.whenNodeType(`${spaceMeta.id}.settings`)),
         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 spaceId = layout?.workspace ? getSpaceIdFromPath(layout.workspace) : undefined;
             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 [
               {
-                id: `${Devtools.id}-${node.id}`,
+                id: Devtools.id,
                 data: null,
                 type: DEVTOOLS_TYPE,
                 properties: {
@@ -44,12 +45,12 @@ export default Capability.makeModule(
                   position: 'fallback',
                 },
                 nodes: [
-                  ...(space && node.type === `${spaceMeta.id}/settings`
+                  ...(space && node.type === `${spaceMeta.id}.settings`
                     ? [
                         {
-                          id: `debug-${node.id}`,
-                          type: `${meta.id}/space`,
-                          data: { space, type: `${meta.id}/space` },
+                          id: 'debug',
+                          type: `${meta.id}.space`,
+                          data: { space, type: `${meta.id}.space` },
                           properties: {
                             label: ['debug label', { ns: meta.id }],
                             icon: 'ph--bug--regular',
@@ -58,8 +59,8 @@ export default Capability.makeModule(
                       ]
                     : []),
                   {
-                    id: `app-graph-${node.id}`,
-                    type: `${meta.id}/app-graph`,
+                    id: 'app-graph',
+                    type: `${meta.id}.app-graph`,
                     data: { graph: graph?.graph, root: space ? space.id : Node.RootId },
                     properties: {
                       label: ['debug app graph label', { ns: meta.id }],
@@ -67,7 +68,7 @@ export default Capability.makeModule(
                     },
                   },
                   {
-                    id: `${Devtools.Client.id}-${node.id}`,
+                    id: Devtools.Client.id,
                     data: null,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -76,7 +77,7 @@ export default Capability.makeModule(
                     },
                     nodes: [
                       {
-                        id: `${Devtools.Client.Config}-${node.id}`,
+                        id: Devtools.Client.Config,
                         data: Devtools.Client.Config,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -85,7 +86,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Client.Storage}-${node.id}`,
+                        id: Devtools.Client.Storage,
                         data: Devtools.Client.Storage,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -94,7 +95,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Client.Logs}-${node.id}`,
+                        id: Devtools.Client.Logs,
                         data: Devtools.Client.Logs,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -103,7 +104,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Client.Diagnostics}-${node.id}`,
+                        id: Devtools.Client.Diagnostics,
                         data: Devtools.Client.Diagnostics,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -112,7 +113,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Client.Tracing}-${node.id}`,
+                        id: Devtools.Client.Tracing,
                         data: Devtools.Client.Tracing,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -123,7 +124,7 @@ export default Capability.makeModule(
                     ],
                   },
                   {
-                    id: `${Devtools.Halo.id}-${node.id}`,
+                    id: Devtools.Halo.id,
                     data: null,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -132,7 +133,7 @@ export default Capability.makeModule(
                     },
                     nodes: [
                       {
-                        id: `${Devtools.Halo.Identity}-${node.id}`,
+                        id: Devtools.Halo.Identity,
                         data: Devtools.Halo.Identity,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -141,7 +142,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Halo.Devices}-${node.id}`,
+                        id: Devtools.Halo.Devices,
                         data: Devtools.Halo.Devices,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -150,7 +151,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Halo.Keyring}-${node.id}`,
+                        id: Devtools.Halo.Keyring,
                         data: Devtools.Halo.Keyring,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -159,7 +160,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Halo.Credentials}-${node.id}`,
+                        id: Devtools.Halo.Credentials,
                         data: Devtools.Halo.Credentials,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -170,7 +171,7 @@ export default Capability.makeModule(
                     ],
                   },
                   {
-                    id: `${Devtools.Echo.id}-${node.id}`,
+                    id: Devtools.Echo.id,
                     data: null,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -179,7 +180,7 @@ export default Capability.makeModule(
                     },
                     nodes: [
                       {
-                        id: `${Devtools.Echo.Spaces}-${node.id}`,
+                        id: Devtools.Echo.Spaces,
                         data: Devtools.Echo.Spaces,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -188,7 +189,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Space}-${node.id}`,
+                        id: Devtools.Echo.Space,
                         data: Devtools.Echo.Space,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -197,7 +198,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Feeds}-${node.id}`,
+                        id: Devtools.Echo.Feeds,
                         data: Devtools.Echo.Feeds,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -206,7 +207,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Objects}-${node.id}`,
+                        id: Devtools.Echo.Objects,
                         data: Devtools.Echo.Objects,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -215,7 +216,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Schema}-${node.id}`,
+                        id: Devtools.Echo.Schema,
                         data: Devtools.Echo.Schema,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -224,7 +225,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Automerge}-${node.id}`,
+                        id: Devtools.Echo.Automerge,
                         data: Devtools.Echo.Automerge,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -233,7 +234,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Queues}-${node.id}`,
+                        id: Devtools.Echo.Queues,
                         data: Devtools.Echo.Queues,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -242,7 +243,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Members}-${node.id}`,
+                        id: Devtools.Echo.Members,
                         data: Devtools.Echo.Members,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -251,7 +252,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Echo.Metadata}-${node.id}`,
+                        id: Devtools.Echo.Metadata,
                         data: Devtools.Echo.Metadata,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -262,7 +263,7 @@ export default Capability.makeModule(
                     ],
                   },
                   {
-                    id: `${Devtools.Mesh.id}-${node.id}`,
+                    id: Devtools.Mesh.id,
                     data: null,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -271,7 +272,7 @@ export default Capability.makeModule(
                     },
                     nodes: [
                       {
-                        id: `${Devtools.Mesh.Signal}-${node.id}`,
+                        id: Devtools.Mesh.Signal,
                         data: Devtools.Mesh.Signal,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -280,7 +281,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Mesh.Swarm}-${node.id}`,
+                        id: Devtools.Mesh.Swarm,
                         data: Devtools.Mesh.Swarm,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -289,7 +290,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Mesh.Network}-${node.id}`,
+                        id: Devtools.Mesh.Network,
                         data: Devtools.Mesh.Network,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -299,29 +300,8 @@ export default Capability.makeModule(
                       },
                     ],
                   },
-                  // TODO(wittjosiah): Remove?
-                  // {
-                  //   id: `${prefix}-${Devtools.Agent.id}`,
-                  //   data: null,
-                  //   type: DEVTOOLS_TYPE,
-                  //   properties: {
-                  //     label: ['agent label', { ns: meta.id }],
-                  //     icon: 'ph--robot--regular',
-                  //   },
-                  //   nodes: [
-                  //     {
-                  //       id: `${prefix}-${Devtools.Agent.Dashboard}`,
-                  //       data: Devtools.Agent.Dashboard,
-                  //       type: DEVTOOLS_TYPE,
-                  //       properties: {
-                  //         label: ['dashboard label', { ns: meta.id }],
-                  //         icon: 'ph--computer-tower--regular',
-                  //       },
-                  //     },
-                  //   ],
-                  // },
                   {
-                    id: `${Devtools.Edge.id}-${node.id}`,
+                    id: Devtools.Edge.id,
                     data: null,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -330,7 +310,7 @@ export default Capability.makeModule(
                     },
                     nodes: [
                       {
-                        id: `${Devtools.Edge.Dashboard}-${node.id}`,
+                        id: Devtools.Edge.Dashboard,
                         data: Devtools.Edge.Dashboard,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -339,7 +319,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Edge.Workflows}-${node.id}`,
+                        id: Devtools.Edge.Workflows,
                         data: Devtools.Edge.Workflows,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -348,7 +328,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Edge.Traces}-${node.id}`,
+                        id: Devtools.Edge.Traces,
                         data: Devtools.Edge.Traces,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -357,7 +337,7 @@ export default Capability.makeModule(
                         },
                       },
                       {
-                        id: `${Devtools.Edge.Testing}-${node.id}`,
+                        id: Devtools.Edge.Testing,
                         data: Devtools.Edge.Testing,
                         type: DEVTOOLS_TYPE,
                         properties: {
@@ -375,12 +355,12 @@ export default Capability.makeModule(
 
       // Debug object companion.
       GraphBuilder.createExtension({
-        id: `${meta.id}/debug-object`,
+        id: `${meta.id}.debug-object`,
         match: NodeMatcher.whenEchoObject,
-        connector: (node) =>
+        connector: () =>
           Effect.succeed([
             {
-              id: [node.id, 'debug'].join(ATTENDABLE_PATH_SEPARATOR),
+              id: 'debug',
               type: PLANK_COMPANION_TYPE,
               data: 'debug',
               properties: {
@@ -395,14 +375,14 @@ export default Capability.makeModule(
 
       // Devtools deck companion.
       GraphBuilder.createExtension({
-        id: `${meta.id}/devtools-overview`,
+        id: `${meta.id}.devtools-overview`,
         match: NodeMatcher.whenRoot,
-        connector: (node) =>
+        connector: () =>
           Effect.succeed([
             {
-              id: [node.id, 'devtools'].join(ATTENDABLE_PATH_SEPARATOR),
+              id: 'devtools',
               type: DECK_COMPANION_TYPE,
-              data: null,
+              data: 'devtools' as const,
               properties: {
                 label: ['devtools overview label', { ns: meta.id }],
                 icon: 'ph--equalizer--regular',
@@ -412,8 +392,28 @@ export default Capability.makeModule(
             },
           ]),
       }),
+
+      // Object explorer.
+      GraphBuilder.createExtension({
+        id: `${meta.id}.space-objects`,
+        match: NodeMatcher.whenRoot,
+        connector: () =>
+          Effect.succeed([
+            {
+              id: 'space-objects',
+              type: DECK_COMPANION_TYPE,
+              data: 'space-objects' as const,
+              properties: {
+                label: ['space objects label', { ns: meta.id }],
+                icon: 'ph--cube--regular',
+                disposition: 'hidden',
+                position: 'fallback',
+              },
+            },
+          ]),
+      }),
     ]);
 
-    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>,
     }),