@dxos/react-client 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

package/moon.yml

@@ -6,6 +6,7 @@ tags:
   - ts-test
   - typedoc
   - pack
+  - storybook
 tasks:
   compile:
     args:
@@ -17,3 +18,6 @@ tasks:
       - '--entryPoint=src/mesh/index.ts'
       - '--entryPoint=src/testing/index.ts'
       - '--entryPoint=src/worker.ts'
+  test:
+    inputs:
+      - .storybook/*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.8.4-main.5ea62a8",
+  "version": "0.8.4-main.66e292d",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -86,43 +86,42 @@
   },
   "dependencies": {
     "react-error-boundary": "^4.0.13",
-    "@dxos/async": "0.8.4-main.5ea62a8",
-    "@dxos/codec-protobuf": "0.8.4-main.5ea62a8",
-    "@dxos/config": "0.8.4-main.5ea62a8",
-    "@dxos/context": "0.8.4-main.5ea62a8",
-    "@dxos/echo": "0.8.4-main.5ea62a8",
-    "@dxos/echo-schema": "0.8.4-main.5ea62a8",
-    "@dxos/debug": "0.8.4-main.5ea62a8",
-    "@dxos/client": "0.8.4-main.5ea62a8",
-    "@dxos/echo-signals": "0.8.4-main.5ea62a8",
-    "@dxos/invariant": "0.8.4-main.5ea62a8",
-    "@dxos/log": "0.8.4-main.5ea62a8",
-    "@dxos/node-std": "0.8.4-main.5ea62a8",
-    "@dxos/protocols": "0.8.4-main.5ea62a8",
-    "@dxos/react-hooks": "0.8.4-main.5ea62a8",
-    "@dxos/util": "0.8.4-main.5ea62a8"
+    "@dxos/async": "0.8.4-main.66e292d",
+    "@dxos/client": "0.8.4-main.66e292d",
+    "@dxos/codec-protobuf": "0.8.4-main.66e292d",
+    "@dxos/config": "0.8.4-main.66e292d",
+    "@dxos/debug": "0.8.4-main.66e292d",
+    "@dxos/echo": "0.8.4-main.66e292d",
+    "@dxos/context": "0.8.4-main.66e292d",
+    "@dxos/echo-signals": "0.8.4-main.66e292d",
+    "@dxos/invariant": "0.8.4-main.66e292d",
+    "@dxos/log": "0.8.4-main.66e292d",
+    "@dxos/node-std": "0.8.4-main.66e292d",
+    "@dxos/react-hooks": "0.8.4-main.66e292d",
+    "@dxos/util": "0.8.4-main.66e292d",
+    "@dxos/protocols": "0.8.4-main.66e292d"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
     "typedoc": "0.28.1",
-    "@dxos/random": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
-    "@dxos/storybook-utils": "0.8.4-main.5ea62a8",
-    "@dxos/test-utils": "0.8.4-main.5ea62a8"
+    "@dxos/random": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d",
+    "@dxos/test-utils": "0.8.4-main.66e292d",
+    "@dxos/storybook-utils": "0.8.4-main.66e292d"
   },
   "peerDependencies": {
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "optionalDependencies": {
-    "@dxos/random": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8"
+    "@dxos/random": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d"
   },
   "publishConfig": {
     "access": "public"

package/src/echo/useQuery.test.tsx

@@ -5,7 +5,8 @@
 import { renderHook } from '@testing-library/react';
 import { describe, expect, test } from 'vitest';
 
-import { Expando, Filter, live } from '@dxos/client/echo';
+import { Filter } from '@dxos/client/echo';
+import { Obj, Type } from '@dxos/echo';
 
 import { createClient, createClientContextProvider } from '../testing/util';
 
@@ -19,9 +20,9 @@ describe('useQuery', () => {
     const wrapper = await createClientContextProvider(client);
 
     // Create 3 test objects: Alice, Bob, Charlie.
-    const alice = live(Expando, { name: 'Alice' });
-    const bob = live(Expando, { name: 'Bob' });
-    const charlie = live(Expando, { name: 'Charlie' });
+    const alice = Obj.make(Type.Expando, { name: 'Alice' });
+    const bob = Obj.make(Type.Expando, { name: 'Bob' });
+    const charlie = Obj.make(Type.Expando, { name: 'Charlie' });
 
     space!.db.add(alice);
     space!.db.add(bob);
@@ -34,7 +35,7 @@ describe('useQuery', () => {
     // Setup useQuery hook that captures every render.
     renderHook(
       () => {
-        const objects = useQuery(space, Filter.type(Expando));
+        const objects = useQuery(space, Filter.type(Type.Expando));
 
         // Capture the names in this render.
         const namesInThisRender = objects.map((obj) => obj.name);
@@ -65,7 +66,7 @@ describe('useQuery', () => {
      *   Actual: 4 renders
      *   1. [] (empty)
      *   2. ['Alice', 'Bob', 'Charlie'] (all loaded)
-     *   3. ['Alice', 'Charlie', 'Bob'] (FLASH BUG - Bob moves to end!)
+     *   3. ['Alice', 'Charlie', 'Bob'] (FLASH BUG - Bob moves to end!)x
      *   4. ['Alice', 'Charlie'] (Bob finally removed)
      */
 
@@ -82,7 +83,7 @@ describe('useQuery', () => {
     const wrapper = await createClientContextProvider(client);
 
     // Create 10 test objects: 1, 2, 3, ..., 10.
-    const objects = Array.from({ length: 10 }, (_, i) => live(Expando, { value: i + 1 }));
+    const objects = Array.from({ length: 10 }, (_, i) => Obj.make(Type.Expando, { value: i + 1 }));
 
     objects.forEach((obj) => space!.db.add(obj));
     await space!.db.flush();
@@ -93,7 +94,7 @@ describe('useQuery', () => {
     // Setup useQuery hook that captures every render.
     renderHook(
       () => {
-        const queryObjects = useQuery(space, Filter.type(Expando));
+        const queryObjects = useQuery(space, Filter.type(Type.Expando));
 
         // Capture the values in this render.
         const valuesInThisRender = queryObjects.map((obj) => obj.value);
@@ -122,7 +123,6 @@ describe('useQuery', () => {
       new Set([]), // Initial loading state.
       new Set([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), // All objects loaded.
       // TODO(dmaretskyi): Fix this with query ordering.
-      new Set([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), // Getting another render for some reason.
       new Set([]), // All items deleted.
     ]);
   });

package/src/echo/useQuery.ts

@@ -4,7 +4,8 @@
 
 import { useMemo, useSyncExternalStore } from 'react';
 
-import { type Echo, Filter, type Live, Query, type Space, isSpace } from '@dxos/client/echo';
+import { type Database, type Echo, type Entity, Filter, Query, type Space, isSpace } from '@dxos/client/echo';
+import { type AnyProperties } from '@dxos/echo/internal';
 
 const EMPTY_ARRAY: never[] = [];
 
@@ -12,30 +13,38 @@ const noop = () => {};
 
 // TODO(dmaretskyi): Queries are fully serializable, so we can remove `deps` argument.
 interface UseQueryFn {
-  <Q extends Query.Any>(spaceOrEcho: Space | Echo | undefined, query: Q, deps?: any[]): Live<Query.Type<Q>>[];
+  <Q extends Query.Any, O extends Entity.Entity<Query.Type<Q>> = Entity.Entity<Query.Type<Q>>>(
+    spaceOrEcho: Space | Echo | Database.Queryable | undefined,
+    query: Q,
+    deps?: any[],
+  ): O[];
 
-  <F extends Filter.Any>(spaceOrEcho: Space | Echo | undefined, filter: F, deps?: any[]): Live<Filter.Type<F>>[];
+  <F extends Filter.Any, O extends Entity.Entity<Filter.Type<F>> = Entity.Entity<Filter.Type<F>>>(
+    spaceOrEcho: Space | Echo | Database.Queryable | undefined,
+    filter: F,
+    deps?: any[],
+  ): O[];
 }
 
 /**
  * Create subscription.
  */
+// TODO(burdon): Sort?
 export const useQuery: UseQueryFn = (
-  spaceOrEcho: Space | Echo | undefined,
+  // TODO(burdon): CRITICAL: Remove Space and just requre Queryable.
+  resource: Space | Echo | Database.Queryable | undefined,
   queryOrFilter: Query.Any | Filter.Any,
   deps?: any[],
-): Live<unknown>[] => {
+): Entity.Entity<AnyProperties>[] => {
   const query = Filter.is(queryOrFilter) ? Query.select(queryOrFilter) : queryOrFilter;
 
   const { getObjects, subscribe } = useMemo(() => {
-    let subscribed = false;
-    const queryResult =
-      spaceOrEcho === undefined
-        ? undefined
-        : isSpace(spaceOrEcho)
-          ? spaceOrEcho.db.query(query)
-          : spaceOrEcho.query(query);
+    let queryResult = undefined;
+    if (resource) {
+      queryResult = isSpace(resource) ? resource.db.query(query) : resource.query(query);
+    }
 
+    let subscribed = false;
     return {
       getObjects: () => (subscribed && queryResult ? queryResult.objects : EMPTY_ARRAY),
       subscribe: (cb: () => void) => {
@@ -47,10 +56,10 @@ export const useQuery: UseQueryFn = (
         };
       },
     };
-  }, [spaceOrEcho, JSON.stringify(query.ast), ...(deps ?? [])]);
+  }, [resource, JSON.stringify(query.ast), ...(deps ?? [])]);
 
   // https://beta.reactjs.org/reference/react/useSyncExternalStore
   // NOTE: This hook will resubscribe whenever the callback passed to the first argument changes; make sure it is stable.
-  const objects = useSyncExternalStore<Live<unknown>[] | undefined>(subscribe, getObjects);
+  const objects = useSyncExternalStore<Entity.Entity<AnyProperties>[] | undefined>(subscribe, getObjects);
   return objects ?? [];
 };

package/src/echo/useQueue.ts

@@ -6,7 +6,7 @@ import { useEffect, useMemo, useRef } from 'react';
 
 import { type Queue } from '@dxos/client/echo';
 import { raise } from '@dxos/debug';
-import { type Obj, type Relation } from '@dxos/echo';
+import { type Entity } from '@dxos/echo';
 import { type DXN } from '@dxos/keys';
 
 import { useClient } from '../client';
@@ -24,7 +24,7 @@ export type UseQueueOptions = {
 // TODO(dmaretskyi): Move into client package.
 // TODO(dmaretskyi): Consider passing the space into the hook to support queue DXNs without space id.
 // TODO(ZaymonFC): If queue is unchanged returned object should be refferentially stable on poll.
-export const useQueue = <T extends Obj.Any | Relation.Any>(
+export const useQueue = <T extends Entity.Unknown>(
   queueDxn?: DXN,
   options: UseQueueOptions = {},
 ): Queue<T> | undefined => {

package/src/echo/useSchema.ts

@@ -2,12 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 import { useMemo, useSyncExternalStore } from 'react';
 
 import { type Client } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
-import { type BaseSchema } from '@dxos/echo-schema';
+import { type BaseSchema } from '@dxos/echo/internal';
 
 /**
  * Subscribe to and retrieve schema changes from a space's schema registry.

package/src/echo/useSubscription.ts

@@ -18,7 +18,7 @@ export const useSubscription = (cb: () => void, selection: Selection) => {
   const callbackRef = useRef(cb);
   callbackRef.current = cb;
 
-  const subscriptionRef = useRef<SubscriptionHandle>();
+  const subscriptionRef = useRef<SubscriptionHandle>(null);
 
   useEffect(() => {
     subscriptionRef.current = createSubscription(() => {

package/src/halo/Passkey.stories.tsx

@@ -2,8 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback } from 'react';
 
@@ -11,8 +9,8 @@ import { Config, PublicKey } from '@dxos/client';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { Button } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
-import { withTheme } from '@dxos/storybook-utils';
 
 import { useClient } from '../client';
 import { withClientProvider } from '../testing';
@@ -127,15 +125,6 @@ const Test = () => {
   );
 };
 
-const meta = {
-  title: 'sdk/react-client/Passkeys',
-  render: Test,
-} satisfies Meta<typeof Config>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
 const config = new Config({
   runtime: {
     client: {
@@ -156,6 +145,14 @@ const config = new Config({
   },
 });
 
-export const Default: Story = {
+const meta = {
+  title: 'sdk/react-client/Passkeys',
+  render: Test,
   decorators: [withClientProvider({ config }), withTheme],
-};
+} satisfies Meta;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/invitations/useInvitationStatus.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { type Reducer, useCallback, useEffect, useMemo, useReducer } from 'react';
+import { useCallback, useEffect, useMemo, useReducer } from 'react';
 
 import { type PublicKey } from '@dxos/client';
 import {
@@ -24,9 +24,10 @@ interface InvitationReducerState {
   status: Invitation.State; // TODO(burdon): Rename state.
   haltedAt?: Invitation.State;
   result: InvitationResult;
-  error?: number;
+  error?: Error;
   id?: string;
   multiUse?: boolean;
+  shareable?: boolean;
   invitationCode?: string;
   authCode?: string;
   authMethod?: Invitation.AuthMethod;
@@ -72,7 +73,7 @@ export type InvitationStatus = {
   multiUse?: boolean;
   shareable?: boolean;
   result: InvitationResult;
-  error?: number;
+  error?: Error;
   cancel(): void;
   // TODO(wittjosiah): Remove?
   connect(observable: CancellableInvitationObservable): void;
@@ -82,11 +83,11 @@ export type InvitationStatus = {
 // Without private key, the invitation code cannot be created.
 // These invitations are only available to be accepted but not shared.
 const isShareableInvitation = (invitation: Invitation) =>
-  invitation.authMethod !== Invitation.AuthMethod.KNOWN_PUBLIC_KEY || invitation.guestKeypair?.privateKey;
+  invitation.authMethod !== Invitation.AuthMethod.KNOWN_PUBLIC_KEY || !!invitation.guestKeypair?.privateKey;
 
 export const useInvitationStatus = (observable?: CancellableInvitationObservable): InvitationStatus => {
-  const [state, dispatch] = useReducer<Reducer<InvitationReducerState, InvitationAction>, null>(
-    (prev, action) => {
+  const [state, dispatch] = useReducer(
+    (prev: InvitationReducerState, action: InvitationAction): InvitationReducerState => {
       log('useInvitationStatus', { action });
       const invitationProps =
         'invitation' in action
@@ -115,10 +116,10 @@ export const useInvitationStatus = (observable?: CancellableInvitationObservable
           action.status === Invitation.State.TIMEOUT) && {
           haltedAt: typeof prev.haltedAt === 'undefined' ? action.haltedAt : prev.haltedAt,
         }),
-      } as InvitationReducerState;
+      };
     },
     null,
-    (_arg: null) => {
+    (_arg: null): InvitationReducerState => {
       const invitation = observable?.get();
       return {
         status: Invitation.State.INIT,

package/src/testing/ClientRepeater.stories.tsx

@@ -2,14 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { Input } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
-import { withTheme } from '@dxos/storybook-utils';
 
 import { useClient } from '../client';
 import { useSpace } from '../echo';

package/src/testing/ClientRepeater.tsx

@@ -6,7 +6,7 @@ import React, { type FC, useEffect, useRef, useState } from 'react';
 
 import { Client, type PublicKey } from '@dxos/client';
 import { TestBuilder, performInvitation } from '@dxos/client/testing';
-import { type TypedObject } from '@dxos/echo-schema';
+import { type TypedObject } from '@dxos/echo/internal';
 import { registerSignalsRuntime } from '@dxos/echo-signals/react';
 import { faker } from '@dxos/random';
 import { useAsyncEffect } from '@dxos/react-hooks';
@@ -28,7 +28,7 @@ export type ClientRepeaterProps<P extends ClientRepeatedComponentProps> = {
   clients?: Client[];
   types?: TypedObject[];
   args?: Omit<P, 'id' | 'count'>;
-} & Pick<WithClientProviderProps, 'createIdentity' | 'createSpace' | 'onSpaceCreated'>;
+} & Pick<WithClientProviderProps, 'createIdentity' | 'createSpace' | 'onCreateSpace'>;
 
 /**
  * Utility component for Storybook stories which sets up clients for n peers.
@@ -48,7 +48,7 @@ export const ClientRepeater = <P extends ClientRepeatedComponentProps>(props: Cl
     types,
     createIdentity,
     createSpace,
-    onSpaceCreated,
+    onCreateSpace,
   } = props;
   useEffect(() => {
     registerSignalsRuntime();
@@ -72,7 +72,7 @@ export const ClientRepeater = <P extends ClientRepeatedComponentProps>(props: Cl
       const client = clients[0];
       const space = await client.spaces.create({ name: faker.commerce.productName() });
       setSpaceKey(space.key);
-      await onSpaceCreated?.({ client, space }, {});
+      await onCreateSpace?.({ client, space }, {});
       await Promise.all(clients.slice(1).flatMap((client) => performInvitation({ host: space, guest: client.spaces })));
     }
 

package/src/testing/withClientProvider.stories.tsx

@@ -2,14 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { log } from '@dxos/log';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
-import { render, withLayout, withTheme } from '@dxos/storybook-utils';
+import { render } from '@dxos/storybook-utils';
 
 import { useClient } from '../client';
 import { type Space, useSpaces } from '../echo';
@@ -29,7 +28,7 @@ const DefaultStory = () => {
   }
 
   return (
-    <div className='flex flex-col min-w-[28rem] divide-y divide-separator border border-separator rounded'>
+    <div className='flex flex-col divide-y divide-separator border border-separator'>
       <SyntaxHighlighter language='json'>{JSON.stringify(client.toJSON(), null, 2)}</SyntaxHighlighter>
       {spaces.map((space) => (
         <SpaceInfo key={space.id} space={space} />
@@ -41,6 +40,7 @@ const DefaultStory = () => {
 const meta = {
   title: 'sdk/react-client/withClientProvider',
   render: render(DefaultStory),
+  decorators: [withTheme],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;
@@ -53,19 +53,22 @@ const clientProps: WithClientProviderProps = {
   onInitialized: async (client) => {
     log.info('onInitialized', { client });
   },
-  onSpaceCreated: async ({ client, space }) => {
-    log.info('onSpaceCreated', { client, space });
+  onCreateSpace: async ({ client, space }) => {
+    log.info('onCreateSpace', { client, space });
   },
 };
 
 export const Default: Story = {
-  decorators: [withClientProvider(clientProps), withTheme, withLayout({ classNames: ['flex gap-2'] })],
+  decorators: [withClientProvider(clientProps)],
+  parameters: {
+    layout: 'centered',
+  },
 };
 
 export const Multiple: Story = {
   decorators: [
-    withMultiClientProvider({ ...clientProps, numClients: 3 }),
     withTheme,
-    withLayout({ classNames: ['flex gap-2'] }),
+    withLayout({ classNames: 'grid grid-cols-3' }),
+    withMultiClientProvider({ ...clientProps, numClients: 3 }),
   ],
 };

package/src/testing/withClientProvider.tsx

@@ -4,7 +4,7 @@
 
 import { type Decorator, type StoryContext } from '@storybook/react';
 import React, { type PropsWithChildren, createContext, useContext, useEffect, useRef, useState } from 'react';
-import { type FallbackProps, ErrorBoundary as NativeErrorBoundary } from 'react-error-boundary';
+import { type FallbackProps, ErrorBoundary as NaturalErrorBoundary } from 'react-error-boundary';
 
 import { Trigger } from '@dxos/async';
 import { type Client } from '@dxos/client';
@@ -21,9 +21,9 @@ type InitializeProps = {
   createIdentity?: boolean;
   createSpace?: boolean;
   onInitialized?: (client: Client) => MaybePromise<void>;
-  onIdentityCreated?: (props: { client: Client }) => MaybePromise<void>;
+  onCreateIdentity?: (props: { client: Client }, context: StoryContext | any) => MaybePromise<void>;
   // NOTE: context must be untyped until ClientRepeater is removed.
-  onSpaceCreated?: (props: { client: Client; space: Space }, context: StoryContext | any) => MaybePromise<void>;
+  onCreateSpace?: (props: { client: Client; space: Space }, context: StoryContext | any) => MaybePromise<void>;
 };
 
 /**
@@ -31,7 +31,7 @@ type InitializeProps = {
  */
 const initializeClient = async (
   client: Client,
-  { createIdentity, createSpace, onSpaceCreated, onIdentityCreated, onInitialized }: InitializeProps,
+  { createIdentity, createSpace, onCreateIdentity, onCreateSpace, onInitialized }: InitializeProps,
   context: StoryContext,
 ): Promise<ClientStory> => {
   await onInitialized?.(client);
@@ -39,14 +39,17 @@ const initializeClient = async (
   if (createIdentity || createSpace) {
     if (!client.halo.identity.get()) {
       await client.halo.createIdentity();
-      await onIdentityCreated?.({ client });
+      await client.spaces.waitUntilReady();
+      await client.spaces.default.waitUntilReady();
+      await onCreateIdentity?.({ client }, context);
     }
   }
 
   let space: Space | undefined;
   if (createSpace) {
     space = await client.spaces.create({ name: 'Test Space' });
-    await onSpaceCreated?.({ client, space }, context);
+    await space.waitUntilReady(); // Is this required?
+    await onCreateSpace?.({ client, space }, context);
   }
 
   return { space };
@@ -60,8 +63,8 @@ export type WithClientProviderProps = InitializeProps & Omit<ClientProviderProps
 export const withClientProvider = ({
   createIdentity,
   createSpace,
-  onSpaceCreated,
-  onIdentityCreated,
+  onCreateSpace,
+  onCreateIdentity,
   onInitialized,
   ...props
 }: WithClientProviderProps = {}): Decorator => {
@@ -73,8 +76,8 @@ export const withClientProvider = ({
         {
           createIdentity,
           createSpace,
-          onSpaceCreated,
-          onIdentityCreated,
+          onCreateSpace,
+          onCreateIdentity,
           onInitialized,
         },
         context,
@@ -108,20 +111,19 @@ export const useMultiClient = () => useContext(MultiClientContext);
 /**
  * Decorator that creates a scaffold for multiple clients.
  * Orchestrates invitations between a randomly selected host and the remaining clients.
- * NOTE: Should come before withLayout.
  */
 export const withMultiClientProvider = ({
   numClients = 2,
   createIdentity,
   createSpace,
-  onSpaceCreated,
-  onIdentityCreated,
+  onCreateSpace,
+  onCreateIdentity,
   onInitialized,
   ...props
 }: WithMultiClientProviderProps): Decorator => {
   return (Story, context) => {
     const builder = useRef(new TestBuilder());
-    const hostRef = useRef<Client>();
+    const hostRef = useRef<Client>(null);
     const spaceReady = useRef(new Trigger<Space | undefined>());
 
     // Handle invitations.
@@ -136,8 +138,8 @@ export const withMultiClientProvider = ({
             {
               createIdentity,
               createSpace,
-              onSpaceCreated,
-              onIdentityCreated,
+              onCreateSpace,
+              onCreateIdentity,
               onInitialized,
             },
             context,
@@ -189,7 +191,7 @@ const ErrorBoundary = ({ children }: PropsWithChildren) => {
     return <ErrorFallback error={error} resetErrorBoundary={() => setError(undefined)} />;
   }
 
-  return <NativeErrorBoundary FallbackComponent={ErrorFallback}>{children}</NativeErrorBoundary>;
+  return <NaturalErrorBoundary FallbackComponent={ErrorFallback}>{children}</NaturalErrorBoundary>;
 };
 
 const ErrorFallback = ({ error }: FallbackProps) => {

package/tsconfig.json

@@ -44,9 +44,6 @@
     {
       "path": "../../core/echo/echo"
     },
-    {
-      "path": "../../core/echo/echo-schema"
-    },
     {
       "path": "../../core/echo/echo-signals"
     },