@dxos/plugin-debug 0.8.1 → 0.8.2-main.2f9c567

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

@@ -3,10 +3,11 @@
 //
 
 import { contributes, Capabilities, type PluginsContext } from '@dxos/app-framework';
-import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { createExtension, toSignal, type Node } from '@dxos/plugin-graph';
-import { CollectionType } from '@dxos/plugin-space/types';
-import { isEchoObject, isSpace, type ReactiveEchoObject, SpaceState, type Space } from '@dxos/react-client/echo';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { createExtension, type Node } from '@dxos/plugin-graph';
+import { SPACE_PLUGIN } from '@dxos/plugin-space';
+import { isEchoObject, type AnyLiveObject, parseId } from '@dxos/react-client/echo';
 
 import { DEBUG_PLUGIN } from '../meta';
 import { Devtools } from '../types';
@@ -18,43 +19,31 @@ export default (context: PluginsContext) =>
     // Devtools node.
     createExtension({
       id: 'dxos.org/plugin/debug/devtools',
-      filter: (node): node is Node<null | Space> => node.id === 'root' || isSpace(node.data),
+      filter: (node): node is Node<null> => node.id === 'root' || node.type === `${SPACE_PLUGIN}/settings`,
       connector: ({ node }) => {
-        const space = node.data;
-        const state = toSignal(
-          (onChange) => space?.state.subscribe(() => onChange()).unsubscribe ?? (() => {}),
-          () => space?.state.get(),
-          space?.id,
-        );
-        if (node.id !== 'root' && state !== SpaceState.SPACE_READY) {
-          return;
-        }
-
-        // Not adding the debug node until the root collection is available aligns the behaviour of this
-        // extension with that of the space plugin adding objects. This ensures that the debug node is added at
-        // the same time as objects and prevents order from changing as the nodes are added.
-        const collection = space?.properties[CollectionType.typename]?.target as CollectionType | undefined;
-        if (node.id !== 'root' && !collection) {
-          return;
-        }
+        const layout = context.requestCapability(Capabilities.Layout);
+        const client = context.requestCapability(ClientCapabilities.Client);
+        const { spaceId } = parseId(layout.workspace);
+        const space = spaceId && client.spaces.get(spaceId);
 
         return [
           {
-            id: `${node.id}-${Devtools.id}`,
+            id: `${Devtools.id}-${node.id}`,
             data: null,
             type: DEVTOOLS_TYPE,
             properties: {
               label: ['devtools label', { ns: DEBUG_PLUGIN }],
-              disposition: 'workspace',
               icon: 'ph--hammer--regular',
+              disposition: 'workspace',
+              position: 'fallback',
             },
             nodes: [
-              ...(isSpace(node.data)
+              ...(space
                 ? [
                     {
-                      id: `${node.data.id}-debug`,
+                      id: `debug-${node.id}`,
                       type: 'dxos.org/plugin/debug/space',
-                      data: { space: node.data, type: 'dxos.org/plugin/debug/space' },
+                      data: { space, type: 'dxos.org/plugin/debug/space' },
                       properties: {
                         label: ['debug label', { ns: DEBUG_PLUGIN }],
                         icon: 'ph--bug--regular',
@@ -63,7 +52,7 @@ export default (context: PluginsContext) =>
                   ]
                 : []),
               {
-                id: `${node.id}-${Devtools.Client.id}`,
+                id: `${Devtools.Client.id}-${node.id}`,
                 data: null,
                 type: DEVTOOLS_TYPE,
                 properties: {
@@ -72,7 +61,7 @@ export default (context: PluginsContext) =>
                 },
                 nodes: [
                   {
-                    id: `${node.id}-${Devtools.Client.Config}`,
+                    id: `${Devtools.Client.Config}-${node.id}`,
                     data: Devtools.Client.Config,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -81,7 +70,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Client.Storage}`,
+                    id: `${Devtools.Client.Storage}-${node.id}`,
                     data: Devtools.Client.Storage,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -90,7 +79,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Client.Logs}`,
+                    id: `${Devtools.Client.Logs}-${node.id}`,
                     data: Devtools.Client.Logs,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -99,7 +88,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Client.Diagnostics}`,
+                    id: `${Devtools.Client.Diagnostics}-${node.id}`,
                     data: Devtools.Client.Diagnostics,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -108,7 +97,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Client.Tracing}`,
+                    id: `${Devtools.Client.Tracing}-${node.id}`,
                     data: Devtools.Client.Tracing,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -119,7 +108,7 @@ export default (context: PluginsContext) =>
                 ],
               },
               {
-                id: `${node.id}-${Devtools.Halo.id}`,
+                id: `${Devtools.Halo.id}-${node.id}`,
                 data: null,
                 type: DEVTOOLS_TYPE,
                 properties: {
@@ -128,7 +117,7 @@ export default (context: PluginsContext) =>
                 },
                 nodes: [
                   {
-                    id: `${node.id}-${Devtools.Halo.Identity}`,
+                    id: `${Devtools.Halo.Identity}-${node.id}`,
                     data: Devtools.Halo.Identity,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -137,7 +126,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Halo.Devices}`,
+                    id: `${Devtools.Halo.Devices}-${node.id}`,
                     data: Devtools.Halo.Devices,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -146,7 +135,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Halo.Keyring}`,
+                    id: `${Devtools.Halo.Keyring}-${node.id}`,
                     data: Devtools.Halo.Keyring,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -155,7 +144,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Halo.Credentials}`,
+                    id: `${Devtools.Halo.Credentials}-${node.id}`,
                     data: Devtools.Halo.Credentials,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -166,7 +155,7 @@ export default (context: PluginsContext) =>
                 ],
               },
               {
-                id: `${node.id}-${Devtools.Echo.id}`,
+                id: `${Devtools.Echo.id}-${node.id}`,
                 data: null,
                 type: DEVTOOLS_TYPE,
                 properties: {
@@ -175,7 +164,7 @@ export default (context: PluginsContext) =>
                 },
                 nodes: [
                   {
-                    id: `${node.id}-${Devtools.Echo.Spaces}`,
+                    id: `${Devtools.Echo.Spaces}-${node.id}`,
                     data: Devtools.Echo.Spaces,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -184,7 +173,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Echo.Space}`,
+                    id: `${Devtools.Echo.Space}-${node.id}`,
                     data: Devtools.Echo.Space,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -193,7 +182,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Echo.Feeds}`,
+                    id: `${Devtools.Echo.Feeds}-${node.id}`,
                     data: Devtools.Echo.Feeds,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -202,16 +191,25 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Echo.Objects}`,
+                    id: `${Devtools.Echo.Objects}-${node.id}`,
                     data: Devtools.Echo.Objects,
                     type: DEVTOOLS_TYPE,
                     properties: {
                       label: ['objects label', { ns: DEBUG_PLUGIN }],
+                      icon: 'ph--cube--regular',
+                    },
+                  },
+                  {
+                    id: `${Devtools.Echo.Schema}-${node.id}`,
+                    data: Devtools.Echo.Schema,
+                    type: DEVTOOLS_TYPE,
+                    properties: {
+                      label: ['schema label', { ns: DEBUG_PLUGIN }],
                       icon: 'ph--database--regular',
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Echo.Automerge}`,
+                    id: `${Devtools.Echo.Automerge}-${node.id}`,
                     data: Devtools.Echo.Automerge,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -220,7 +218,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Echo.Queues}`,
+                    id: `${Devtools.Echo.Queues}-${node.id}`,
                     data: Devtools.Echo.Queues,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -229,7 +227,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Echo.Members}`,
+                    id: `${Devtools.Echo.Members}-${node.id}`,
                     data: Devtools.Echo.Members,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -238,7 +236,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Echo.Metadata}`,
+                    id: `${Devtools.Echo.Metadata}-${node.id}`,
                     data: Devtools.Echo.Metadata,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -249,7 +247,7 @@ export default (context: PluginsContext) =>
                 ],
               },
               {
-                id: `${node.id}-${Devtools.Mesh.id}`,
+                id: `${Devtools.Mesh.id}-${node.id}`,
                 data: null,
                 type: DEVTOOLS_TYPE,
                 properties: {
@@ -258,7 +256,7 @@ export default (context: PluginsContext) =>
                 },
                 nodes: [
                   {
-                    id: `${node.id}-${Devtools.Mesh.Signal}`,
+                    id: `${Devtools.Mesh.Signal}-${node.id}`,
                     data: Devtools.Mesh.Signal,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -267,7 +265,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Mesh.Swarm}`,
+                    id: `${Devtools.Mesh.Swarm}-${node.id}`,
                     data: Devtools.Mesh.Swarm,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -276,7 +274,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Mesh.Network}`,
+                    id: `${Devtools.Mesh.Network}-${node.id}`,
                     data: Devtools.Mesh.Network,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -288,7 +286,7 @@ export default (context: PluginsContext) =>
               },
               // TODO(wittjosiah): Remove?
               // {
-              //   id: `${node.id}-${Devtools.Agent.id}`,
+              //   id: `${prefix}-${Devtools.Agent.id}`,
               //   data: null,
               //   type: DEVTOOLS_TYPE,
               //   properties: {
@@ -297,7 +295,7 @@ export default (context: PluginsContext) =>
               //   },
               //   nodes: [
               //     {
-              //       id: `${node.id}-${Devtools.Agent.Dashboard}`,
+              //       id: `${prefix}-${Devtools.Agent.Dashboard}`,
               //       data: Devtools.Agent.Dashboard,
               //       type: DEVTOOLS_TYPE,
               //       properties: {
@@ -308,7 +306,7 @@ export default (context: PluginsContext) =>
               //   ],
               // },
               {
-                id: `${node.id}-${Devtools.Edge.id}`,
+                id: `${Devtools.Edge.id}-${node.id}`,
                 data: null,
                 type: DEVTOOLS_TYPE,
                 properties: {
@@ -317,7 +315,7 @@ export default (context: PluginsContext) =>
                 },
                 nodes: [
                   {
-                    id: `${node.id}-${Devtools.Edge.Dashboard}`,
+                    id: `${Devtools.Edge.Dashboard}-${node.id}`,
                     data: Devtools.Edge.Dashboard,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -326,7 +324,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Edge.Workflows}`,
+                    id: `${Devtools.Edge.Workflows}-${node.id}`,
                     data: Devtools.Edge.Workflows,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -335,7 +333,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Edge.Traces}`,
+                    id: `${Devtools.Edge.Traces}-${node.id}`,
                     data: Devtools.Edge.Traces,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -344,7 +342,7 @@ export default (context: PluginsContext) =>
                     },
                   },
                   {
-                    id: `${node.id}-${Devtools.Edge.Testing}`,
+                    id: `${Devtools.Edge.Testing}-${node.id}`,
                     data: Devtools.Edge.Testing,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -395,7 +393,7 @@ export default (context: PluginsContext) =>
     // Debug object companion.
     createExtension({
       id: `${DEBUG_PLUGIN}/debug-object`,
-      filter: (node): node is Node<ReactiveEchoObject<any>> => isEchoObject(node.data),
+      filter: (node): node is Node<AnyLiveObject<any>> => isEchoObject(node.data),
       connector: ({ node }) => [
         {
           id: [node.id, 'debug'].join(ATTENDABLE_PATH_SEPARATOR),
@@ -410,4 +408,23 @@ export default (context: PluginsContext) =>
         },
       ],
     }),
+
+    // Devtools deck companion.
+    createExtension({
+      id: `${DEBUG_PLUGIN}/devtools-overview`,
+      filter: (node): node is Node<null> => node.id === 'root',
+      connector: ({ node }) => [
+        {
+          id: [node.id, 'devtools'].join(ATTENDABLE_PATH_SEPARATOR),
+          type: DECK_COMPANION_TYPE,
+          data: null,
+          properties: {
+            label: ['devtools overview label', { ns: DEBUG_PLUGIN }],
+            icon: 'ph--hammer--regular',
+            disposition: 'hidden',
+            position: 'fallback',
+          },
+        },
+      ],
+    }),
   ]);

package/src/capabilities/react-surface.tsx

@@ -16,30 +16,31 @@ import {
   type PluginsContext,
 } from '@dxos/app-framework';
 import {
+  AutomergePanel,
   ConfigPanel,
   CredentialsPanel,
   DeviceListPanel,
   DiagnosticsPanel,
+  EdgeDashboardPanel,
   FeedsPanel,
   IdentityPanel,
+  InvocationTracePanel,
   KeyringPanel,
   LoggingPanel,
   MembersPanel,
   MetadataPanel,
   NetworkPanel,
   ObjectsPanel,
+  QueuesPanel,
+  SchemaPanel,
   SignalPanel,
   SpaceInfoPanel,
   SpaceListPanel,
   StoragePanel,
   SwarmPanel,
+  TestingPanel,
   TracingPanel,
-  EdgeDashboardPanel,
-  AutomergePanel,
   WorkflowPanel,
-  QueuesPanel,
-  InvocationTracePanel,
-  TestingPanel,
 } from '@dxos/devtools';
 import { SettingsStore } from '@dxos/local-storage';
 import { log } from '@dxos/log';
@@ -51,13 +52,21 @@ import {
   SpaceState,
   isSpace,
   isEchoObject,
-  type ReactiveEchoObject,
-  type ReactiveObject,
+  type AnyLiveObject,
+  type Live,
   type Space,
   parseId,
 } from '@dxos/react-client/echo';
 
-import { DebugApp, DebugObjectPanel, DebugSettings, DebugStatus, SpaceGenerator, Wireframe } from '../components';
+import {
+  DebugApp,
+  DebugObjectPanel,
+  DebugSettings,
+  DebugStatus,
+  DevtoolsOverviewContainer,
+  SpaceGenerator,
+  Wireframe,
+} from '../components';
 import { DEBUG_PLUGIN } from '../meta';
 import { type DebugSettingsProps, Devtools } from '../types';
 
@@ -97,7 +106,7 @@ export default (context: PluginsContext) =>
       filter: (data): data is { subject: SpaceDebug } => isSpaceDebug(data.subject),
       component: ({ data }) => {
         const handleCreateObject = useCallback(
-          (objects: ReactiveObject<any>[]) => {
+          (objects: Live<any>[]) => {
             if (!isSpace(data.subject.space)) {
               return;
             }
@@ -130,7 +139,7 @@ export default (context: PluginsContext) =>
       id: `${DEBUG_PLUGIN}/wireframe`,
       role: ['article', 'section'],
       position: 'hoist',
-      filter: (data): data is { subject: ReactiveEchoObject<any> } => {
+      filter: (data): data is { subject: AnyLiveObject<any> } => {
         const settings = context
           .requestCapability(Capabilities.SettingsStore)
           .getStore<DebugSettingsProps>(DEBUG_PLUGIN)!.value;
@@ -143,10 +152,15 @@ export default (context: PluginsContext) =>
     createSurface({
       id: `${DEBUG_PLUGIN}/object-debug`,
       role: 'article',
-      filter: (data): data is { companionTo: ReactiveEchoObject<any> } =>
+      filter: (data): data is { companionTo: AnyLiveObject<any> } =>
         data.subject === 'debug' && isEchoObject(data.companionTo),
       component: ({ data }) => <DebugObjectPanel object={data.companionTo} />,
     }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/devtools-overview`,
+      role: 'deck-companion--devtools',
+      component: () => <DevtoolsOverviewContainer />,
+    }),
     createSurface({
       id: `${DEBUG_PLUGIN}/status`,
       role: 'status',
@@ -259,6 +273,15 @@ export default (context: PluginsContext) =>
         return <ObjectsPanel space={space} />;
       },
     }),
+    createSurface({
+      id: `${DEBUG_PLUGIN}/echo/schema`,
+      role: 'article',
+      filter: (data): data is any => data.subject === Devtools.Echo.Schema,
+      component: () => {
+        const space = useCurrentSpace();
+        return <SchemaPanel space={space} />;
+      },
+    }),
     createSurface({
       id: `${DEBUG_PLUGIN}/echo/automerge`,
       role: 'article',

package/src/capabilities/settings.ts

@@ -3,13 +3,13 @@
 //
 
 import { Capabilities, contributes } from '@dxos/app-framework';
-import { create } from '@dxos/react-client/echo';
+import { live } from '@dxos/react-client/echo';
 
 import { DEBUG_PLUGIN } from '../meta';
 import { type DebugSettingsProps, DebugSettingsSchema } from '../types';
 
 export default () => {
-  const settings = create<DebugSettingsProps>({});
+  const settings = live<DebugSettingsProps>({});
 
   return contributes(Capabilities.Settings, { schema: DebugSettingsSchema, prefix: DEBUG_PLUGIN, value: settings });
 };

package/src/components/DebugObjectPanel.tsx

@@ -4,12 +4,12 @@
 
 import React from 'react';
 
-import { type ReactiveEchoObject } from '@dxos/client/echo';
+import { type AnyLiveObject } from '@dxos/client/echo';
 import { Clipboard, Input } from '@dxos/react-ui';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 
 export type DebugObjectPanelProps = {
-  object: ReactiveEchoObject<any>;
+  object: AnyLiveObject<any>;
 };
 
 // TODO(burdon): Get schema and traverse references.

package/src/components/DebugStatus.tsx

@@ -6,12 +6,11 @@ import React, { useEffect, useRef, useState } from 'react';
 
 import { useAppGraph, useLayout } from '@dxos/app-framework';
 import { TimeoutError } from '@dxos/async';
-import { StatsPanel, useStats } from '@dxos/devtools';
 import { getActiveSpace } from '@dxos/plugin-space';
 import { StatusBar } from '@dxos/plugin-status-bar';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { useNetworkStatus } from '@dxos/react-client/mesh';
-import { Icon, Popover } from '@dxos/react-ui';
+import { Icon } from '@dxos/react-ui';
 
 const styles = {
   success: 'text-sky-300 dark:text-green-700',
@@ -180,28 +179,7 @@ const SavingIndicator = () => {
   }
 };
 
-const PerformanceIndicator = () => {
-  const [visible, setVisible] = useState(false);
-  const [stats, refreshStats] = useStats();
-
-  return (
-    <Popover.Root open={visible} onOpenChange={setVisible}>
-      <Popover.Trigger asChild>
-        <StatusBar.Button onClick={() => setVisible((visible) => !visible)} title='Performance panels'>
-          <Icon icon='ph--chart-bar--regular' size={4} />
-        </StatusBar.Button>
-      </Popover.Trigger>
-      <Popover.Portal>
-        <Popover.Content classNames='max-is-[min(var(--radix-popover-content-available-width),300px)] max-bs-[--radix-popover-content-available-height]'>
-          <StatsPanel stats={stats} onRefresh={refreshStats} />
-          <Popover.Arrow />
-        </Popover.Content>
-      </Popover.Portal>
-    </Popover.Root>
-  );
-};
-
-const indicators = [SavingIndicator, SwarmIndicator, PerformanceIndicator, ErrorIndicator];
+const indicators = [SavingIndicator, SwarmIndicator, ErrorIndicator];
 
 export const DebugStatus = () => {
   return (

package/src/components/DevtoolsOverviewContainer.tsx

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { Surface } from '@dxos/app-framework';
+import { StatsPanel, useStats } from '@dxos/devtools';
+
+export const DevtoolsOverviewContainer = () => {
+  const [stats, refreshStats] = useStats();
+
+  return (
+    <StatsPanel stats={stats} onRefresh={refreshStats}>
+      <Surface role='devtools-overview' />
+    </StatsPanel>
+  );
+};
+
+export default DevtoolsOverviewContainer;

package/src/components/SpaceGenerator/ObjectGenerator.tsx

@@ -6,7 +6,7 @@ import { addressToA1Notation } from '@dxos/compute';
 import { ComputeGraph, ComputeGraphModel, DEFAULT_OUTPUT, NODE_INPUT, NODE_OUTPUT } from '@dxos/conductor';
 import { ObjectId, type BaseObject, type TypedObject } from '@dxos/echo-schema';
 import { DXN } from '@dxos/keys';
-import { create, makeRef, type ReactiveObject } from '@dxos/live-object';
+import { live, makeRef, type Live } from '@dxos/live-object';
 import { DocumentType } from '@dxos/plugin-markdown/types';
 import { createSheet } from '@dxos/plugin-sheet/types';
 import { SheetType, type CellValue } from '@dxos/plugin-sheet/types';
@@ -14,7 +14,7 @@ import { CanvasType, DiagramType } from '@dxos/plugin-sketch/types';
 import { faker } from '@dxos/random';
 import { Filter, type Space } from '@dxos/react-client/echo';
 import { TableType } from '@dxos/react-ui-table';
-import { createView, TextType } from '@dxos/schema';
+import { createView, DataType } from '@dxos/schema';
 import { createAsyncGenerator, type ValueGenerator } from '@dxos/schema/testing';
 import { range } from '@dxos/util';
 
@@ -31,8 +31,8 @@ const generator: ValueGenerator = faker as any;
 export type ObjectGenerator<T extends BaseObject> = (
   space: Space,
   n: number,
-  cb?: (objects: ReactiveObject<any>[]) => void,
-) => Promise<ReactiveObject<T>[]>;
+  cb?: (objects: Live<any>[]) => void,
+) => Promise<Live<T>[]>;
 
 export const staticGenerators = new Map<string, ObjectGenerator<any>>([
   [
@@ -40,9 +40,9 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
     async (space, n, cb) => {
       const objects = range(n).map(() => {
         return space.db.add(
-          create(DocumentType, {
+          live(DocumentType, {
             name: faker.commerce.productName(),
-            content: makeRef(create(TextType, { content: faker.lorem.sentences(5) })),
+            content: makeRef(live(DataType.Text, { content: faker.lorem.sentences(5) })),
             threads: [],
           }),
         );
@@ -58,9 +58,9 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
       const objects = range(n).map(() => {
         // TODO(burdon): Generate diagram.
         const obj = space.db.add(
-          create(DiagramType, {
+          live(DiagramType, {
             name: faker.commerce.productName(),
-            canvas: makeRef(create(CanvasType, { content: {} })),
+            canvas: makeRef(live(CanvasType, { content: {} })),
           }),
         );
 
@@ -139,11 +139,7 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
 ]);
 
 export const createGenerator = <T extends BaseObject>(type: TypedObject<T>): ObjectGenerator<T> => {
-  return async (
-    space: Space,
-    n: number,
-    cb?: (objects: ReactiveObject<any>[]) => void,
-  ): Promise<ReactiveObject<T>[]> => {
+  return async (space: Space, n: number, cb?: (objects: Live<any>[]) => void): Promise<Live<T>[]> => {
     // Find or create mutable schema.
     const schema =
       (await space.db.schemaRegistry.query({ typename: type.typename }).firstOrUndefined()) ??
@@ -159,7 +155,7 @@ export const createGenerator = <T extends BaseObject>(type: TypedObject<T>): Obj
     if (!table) {
       const name = type.typename.split('/').pop() ?? type.typename;
       const view = createView({ name, typename: type.typename, jsonSchema: schema.jsonSchema });
-      const table = space.db.add(create(TableType, { name, view: makeRef(view) }));
+      const table = space.db.add(live(TableType, { name, view: makeRef(view) }));
       cb?.([table]);
     }