@dxos/plugin-debug 0.8.4-main.3fbcb4aa9b → 0.8.4-main.4668b7de9b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-debug",
-  "version": "0.8.4-main.3fbcb4aa9b",
+  "version": "0.8.4-main.4668b7de9b",
   "description": "DXOS Surface plugin for testing.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
@@ -35,10 +35,12 @@
     },
     "#plugin": {
       "source": {
+        "workerd": "./src/DebugPlugin.workerd.ts",
         "node": "./src/DebugPlugin.node.ts",
         "default": "./src/DebugPlugin.tsx"
       },
       "types": "./dist/types/src/DebugPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/DebugPlugin.workerd.mjs",
       "node": "./dist/lib/neutral/DebugPlugin.node.mjs",
       "default": "./dist/lib/neutral/DebugPlugin.mjs"
     },
@@ -59,6 +61,7 @@
       "types": "./dist/types/src/index.d.ts",
       "default": "./dist/lib/neutral/index.mjs"
     },
+    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
     "./plugin": {
       "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
@@ -73,69 +76,56 @@
   "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
-    "src"
+    "src",
+    "PLUGIN.mdl"
   ],
   "dependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
-    "@automerge/automerge": "3.2.6",
-    "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
     "@tldraw/tldraw": "^3.0.0",
-    "date-fns": "^3.6.0",
-    "react-json-tree": "^0.18.0",
     "react-resize-detector": "^11.0.1",
-    "workerize-loader": "^2.0.2",
-    "@dxos/app-framework": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/client-services": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/app-toolkit": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/conductor": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/compute-hyperformula": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/context": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/config": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/devtools": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-pipeline": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/echo-generator": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/invariant": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/effect": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/keys": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/assistant-toolkit": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/log-store-idb": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/operation": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-deck": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-graph": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-markdown": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-inbox": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-sketch": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-meeting": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-space": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-script": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-status-bar": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-theme": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-table": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/protocols": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-client": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-hooks": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/plugin-sheet": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-attention": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-introspect": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-form": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-stack": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-table": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui-mosaic": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/schema": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/types": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/util": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/tracing": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/app-toolkit": "0.8.4-main.4668b7de9b",
+    "@dxos/app-framework": "0.8.4-main.4668b7de9b",
+    "@dxos/async": "0.8.4-main.4668b7de9b",
+    "@dxos/client-services": "0.8.4-main.4668b7de9b",
+    "@dxos/compute": "0.8.4-main.4668b7de9b",
+    "@dxos/compute-hyperformula": "0.8.4-main.4668b7de9b",
+    "@dxos/config": "0.8.4-main.4668b7de9b",
+    "@dxos/conductor": "0.8.4-main.4668b7de9b",
+    "@dxos/devtools": "0.8.4-main.4668b7de9b",
+    "@dxos/echo": "0.8.4-main.4668b7de9b",
+    "@dxos/echo-pipeline": "0.8.4-main.4668b7de9b",
+    "@dxos/effect": "0.8.4-main.4668b7de9b",
+    "@dxos/invariant": "0.8.4-main.4668b7de9b",
+    "@dxos/keys": "0.8.4-main.4668b7de9b",
+    "@dxos/log-store-idb": "0.8.4-main.4668b7de9b",
+    "@dxos/log": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-client": "0.8.4-main.4668b7de9b",
+    "@dxos/operation": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-graph": "0.8.4-main.4668b7de9b",
+    "@dxos/assistant-toolkit": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-markdown": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-inbox": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-sketch": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-sheet": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-space": "0.8.4-main.4668b7de9b",
+    "@dxos/protocols": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-status-bar": "0.8.4-main.4668b7de9b",
+    "@dxos/random": "0.8.4-main.4668b7de9b",
+    "@dxos/react-client": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-attention": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-script": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-form": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-introspect": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-table": "0.8.4-main.4668b7de9b",
+    "@dxos/schema": "0.8.4-main.4668b7de9b",
+    "@dxos/tracing": "0.8.4-main.4668b7de9b",
+    "@dxos/types": "0.8.4-main.4668b7de9b",
+    "@dxos/util": "0.8.4-main.4668b7de9b"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -145,11 +135,11 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/plugin-testing": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
+    "vite": "^8.0.14",
+    "@dxos/plugin-testing": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui": "0.8.4-main.4668b7de9b",
+    "@dxos/storybook-utils": "0.8.4-main.4668b7de9b",
+    "@dxos/ui-theme": "0.8.4-main.4668b7de9b"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -157,9 +147,9 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b",
-    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b"
+    "@dxos/ui-theme": "0.8.4-main.4668b7de9b",
+    "@dxos/random": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui": "0.8.4-main.4668b7de9b"
   },
   "publishConfig": {
     "access": "public"

package/src/DebugPlugin.tsx

@@ -13,6 +13,9 @@ 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';
+
 // TODO(wittjosiah): Factor out DevtoolsPlugin?
 
 export const DebugPlugin = Plugin.define<DebugPluginOptions>(meta).pipe(
@@ -30,6 +33,9 @@ export const DebugPlugin = Plugin.define<DebugPluginOptions>(meta).pipe(
     activatesOn: ActivationEvents.Startup,
     activate: () => Effect.sync(() => setupDevtools()),
   }),
+  AppPlugin.addPluginAssetModule({
+    asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+  }),
   Plugin.make,
 );
 

package/src/DebugPlugin.workerd.ts

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

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

@@ -19,6 +19,25 @@ const DEVTOOLS_TYPE = `${meta.id}.devtools`;
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* Effect.all([
+      GraphBuilder.createExtension({
+        id: 'root',
+        match: NodeMatcher.whenRoot,
+        actions: () =>
+          Effect.succeed([
+            Node.makeAction({
+              id: 'resetData',
+              data: () =>
+                Effect.sync(() => {
+                  window.location.href = '/reset.html#continue';
+                }),
+              properties: {
+                label: ['reset-data.label', { ns: meta.id }],
+                icon: 'ph--warning--regular',
+              },
+            }),
+          ]),
+      }),
+
       GraphBuilder.createExtension({
         id: 'devtools',
         match: NodeMatcher.whenAny(NodeMatcher.whenRoot, NodeMatcher.whenNodeType(SPACE_TYPE)),
@@ -40,11 +59,11 @@ export default Capability.makeModule(
                   label: ['devtools.label', { ns: meta.id }],
                   icon: 'ph--hammer--regular',
                   disposition: 'pin-end',
-                  position: 'fallback',
+                  position: 'last',
                 },
                 nodes: [
                   Node.make({
-                    id: 'app-graph',
+                    id: 'appGraph',
                     type: `${meta.id}.app-graph`,
                     data: { graph: graph?.graph, root: node.id === Node.RootId ? node.id : getParentId(node.id) },
                     properties: {
@@ -53,7 +72,7 @@ export default Capability.makeModule(
                     },
                   }),
                   Node.make({
-                    id: 'tools-explorer',
+                    id: 'toolsExplorer',
                     data: Devtools.ToolsExplorer,
                     type: DEVTOOLS_TYPE,
                     properties: {
@@ -222,6 +241,15 @@ export default Capability.makeModule(
                           icon: 'ph--database--regular',
                         },
                       }),
+                      Node.make({
+                        id: Devtools.Echo.Registry,
+                        data: Devtools.Echo.Registry,
+                        type: DEVTOOLS_TYPE,
+                        properties: {
+                          label: ['registry.label', { ns: meta.id }],
+                          icon: 'ph--books--regular',
+                        },
+                      }),
                       Node.make({
                         id: Devtools.Echo.Automerge,
                         data: Devtools.Echo.Automerge,
@@ -353,7 +381,7 @@ export default Capability.makeModule(
 
       // Debug object companion.
       GraphBuilder.createExtension({
-        id: 'debug-object',
+        id: 'debugObject',
         match: NodeMatcher.whenEchoObject,
         connector: () =>
           Effect.succeed([
@@ -362,14 +390,14 @@ export default Capability.makeModule(
               label: ['debug.label', { ns: meta.id }],
               icon: 'ph--bug--regular',
               data: 'debug',
-              position: 'fallback',
+              position: 'last',
             }),
           ]),
       }),
 
       // Devtools deck companion.
       GraphBuilder.createExtension({
-        id: 'devtools-overview',
+        id: 'devtoolsOverview',
         match: NodeMatcher.whenRoot,
         connector: () =>
           Effect.succeed([
@@ -378,23 +406,23 @@ export default Capability.makeModule(
               label: ['devtools-overview.label', { ns: meta.id }],
               icon: 'ph--equalizer--regular',
               data: 'devtools' as const,
-              position: 'fallback',
+              position: 'last',
             }),
           ]),
       }),
 
       // Object explorer.
       GraphBuilder.createExtension({
-        id: 'space-objects',
+        id: 'spaceObjects',
         match: NodeMatcher.whenRoot,
         connector: () =>
           Effect.succeed([
             AppNode.makeDeckCompanion({
-              id: 'space-objects',
+              id: 'spaceObjects',
               label: ['space-objects.label', { ns: meta.id }],
               icon: 'ph--cube--regular',
               data: 'space-objects' as const,
-              position: 'fallback',
+              position: 'last',
             }),
           ]),
       }),

package/src/capabilities/react-surface.tsx

@@ -3,11 +3,12 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 import React, { useCallback } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useOperationInvoker, useSettingsState } from '@dxos/app-framework/ui';
-import { AppCapabilities, LayoutOperation, getObjectPathFromObject } from '@dxos/app-toolkit';
+import { AppCapabilities, LayoutOperation, RootCollectionAnnotation, getObjectPathFromObject } from '@dxos/app-toolkit';
 import { AppSurface, useActiveSpace } from '@dxos/app-toolkit/ui';
 import {
   AutomergePanel,
@@ -35,8 +36,7 @@ import {
   TestingPanel,
   WorkflowPanel,
 } from '@dxos/devtools';
-import { Feed, Obj } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
+import { Annotation, Collection, Feed, Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { type IdbLogStore } from '@dxos/log-store-idb';
 import { type Graph } from '@dxos/plugin-graph';
@@ -52,6 +52,7 @@ import {
   DebugSpaceObjectsPanel,
   DebugStatus,
   DevtoolsOverviewContainer,
+  RegistryPanel,
   SpaceGenerator,
   Wireframe,
 } from '#containers';
@@ -92,7 +93,7 @@ export default Capability.makeModule(
 
     return Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: 'plugin-settings',
+        id: 'pluginSettings',
         filter: AppSurface.settings(AppSurface.Article, meta.id),
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
@@ -121,7 +122,8 @@ export default Capability.makeModule(
 
               const collection =
                 data.subject.space.state.get() === SpaceState.SPACE_READY &&
-                data.subject.space.properties[Collection.Collection.typename]?.target;
+                Annotation.get(data.subject.space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined)
+                  ?.target;
               if (!Obj.instanceOf(Collection.Collection, collection)) {
                 return;
               }
@@ -140,21 +142,26 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: 'app-graph',
+        id: 'appGraph',
         role: 'article',
         filter: (data): data is { subject: GraphDebug } => isGraphDebug(data.subject),
         component: ({ data }) => <DebugGraph graph={data.subject.graph} root={data.subject.root} />,
       }),
       Surface.create({
-        id: 'tools-explorer',
+        id: 'toolsExplorer',
         filter: AppSurface.literal(AppSurface.Article, Devtools.ToolsExplorer),
         component: () => <ToolsExplorer serverUrl={MCP_SERVER_URL} />,
       }),
+      Surface.create({
+        id: 'registry',
+        filter: AppSurface.literal(AppSurface.Article, Devtools.Echo.Registry),
+        component: () => <RegistryPanel />,
+      }),
       Surface.create({
         id: 'wireframe',
         // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
         role: ['article', 'section'],
-        position: 'hoist',
+        position: 'first',
         filter: (data): data is { subject: Obj.Unknown } => {
           const settings = registry.get(settingsAtom);
           return Obj.isObject(data.subject) && !!settings.wireframe;
@@ -164,7 +171,7 @@ export default Capability.makeModule(
         ),
       }),
       Surface.create({
-        id: 'object-debug',
+        id: 'objectDebug',
         filter: AppSurface.allOf(
           AppSurface.literal(AppSurface.Article, 'debug'),
           AppSurface.companion(AppSurface.Article),
@@ -172,12 +179,12 @@ export default Capability.makeModule(
         component: ({ role, data }) => <DebugObjectPanel role={role} companionTo={data.companionTo} />,
       }),
       Surface.create({
-        id: 'devtools-overview',
+        id: 'devtoolsOverview',
         filter: AppSurface.literal(Surface.makeType<{ subject: string }>('deck-companion--devtools'), 'devtools'),
         component: () => <DevtoolsOverviewContainer />,
       }),
       Surface.create({
-        id: 'space-objects',
+        id: 'spaceObjects',
         filter: AppSurface.literal(
           Surface.makeType<{ subject: string }>('deck-companion--space-objects'),
           'space-objects',
@@ -193,9 +200,9 @@ export default Capability.makeModule(
       }),
 
       Surface.create({
-        id: 'status',
+        id: 'debugStatus',
         role: 'status-indicator',
-        position: 'hoist',
+        position: 'first',
         component: () => <DebugStatus />,
       }),
 
@@ -398,8 +405,8 @@ export default Capability.makeModule(
           }
 
           const feed = space.properties.invocationTraceFeed?.target;
-          const queueDxn = feed ? Feed.getQueueDxn(feed) : undefined;
-          return <InvocationTraceContainer db={space.db} queueDxn={queueDxn} detailAxis='block' />;
+          const feedDXN = feed ? Feed.getQueueUri(feed) : undefined;
+          return <InvocationTraceContainer db={space.db} feedDXN={feedDXN} detailAxis='block' />;
         },
       }),
       Surface.create({

package/src/components/DebugSettings/DebugSettings.tsx

@@ -10,7 +10,7 @@ import { type ConfigProto, SaveConfig, Storage, defs } from '@dxos/config';
 import { log } from '@dxos/log';
 import { type IdbLogStore } from '@dxos/log-store-idb';
 import { useClient } from '@dxos/react-client';
-import { Icon, IconButton, Input, Select, Toast, useFileDownload, useTranslation } from '@dxos/react-ui';
+import { IconButton, Input, Select, Toast, useFileDownload, useTranslation } from '@dxos/react-ui';
 import { Settings as SettingsForm } from '@dxos/react-ui-form';
 import { TRACE_ALL_KEY } from '@dxos/tracing';
 import { setDeep } from '@dxos/util';
@@ -209,13 +209,10 @@ export const DebugSettings = ({ settings, onSettingsChange, logStore, onUpload }
         {/* TODO(burdon): Move to layout? */}
         {toast && (
           <Toast.Root>
-            <Toast.Body>
-              <Toast.Title>
-                <Icon icon='ph--gift--duotone' classNames='inline mr-1' />
-                <span>{toast.title}</span>
-              </Toast.Title>
-              {toast.description && <Toast.Description>{toast.description}</Toast.Description>}
-            </Toast.Body>
+            <Toast.Title icon='ph--gift--duotone'>
+              <span>{toast.title}</span>
+            </Toast.Title>
+            {toast.description && <Toast.Description>{toast.description}</Toast.Description>}
           </Toast.Root>
         )}
 

package/src/components/SpaceGenerator/ObjectGenerator.tsx

@@ -2,12 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import type * as Schema from 'effect/Schema';
-
 import { addressToA1Notation } from '@dxos/compute-hyperformula';
 import { ComputeGraph, ComputeGraphModel, DEFAULT_OUTPUT, NODE_INPUT, NODE_OUTPUT } from '@dxos/conductor';
-import { DXN, Filter, Key, type Type } from '@dxos/echo';
-import { View } from '@dxos/echo';
+import { EID, Filter, Key, Type, View } from '@dxos/echo';
 import { OperationInvoker } from '@dxos/operation';
 import { Markdown } from '@dxos/plugin-markdown';
 import { Sheet } from '@dxos/plugin-sheet';
@@ -32,16 +29,21 @@ export const createGenerator = <S extends Type.AnyObj>(
   client: Client,
   invokePromise: OperationInvoker.OperationInvoker['invokePromise'],
   schema: S,
-): ObjectGenerator<Schema.Schema.Type<S>> => {
-  return async (space: Space, n: number): Promise<Schema.Schema.Type<S>[]> => {
-    const typename = schema.typename;
+): ObjectGenerator<Type.InstanceType<S>> => {
+  return async (space: Space, n: number): Promise<Type.InstanceType<S>[]> => {
+    const typename = Type.getTypename(schema);
 
     // Find or create table and view.
     const views = await space.db.query(Filter.type(View.View)).run();
     const view = await findViewByTypename(views, typename);
-    const staticSchema = client?.graph.schemaRegistry.query({ typename }).runSync()[0];
+    const staticSchema = client
+      ? client.graph.registry
+          .list()
+          .filter(Type.isType)
+          .find((s) => Type.getTypename(s) === typename)
+      : undefined;
     if (!view && !staticSchema) {
-      await invokePromise(SpaceOperation.AddSchema, { db: space.db, schema, show: false });
+      await invokePromise(SpaceOperation.AddType, { db: space.db, type: schema, show: false });
     }
 
     // Create objects.
@@ -52,7 +54,7 @@ export const createGenerator = <S extends Type.AnyObj>(
 
 export const staticGenerators = new Map<string, ObjectGenerator<any>>([
   [
-    Markdown.Document.typename,
+    Type.getTypename(Markdown.Document),
     async (space, n, cb) => {
       const objects = range(n).map(() => {
         return space.db.add(
@@ -68,7 +70,7 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
     },
   ],
   [
-    Sketch.Sketch.typename,
+    Type.getTypename(Sketch.Sketch),
     async (space, n, cb) => {
       const objects = range(n).map(() => {
         const obj = space.db.add(Sketch.make({ name: random.commerce.productName() }));
@@ -81,7 +83,7 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
   ],
   // TODO(burdon): Create unit tests.
   [
-    Sheet.Sheet.typename,
+    Type.getTypename(Sheet.Sheet),
     async (space, n, cb) => {
       const objects = range(n).map(() => {
         const cells: Record<string, Sheet.CellValue> = {};
@@ -118,7 +120,7 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
     },
   ],
   [
-    ComputeGraph.typename,
+    Type.getTypename(ComputeGraph),
     async (space, n, cb) => {
       const objects = range(n, () => {
         const model = ComputeGraphModel.create();
@@ -128,7 +130,7 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
           .createNode({
             id: 'gpt-QUEUE_ID',
             type: 'constant',
-            value: new DXN(DXN.kind.QUEUE, ['data', space.id, Key.ObjectId.random()]).toString(),
+            value: EID.make({ spaceId: space.id, entityId: Key.EntityId.random() }),
           })
           .createNode({ id: 'gpt-APPEND', type: 'append' })
           .createNode({ id: 'gpt-OUTPUT', type: NODE_OUTPUT })

package/src/components/SpaceGenerator/presets.ts

@@ -7,8 +7,9 @@ import * as Schema from 'effect/Schema';
 import { AgentPrompt, WebSearchBlueprint } from '@dxos/assistant-toolkit';
 import { Routine, Trigger, Operation } from '@dxos/compute';
 import { type ComputeGraphModel, NODE_INPUT } from '@dxos/conductor';
-import { DXN, Feed, Filter, JsonSchema, Key, Obj, Query, type QueryAST, Ref, Tag } from '@dxos/echo';
+import { Feed, Filter, JsonSchema, Key, Obj, Query, type QueryAST, Ref, Scope, Tag } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
+import { EID } from '@dxos/keys';
 import { InboxOperation } from '@dxos/plugin-inbox';
 import { Mailbox } from '@dxos/plugin-inbox';
 import { Markdown } from '@dxos/plugin-markdown';
@@ -71,9 +72,9 @@ export const generator = () => ({
           );
 
           const tag = space.db.add(Tag.make({ label: 'Investor' }));
-          const tagDxn = Obj.getDXN(tag).toString();
+          const tagRef = Ref.make(tag);
           Obj.update(doc, (doc) => {
-            Obj.getMeta(doc).tags = [tagDxn];
+            Obj.getMeta(doc).tags = [tagRef];
           });
 
           // space.db.add(
@@ -85,7 +86,7 @@ export const generator = () => ({
           // );
 
           space.db.add(
-            Obj.make(Person.Person, { [Obj.Meta]: { tags: [tagDxn] }, fullName: 'Rich', organization: Ref.make(org) }),
+            Obj.make(Person.Person, { [Obj.Meta]: { tags: [tagRef] }, fullName: 'Rich', organization: Ref.make(org) }),
           );
           space.db.add(
             Obj.make(Person.Person, {
@@ -120,15 +121,15 @@ export const generator = () => ({
         invariant(mailbox, 'Mailbox not found');
         const mailboxFeed = await mailbox.feed?.tryLoad();
         invariant(mailboxFeed, 'Mailbox missing feed reference');
-        const queueDxn = Feed.getQueueDxn(mailboxFeed)?.toString();
+        const queueDxn = Feed.getQueueUri(mailboxFeed);
         invariant(queueDxn, 'Mailbox feed missing queue DXN key');
         const tag = await space.db.query(Filter.type(Tag.Tag, { label: 'Investor' })).first();
-        const tagDxn = Obj.getDXN(tag).toString();
+        const tagUri = Obj.getURI(tag);
 
         const objects = range(n, () => {
-          const contactsQuery = Query.select(Filter.type(Person.Person)).select(Filter.tag(tagDxn));
-          const organizationsQuery = Query.select(Filter.type(Organization.Organization)).select(Filter.tag(tagDxn));
-          const notesQuery = Query.select(Filter.type(Markdown.Document)).select(Filter.tag(tagDxn));
+          const contactsQuery = Query.select(Filter.type(Person.Person)).select(Filter.tag(tagUri));
+          const organizationsQuery = Query.select(Filter.type(Organization.Organization)).select(Filter.tag(tagUri));
+          const notesQuery = Query.select(Filter.type(Markdown.Document)).select(Filter.tag(tagUri));
 
           space.db.add(
             Trigger.make({
@@ -178,9 +179,7 @@ export const generator = () => ({
               Filter.type(Message.Message, {
                 properties: { labels: Filter.contains('investor') },
               }),
-            ).from({
-              queues: [queueDxn],
-            }),
+            ).from(Scope.feed(Obj.getURI(mailboxFeed))),
             jsonSchema: JsonSchema.toJsonSchema(Message.Message),
           });
           const contactsView = ViewModel.make({
@@ -587,7 +586,7 @@ export const generator = () => ({
             );
             const queueId = canvasModel.createNode(
               createConstant({
-                value: new DXN(DXN.kind.QUEUE, ['data', space.id, Key.ObjectId.random()]).toString(),
+                value: EID.make({ spaceId: space.id, entityId: Key.EntityId.random() }),
                 ...position({ x: -10, y: 5 }),
               }),
             );
@@ -774,7 +773,7 @@ const setupQueue = (
 ) => {
   const queueId = canvasModel.createNode(
     createConstant({
-      value: new DXN(DXN.kind.QUEUE, ['data', space.id, Key.ObjectId.random()]).toString(),
+      value: EID.make({ spaceId: space.id, entityId: Key.EntityId.random() }),
       ...(args?.idPosition ? rawPosition(args.idPosition) : position({ x: -18, y: 5, width: 8, height: 6 })),
     }),
   );