@dxos/plugin-space 0.8.2-main.f11618f → 0.8.2-staging.42af850

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
 import { isSpace } from '@dxos/client/echo';
 import { live } from '@dxos/live-object';
 
@@ -14,7 +14,7 @@ import { SPACES } from '../util';
 // https://stackoverflow.com/a/19016910
 const DIRECTORY_TYPE = 'text/directory';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphSerializer, [
     {
       inputType: SPACES,
@@ -37,7 +37,7 @@ export default (context: PluginsContext) =>
         type: DIRECTORY_TYPE,
       }),
       deserialize: async (data) => {
-        const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+        const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
         const result = await dispatch(createIntent(SpaceAction.Create, { name: data.name, edgeReplication: true }));
         return result.data?.space;
       },
@@ -59,7 +59,7 @@ export default (context: PluginsContext) =>
           return;
         }
 
-        const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+        const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
         const result = await dispatch(
           createIntent(SpaceAction.AddObject, {
             target: collection,

package/src/capabilities/capabilities.ts

@@ -17,12 +17,3 @@ export namespace SpaceCapabilities {
 
   export const ObjectForm = defineCapability<ObjectForm<any>>(`${SPACE_PLUGIN}/capability/object-form`);
 }
-
-// TODO(wittjosiah): Factor out.
-export namespace ThreadCapabilities {
-  type ThreadCapability<T = any> = {
-    predicate: (obj: any) => obj is T;
-    createSort: (obj: T) => (anchorA: string | undefined, anchorB: string | undefined) => number;
-  };
-  export const Thread = defineCapability<ThreadCapability>(`${SPACE_PLUGIN}/capability/thread`);
-}

package/src/capabilities/identity-created.ts

@@ -2,15 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginsContext, Capabilities } from '@dxos/app-framework';
+import { contributes, type PluginContext, Capabilities } from '@dxos/app-framework';
 import { live, makeRef } from '@dxos/live-object';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { CollectionType } from '../types';
 
-export default async (context: PluginsContext) => {
-  const client = context.requestCapability(ClientCapabilities.Client);
+export default async (context: PluginContext) => {
+  const client = context.getCapability(ClientCapabilities.Client);
   await client.spaces.waitUntilReady();
 
   const defaultSpace = client.spaces.default;

package/src/capabilities/index.ts

@@ -10,8 +10,8 @@ export const IdentityCreated = lazy(() => import('./identity-created'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactRoot = lazy(() => import('./react-root'));
 export const ReactSurface = lazy(() => import('./react-surface'));
-export const Schema = lazy(() => import('./schema'));
-export const Tools = lazy(() => import('./schema-tools'));
+export const SchemaDefs = lazy(() => import('./schema-defs'));
+export const SchemaTools = lazy(() => import('./schema-tools'));
 export const SpaceSettings = lazy(() => import('./settings'));
 export const SpaceState = lazy(() => import('./state'));
 export const SpacesReady = lazy(() => import('./spaces-ready'));

package/src/capabilities/intent-resolver.ts

@@ -10,9 +10,9 @@ import {
   createIntent,
   createResolver,
   LayoutAction,
-  type PluginsContext,
+  type PluginContext,
 } from '@dxos/app-framework';
-import { type Expando, getTypename, type HasId } from '@dxos/echo-schema';
+import { type Expando, getTypename, type HasId, RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { live, makeRef, type Live } from '@dxos/live-object';
 import { Migrations } from '@dxos/migrations';
@@ -32,7 +32,6 @@ import {
   CREATE_OBJECT_DIALOG,
   type CreateObjectDialogProps,
   POPOVER_RENAME_OBJECT,
-  POPOVER_ADD_SPACE,
 } from '../components';
 import { SPACE_PLUGIN } from '../meta';
 import { CollectionAction, CollectionType, SpaceAction } from '../types';
@@ -42,14 +41,14 @@ import { cloneObject, COMPOSER_SPACE_LOCK, getNestedObjects } from '../util';
 const SPACE_MAX_OBJECTS = 500;
 
 type IntentResolverOptions = {
-  context: PluginsContext;
+  context: PluginContext;
   createInvitationUrl: (invitationCode: string) => string;
   observability?: boolean;
 };
 
 export default ({ context, observability, createInvitationUrl }: IntentResolverOptions) => {
   const resolve = (typename: string) =>
-    context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
+    context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
 
   return contributes(Capabilities.IntentResolver, [
     createResolver({
@@ -69,7 +68,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: SpaceAction.Create,
       resolve: async ({ name, hue, icon, edgeReplication }) => {
-        const client = context.requestCapability(ClientCapabilities.Client);
+        const client = context.getCapability(ClientCapabilities.Client);
         const space = await client.spaces.create({ name, hue, icon });
         if (edgeReplication) {
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
@@ -158,7 +157,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
       intent: SpaceAction.GetShareLink,
       resolve: ({ space, target, copyToClipboard }) =>
         Effect.gen(function* () {
-          const { dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+          const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
           const invitation = yield* dispatch(
             createIntent(SpaceAction.Share, {
               space,
@@ -246,24 +245,6 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         };
       },
     }),
-    createResolver({
-      intent: SpaceAction.AddSpace,
-      resolve: () => {
-        return {
-          intents: [
-            createIntent(LayoutAction.UpdatePopover, {
-              part: 'popover',
-              subject: POPOVER_ADD_SPACE,
-              options: {
-                variant: 'react',
-                anchorId: SpaceAction.AddSpace._tag,
-                side: 'right',
-              },
-            }),
-          ],
-        };
-      },
-    }),
     createResolver({
       intent: SpaceAction.OpenSettings,
       resolve: ({ space }) => ({
@@ -293,7 +274,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: SpaceAction.Migrate,
       resolve: async ({ space, version: targetVersion }) => {
-        const state = context.requestCapability(SpaceCapabilities.MutableState);
+        const state = context.getCapability(SpaceCapabilities.MutableState);
 
         if (space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION) {
           state.sdkMigrationRunning[space.id] = true;
@@ -324,7 +305,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: SpaceAction.OpenCreateObject,
       resolve: ({ target, navigable = true }) => {
-        const state = context.requestCapability(SpaceCapabilities.State);
+        const state = context.getCapability(SpaceCapabilities.State);
 
         return {
           intents: [
@@ -421,10 +402,22 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         };
       },
     }),
+    createResolver({
+      intent: SpaceAction.AddRelation,
+      resolve: ({ space, schema, source, target, fields }) => {
+        const relation = live(schema, { [RelationSourceId]: source, [RelationTargetId]: target, ...fields });
+        space.db.add(relation);
+        return {
+          data: {
+            relation,
+          },
+        };
+      },
+    }),
     createResolver({
       intent: SpaceAction.RemoveObjects,
       resolve: async ({ objects, target, deletionData }, undo) => {
-        const layout = context.requestCapability(Capabilities.Layout);
+        const layout = context.getCapability(Capabilities.Layout);
 
         // All objects must be a member of the same space.
         const space = getSpace(objects[0]);
@@ -553,7 +546,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: SpaceAction.WaitForObject,
       resolve: async ({ id }) => {
-        const state = context.requestCapability(SpaceCapabilities.MutableState);
+        const state = context.getCapability(SpaceCapabilities.MutableState);
         state.awaiting = id;
       },
     }),

package/src/capabilities/react-surface.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema as S } from 'effect';
+import { type Schema } from 'effect';
 import React, { useCallback } from 'react';
 
 import { Capabilities, contributes, createSurface, Surface, useCapability, useLayout } from '@dxos/app-framework';
@@ -17,7 +17,7 @@ import {
   parseId,
   SpaceState,
   useSpace,
-  type ReactiveEchoObject,
+  type AnyLiveObject,
   type Space,
 } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
@@ -36,22 +36,20 @@ import {
   InlineSyncStatus,
   JOIN_DIALOG,
   JoinDialog,
+  MembersContainer,
   MenuFooter,
+  ObjectSettingsContainer,
   POPOVER_RENAME_OBJECT,
   POPOVER_RENAME_SPACE,
   PopoverRenameObject,
   PopoverRenameSpace,
+  SchemaContainer,
   SmallPresenceLive,
   SpacePluginSettings,
   SpacePresence,
+  SpaceSettingsContainer,
   SyncStatus,
   type CreateObjectDialogProps,
-  POPOVER_ADD_SPACE,
-  PopoverAddSpace,
-  MembersContainer,
-  ObjectSettingsContainer,
-  SpaceSettingsContainer,
-  SchemaContainer,
 } from '../components';
 import { SPACE_PLUGIN } from '../meta';
 import { CollectionType, HueAnnotationId, IconAnnotationId, type SpaceSettingsProps } from '../types';
@@ -93,7 +91,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/companion/object-settings`,
       role: 'article',
-      filter: (data): data is { companionTo: ReactiveEchoObject<any> } =>
+      filter: (data): data is { companionTo: AnyLiveObject<any> } =>
         isEchoObject(data.companionTo) && data.subject === 'settings',
       component: ({ data, role }) => <ObjectSettingsContainer object={data.companionTo} role={role} />,
     }),
@@ -164,8 +162,8 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/create-initial-space-form-[hue]`,
       role: 'form-input',
-      filter: (data): data is { prop: string; schema: S.Schema<any> } => {
-        const annotation = findAnnotation<boolean>((data.schema as S.Schema.All).ast, HueAnnotationId);
+      filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
+        const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
         return !!annotation;
       },
       component: ({ data: _, ...inputProps }) => {
@@ -183,8 +181,8 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/create-initial-space-form-[icon]`,
       role: 'form-input',
-      filter: (data): data is { prop: string; schema: S.Schema<any> } => {
-        const annotation = findAnnotation<boolean>((data.schema as S.Schema.All).ast, IconAnnotationId);
+      filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
+        const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
         return !!annotation;
       },
       component: ({ data: _, ...inputProps }) => {
@@ -208,26 +206,20 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: POPOVER_RENAME_OBJECT,
       role: 'popover',
-      filter: (data): data is { props: ReactiveEchoObject<any> } =>
+      filter: (data): data is { props: AnyLiveObject<any> } =>
         data.component === POPOVER_RENAME_OBJECT && isLiveObject(data.props),
       component: ({ data }) => <PopoverRenameObject object={data.props} />,
     }),
-    createSurface({
-      id: POPOVER_ADD_SPACE,
-      role: 'popover',
-      filter: (data): data is any => data.component === POPOVER_ADD_SPACE,
-      component: () => <PopoverAddSpace />,
-    }),
     createSurface({
       id: `${SPACE_PLUGIN}/menu-footer`,
       role: 'menu-footer',
-      filter: (data): data is { subject: ReactiveEchoObject<any> } => isEchoObject(data.subject),
+      filter: (data): data is { subject: AnyLiveObject<any> } => isEchoObject(data.subject),
       component: ({ data }) => <MenuFooter object={data.subject} />,
     }),
     createSurface({
       id: `${SPACE_PLUGIN}/navtree-presence`,
       role: 'navtree-item-end',
-      filter: (data): data is { id: string; subject: ReactiveEchoObject<any>; open?: boolean } =>
+      filter: (data): data is { id: string; subject: AnyLiveObject<any>; open?: boolean } =>
         typeof data.id === 'string' && isEchoObject(data.subject),
       component: ({ data }) => {
         // TODO(wittjosiah): Doesn't need to be mutable but readonly type messes with ComplexMap.
@@ -254,7 +246,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       id: `${SPACE_PLUGIN}/navbar-presence`,
       role: 'navbar-end',
       position: 'hoist',
-      filter: (data): data is { subject: Space | ReactiveEchoObject<any> } =>
+      filter: (data): data is { subject: Space | AnyLiveObject<any> } =>
         isSpace(data.subject) || isEchoObject(data.subject),
       component: ({ data }) => {
         const space = isSpace(data.subject) ? data.subject : getSpace(data.subject);

package/src/capabilities/schema-defs.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { ClientCapabilities } from '@dxos/plugin-client';
+
+import { SpaceCapabilities } from './capabilities';
+import { type ObjectForm } from '../types';
+
+export default (context: PluginContext) => {
+  const registry = context.getCapability(Capabilities.RxRegistry);
+  const client = context.getCapability(ClientCapabilities.Client);
+
+  // TODO(wittjosiah): Unregister schemas when they are disabled.
+  let previous: ObjectForm[] = [];
+  const cancel = registry.subscribe(
+    context.capabilities(SpaceCapabilities.ObjectForm),
+    (_forms) => {
+      const forms = Array.from(new Set(_forms));
+      // TODO(wittjosiah): Filter out schemas which the client has already registered.
+      const newSchemas = forms.filter((form) => !previous.includes(form)).map((form) => form.objectSchema);
+      previous = forms;
+      client.addTypes(newSchemas);
+    },
+    { immediate: true },
+  );
+
+  return contributes(Capabilities.Null, null, () => cancel());
+};

package/src/capabilities/schema-tool.test.ts

@@ -2,10 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
 import { describe, it, expect } from 'vitest';
 
-import { S } from '@dxos/echo-schema';
-
 import { TypeNameSchema } from './schema-tools';
 
 describe('TypeNameSchema format', () => {
@@ -29,7 +28,7 @@ describe('TypeNameSchema format', () => {
     '.org/Type', // Must have domain
   ];
 
-  const validate = S.validateSync(TypeNameSchema);
+  const validate = Schema.validateSync(TypeNameSchema);
 
   valid.forEach((typename) => {
     it(`should accept valid typename: ${typename}`, () => {

package/src/capabilities/schema-tools.ts

@@ -2,12 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { DescriptionAnnotationId, ExamplesAnnotationId, TitleAnnotationId } from 'effect/SchemaAST';
+import { Schema, SchemaAST } from 'effect';
 
+import { createTool, ToolResult } from '@dxos/ai';
 import { Capabilities, contributes, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { defineTool, ToolResult } from '@dxos/artifact';
 import { type Space } from '@dxos/client/echo';
-import { FormatEnum, FormatEnums, S, SelectOptionSchema, GeoPoint, toJsonSchema } from '@dxos/echo-schema';
+import { FormatEnum, FormatEnums, SelectOptionSchema, GeoPoint, toJsonSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { hues } from '@dxos/react-ui-theme';
 import { getSchemaFromPropertyDefinitions } from '@dxos/schema';
@@ -21,13 +21,13 @@ declare global {
 }
 
 // TODO(ZaymonFC): Move this somewhere common.
-export const TypeNameSchema = S.String.pipe(
-  S.pattern(/^\w+\.\w{2,}\/[\w/]+$/i),
-  S.annotations({
-    [TitleAnnotationId]: 'TypeName',
-    [DescriptionAnnotationId]:
+export const TypeNameSchema = Schema.String.pipe(
+  Schema.pattern(/^\w+\.\w{2,}\/[\w/]+$/i),
+  Schema.annotations({
+    title: 'TypeName',
+    description:
       'Domain-style type name path. Dashes are not allowed. Use camel case for the final component of the type name.',
-    [ExamplesAnnotationId]: ['example.com/type/Document', 'example.com/type/FlightList'],
+    [SchemaAST.ExamplesAnnotationId]: ['example.com/type/Document', 'example.com/type/FlightList'],
   }),
 );
 
@@ -36,33 +36,33 @@ const formatDescription = `The format of the property. Additional information:
   This tuple is GeoJSON. You must specify \`${FormatEnum.GeoPoint}\` as [Longitude, Latitude]`;
 
 // TODO(ZaymonFC): All properties are default optional, but maybe we should allow for required properties.
-const PropertyDefinitionSchema = S.Struct({
-  name: S.String.annotations({ [DescriptionAnnotationId]: 'The name of the property.' }),
-  format: S.Union(...FormatEnums.map((format) => S.Literal(format))).annotations({
-    [DescriptionAnnotationId]: formatDescription,
+const PropertyDefinitionSchema = Schema.Struct({
+  name: Schema.String.annotations({ description: 'The name of the property.' }),
+  format: Schema.Union(...FormatEnums.map((format) => Schema.Literal(format))).annotations({
+    description: formatDescription,
   }),
-  config: S.optional(
-    S.Struct({
-      options: S.optional(
-        S.Array(SelectOptionSchema)
+  config: Schema.optional(
+    Schema.Struct({
+      options: Schema.optional(
+        Schema.Array(SelectOptionSchema)
           .annotations({
             description: `Options for SingleSelect/MultiSelect formats. Available colors: ${hues.join(', ')}`,
           })
-          .pipe(S.mutable),
+          .pipe(Schema.mutable),
       ),
     }),
   ),
-}).pipe(S.mutable);
+}).pipe(Schema.mutable);
 
 const SYSTEM_NAMESPACE = 'dxos.org/echo/schema';
 
 export default () =>
   contributes(Capabilities.Tools, [
-    defineTool(SYSTEM_NAMESPACE, {
+    createTool(SYSTEM_NAMESPACE, {
       name: 'list',
       description: 'List registered schemas in the space.',
       caption: 'Listing registered schemas...',
-      schema: S.Struct({}),
+      schema: Schema.Struct({}),
       execute: async (_input, { extensions }) => {
         invariant(extensions?.space, 'No space.');
         const space = extensions.space;
@@ -76,12 +76,12 @@ export default () =>
         );
       },
     }),
-    defineTool(SYSTEM_NAMESPACE, {
+    createTool(SYSTEM_NAMESPACE, {
       name: 'get',
       description: 'Get a specific schema by its typename.',
       caption: 'Getting schema...',
-      schema: S.Struct({
-        typename: S.String.annotations({
+      schema: Schema.Struct({
+        typename: Schema.String.annotations({
           description: 'The fully qualified typename of the schema.',
         }),
       }),
@@ -97,18 +97,18 @@ export default () =>
         return ToolResult.Success(schema);
       },
     }),
-    defineTool(SYSTEM_NAMESPACE, {
+    createTool(SYSTEM_NAMESPACE, {
       name: 'create',
       description: 'Create a new schema with the provided definition.',
       caption: 'Creating schema...',
-      schema: S.Struct({
+      schema: Schema.Struct({
         typename: TypeNameSchema.annotations({
           description:
             'The fully qualified schema typename. Must start with a domain, and then one or more path components (e.g., "example.com/type/TypeName").',
         }),
-        properties: S.Array(PropertyDefinitionSchema).pipe(
-          S.annotations({ description: 'Array of property definitions for the schema.' }),
-          S.mutable,
+        properties: Schema.Array(PropertyDefinitionSchema).pipe(
+          Schema.annotations({ description: 'Array of property definitions for the schema.' }),
+          Schema.mutable,
         ),
       }),
       execute: async ({ typename, properties }, { extensions }) => {

package/src/capabilities/spaces-ready.ts

@@ -2,7 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, createIntent, type PluginsContext, Capabilities, LayoutAction } from '@dxos/app-framework';
+import { Option } from 'effect';
+
+import { contributes, createIntent, type PluginContext, Capabilities, LayoutAction } from '@dxos/app-framework';
 import { SubscriptionList } from '@dxos/async';
 import { Expando } from '@dxos/echo-schema';
 import { scheduledEffect } from '@dxos/echo-signals/core';
@@ -21,19 +23,19 @@ import { SpaceAction } from '../types';
 import { COMPOSER_SPACE_LOCK, SHARED } from '../util';
 
 const ACTIVE_NODE_BROADCAST_INTERVAL = 30_000;
-const WAIT_FOR_OBJECT_TIMEOUT = 1000;
+const WAIT_FOR_OBJECT_TIMEOUT = 5_000;
 
-export default async (context: PluginsContext) => {
+export default async (context: PluginContext) => {
   const subscriptions = new SubscriptionList();
   const spaceSubscriptions = new SubscriptionList();
 
-  const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-  const { graph } = context.requestCapability(Capabilities.AppGraph);
-  const layout = context.requestCapability(Capabilities.Layout);
-  const deck = context.requestCapability(DeckCapabilities.DeckState);
-  const attention = context.requestCapability(AttentionCapabilities.Attention);
-  const state = context.requestCapability(SpaceCapabilities.MutableState);
-  const client = context.requestCapability(ClientCapabilities.Client);
+  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+  const { graph } = context.getCapability(Capabilities.AppGraph);
+  const layout = context.getCapability(Capabilities.Layout);
+  const deck = context.getCapability(DeckCapabilities.DeckState);
+  const attention = context.getCapability(AttentionCapabilities.Attention);
+  const state = context.getCapability(SpaceCapabilities.MutableState);
+  const client = context.getCapability(ClientCapabilities.Client);
 
   const defaultSpace = client.spaces.default;
   await defaultSpace.waitUntilReady();
@@ -49,7 +51,7 @@ export default async (context: PluginsContext) => {
 
   const {
     objects: [spacesOrder],
-  } = await defaultSpace.db.query(Filter.schema(Expando, { key: SHARED })).run();
+  } = await defaultSpace.db.query(Filter.type(Expando, { key: SHARED })).run();
   if (!spacesOrder) {
     // TODO(wittjosiah): Cannot be a Folder because Spaces are not TypedObjects so can't be saved in the database.
     //  Instead, we store order as an array of space ids.
@@ -65,10 +67,10 @@ export default async (context: PluginsContext) => {
           return;
         }
 
-        const node = graph.findNode(active[0]);
+        const node = graph.getNode(active[0]).pipe(Option.getOrNull);
         if (!node && active[0].length === FQ_ID_LENGTH) {
           const timeout = setTimeout(async () => {
-            const node = graph.findNode(active[0]);
+            const node = graph.getNode(active[0]).pipe(Option.getOrNull);
             if (!node) {
               await dispatch(createIntent(SpaceAction.WaitForObject, { id: active[0] }));
             }

package/src/capabilities/state.ts

@@ -4,7 +4,7 @@
 
 import { effect } from '@preact/signals-core';
 
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 import { PublicKey } from '@dxos/keys';
 import { LocalStorageStore } from '@dxos/local-storage';
 import { ComplexMap } from '@dxos/util';
@@ -13,7 +13,7 @@ import { SpaceCapabilities } from './capabilities';
 import { SPACE_PLUGIN } from '../meta';
 import { type PluginState } from '../types';
 
-export default (context: PluginsContext) => {
+export default (context: PluginContext) => {
   const state = new LocalStorageStore<PluginState>(SPACE_PLUGIN, {
     awaiting: undefined,
     spaceNames: {},
@@ -29,7 +29,7 @@ export default (context: PluginsContext) => {
     .prop({ key: 'spaceNames', type: LocalStorageStore.json<Record<string, string>>() })
     .prop({ key: 'enabledEdgeReplication', type: LocalStorageStore.bool() });
 
-  const manager = context.requestCapability(Capabilities.PluginManager);
+  const manager = context.getCapability(Capabilities.PluginManager);
   const unsubscribe = effect(() => {
     // TODO(wittjosiah): Find a way to make this capability-based.
     const enabled = manager.enabled.includes('dxos.org/plugin/stack');

package/src/components/AwaitingObject.tsx

@@ -26,7 +26,7 @@ export const AwaitingObject = ({ id }: { id: string }) => {
   const layout = useLayout();
 
   const client = useClient();
-  const objects = useQuery(client.spaces, Filter.all());
+  const objects = useQuery(client.spaces, Filter.everything());
 
   useEffect(() => {
     if (!id) {

package/src/components/CreateDialog/CreateObjectDialog.stories.tsx

@@ -35,7 +35,7 @@ const meta: Meta<typeof CreateObjectDialog> = {
   decorators: [
     withClientProvider({ createIdentity: true, createSpace: true, types: [CollectionType] }),
     withTheme,
-    withLayout({ tooltips: true }),
+    withLayout(),
   ],
   parameters: {
     translations: [...translations, osTranslations],
@@ -66,7 +66,7 @@ export const TargetSpace: StoryObj<typeof CreateObjectDialog> = {
 export const TargetCollection: StoryObj<typeof CreateObjectDialog> = {
   render: (args) => {
     const space = useSpace();
-    const [collection] = useQuery(space, Filter.schema(CollectionType));
+    const [collection] = useQuery(space, Filter.type(CollectionType));
 
     useEffect(() => {
       if (space) {

package/src/components/CreateDialog/CreateObjectDialog.tsx

@@ -46,7 +46,7 @@ export const CreateObjectDialog = ({
 
   const resolve = useCallback(
     (typename: string) =>
-      manager.context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {},
+      manager.context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {},
     [manager],
   );
 

package/src/components/CreateDialog/CreateSpaceDialog.tsx

@@ -2,11 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Effect } from 'effect';
+import { Effect, type Schema } from 'effect';
 import React, { useCallback, useRef } from 'react';
 
 import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
-import { type S } from '@dxos/echo-schema';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
@@ -16,7 +15,7 @@ import { SpaceAction, SpaceForm } from '../../types';
 
 export const CREATE_SPACE_DIALOG = `${SPACE_PLUGIN}/CreateSpaceDialog`;
 
-type FormValues = S.Schema.Type<typeof SpaceForm>;
+type FormValues = Schema.Schema.Type<typeof SpaceForm>;
 const initialValues: FormValues = { edgeReplication: true };
 
 export const CreateSpaceDialog = () => {

package/src/components/MembersContainer.stories.tsx

@@ -16,11 +16,7 @@ import translations from '../translations';
 const meta: Meta = {
   title: 'plugins/plugin-space/MembersContainer',
   component: MembersContainer,
-  decorators: [
-    withClientProvider({ createIdentity: true, createSpace: true }),
-    withTheme,
-    withLayout({ tooltips: true }),
-  ],
+  decorators: [withClientProvider({ createIdentity: true, createSpace: true }), withTheme, withLayout()],
   parameters: {
     layout: 'fullscreen',
     translations: [...translations, osTranslations],